Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0a777b9 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_acl: Start using A-TCAM 



Now that all the pieces are in place we can start using the A-TCAM
instead of only using the C-TCAM. This allows for much higher scale and
better performance (to be improved further by follow-up patch sets).

Perform the integration with the A-TCAM and the eRP core by reverting
the changes introduced by "mlxsw: spectrum_acl: Enable C-TCAM only mode
in eRP core" and add calls from the C-TCAM code into the eRP core.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8758b67

drivers/net/ethernet/mellanox/mlxsw/reg.h

+0 −1
Original line number Diff line number Diff line
@@ -2868,7 +2868,6 @@ static inline void mlxsw_reg_percr_pack(char *payload, u16 region_id) 
	mlxsw_reg_percr_atcam_ignore_prune_set(payload, false);

	mlxsw_reg_percr_ctcam_ignore_prune_set(payload, false);

	mlxsw_reg_percr_bf_bypass_set(payload, true);

	memset(payload + 0x20, 0xff, 96);

}



/* PERERP - Policy-Engine Region eRP Register

drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c

+22 −1
Original line number Diff line number Diff line
@@ -58,6 +58,26 @@ struct mlxsw_sp1_acl_tcam_entry { 
	struct mlxsw_sp_acl_ctcam_entry centry;

};



static int

mlxsw_sp1_acl_ctcam_region_entry_insert(struct mlxsw_sp_acl_ctcam_region *cregion,

					struct mlxsw_sp_acl_ctcam_entry *centry,

					const char *mask)

{

	return 0;

}



static void

mlxsw_sp1_acl_ctcam_region_entry_remove(struct mlxsw_sp_acl_ctcam_region *cregion,

					struct mlxsw_sp_acl_ctcam_entry *centry)

{

}



static const struct mlxsw_sp_acl_ctcam_region_ops

mlxsw_sp1_acl_ctcam_region_ops = {

	.entry_insert = mlxsw_sp1_acl_ctcam_region_entry_insert,

	.entry_remove = mlxsw_sp1_acl_ctcam_region_entry_remove,

};



static int mlxsw_sp1_acl_tcam_init(struct mlxsw_sp *mlxsw_sp, void *priv,

				   struct mlxsw_sp_acl_tcam *tcam)

{
@@ -129,7 +149,8 @@ mlxsw_sp1_acl_tcam_region_init(struct mlxsw_sp *mlxsw_sp, void *region_priv, 
	int err;



	err = mlxsw_sp_acl_ctcam_region_init(mlxsw_sp, &region->cregion,

					     _region);

					     _region,

					     &mlxsw_sp1_acl_ctcam_region_ops);

	if (err)

		return err;

	err = mlxsw_sp1_acl_ctcam_region_catchall_add(mlxsw_sp, region);

drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c

+49 −9
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct mlxsw_sp2_acl_tcam_region { 
};



struct mlxsw_sp2_acl_tcam_chunk {

	struct mlxsw_sp_acl_ctcam_chunk cchunk;

	struct mlxsw_sp_acl_atcam_chunk achunk;

};



struct mlxsw_sp2_acl_tcam_entry {
@@ -58,6 +58,45 @@ struct mlxsw_sp2_acl_tcam_entry { 
	struct mlxsw_afa_block *act_block;

};



static int

mlxsw_sp2_acl_ctcam_region_entry_insert(struct mlxsw_sp_acl_ctcam_region *cregion,

					struct mlxsw_sp_acl_ctcam_entry *centry,

					const char *mask)

{

	struct mlxsw_sp_acl_atcam_region *aregion;

	struct mlxsw_sp_acl_atcam_entry *aentry;

	struct mlxsw_sp_acl_erp *erp;



	aregion = mlxsw_sp_acl_tcam_cregion_aregion(cregion);

	aentry = mlxsw_sp_acl_tcam_centry_aentry(centry);



	erp = mlxsw_sp_acl_erp_get(aregion, mask, true);

	if (IS_ERR(erp))

		return PTR_ERR(erp);

	aentry->erp = erp;



	return 0;

}



static void

mlxsw_sp2_acl_ctcam_region_entry_remove(struct mlxsw_sp_acl_ctcam_region *cregion,

					struct mlxsw_sp_acl_ctcam_entry *centry)

{

	struct mlxsw_sp_acl_atcam_region *aregion;

	struct mlxsw_sp_acl_atcam_entry *aentry;



	aregion = mlxsw_sp_acl_tcam_cregion_aregion(cregion);

	aentry = mlxsw_sp_acl_tcam_centry_aentry(centry);



	mlxsw_sp_acl_erp_put(aregion, aentry->erp);

}



static const struct mlxsw_sp_acl_ctcam_region_ops

mlxsw_sp2_acl_ctcam_region_ops = {

	.entry_insert = mlxsw_sp2_acl_ctcam_region_entry_insert,

	.entry_remove = mlxsw_sp2_acl_ctcam_region_entry_remove,

};



static int mlxsw_sp2_acl_tcam_init(struct mlxsw_sp *mlxsw_sp, void *priv,

				   struct mlxsw_sp_acl_tcam *_tcam)

{
@@ -139,7 +178,8 @@ mlxsw_sp2_acl_tcam_region_init(struct mlxsw_sp *mlxsw_sp, void *region_priv, 
	region->region = _region;



	return mlxsw_sp_acl_atcam_region_init(mlxsw_sp, &tcam->atcam,

					      &region->aregion, _region);

					      &region->aregion, _region,

					      &mlxsw_sp2_acl_ctcam_region_ops);

}



static void
@@ -163,7 +203,7 @@ static void mlxsw_sp2_acl_tcam_chunk_init(void *region_priv, void *chunk_priv, 
	struct mlxsw_sp2_acl_tcam_region *region = region_priv;

	struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv;



	mlxsw_sp_acl_ctcam_chunk_init(&region->aregion.cregion, &chunk->cchunk,

	mlxsw_sp_acl_atcam_chunk_init(&region->aregion, &chunk->achunk,

				      priority);

}
@@ -171,7 +211,7 @@ static void mlxsw_sp2_acl_tcam_chunk_fini(void *chunk_priv) 
{

	struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv;



	mlxsw_sp_acl_ctcam_chunk_fini(&chunk->cchunk);

	mlxsw_sp_acl_atcam_chunk_fini(&chunk->achunk);

}



static int mlxsw_sp2_acl_tcam_entry_add(struct mlxsw_sp *mlxsw_sp,
@@ -184,9 +224,9 @@ static int mlxsw_sp2_acl_tcam_entry_add(struct mlxsw_sp *mlxsw_sp, 
	struct mlxsw_sp2_acl_tcam_entry *entry = entry_priv;



	entry->act_block = rulei->act_block;

	return mlxsw_sp_acl_ctcam_entry_add(mlxsw_sp, &region->aregion.cregion,

					    &chunk->cchunk,

					    &entry->aentry.centry, rulei, true);

	return mlxsw_sp_acl_atcam_entry_add(mlxsw_sp, &region->aregion,

					    &chunk->achunk, &entry->aentry,

					    rulei);

}



static void mlxsw_sp2_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp,
@@ -197,8 +237,8 @@ static void mlxsw_sp2_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp, 
	struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv;

	struct mlxsw_sp2_acl_tcam_entry *entry = entry_priv;



	mlxsw_sp_acl_ctcam_entry_del(mlxsw_sp, &region->aregion.cregion,

				     &chunk->cchunk, &entry->aentry.centry);

	mlxsw_sp_acl_atcam_entry_del(mlxsw_sp, &region->aregion, &chunk->achunk,

				     &entry->aentry);

}



static int

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c

+7 −5
Original line number Diff line number Diff line
@@ -344,10 +344,12 @@ mlxsw_sp_acl_atcam_region_type_init(struct mlxsw_sp_acl_atcam_region *aregion) 
	aregion->ops = mlxsw_sp_acl_atcam_region_ops_arr[region_type];

}



int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,

int

mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_acl_atcam *atcam,

			       struct mlxsw_sp_acl_atcam_region *aregion,

				   struct mlxsw_sp_acl_tcam_region *region)

			       struct mlxsw_sp_acl_tcam_region *region,

			       const struct mlxsw_sp_acl_ctcam_region_ops *ops)

{

	int err;
@@ -366,7 +368,7 @@ int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		goto err_erp_region_init;

	err = mlxsw_sp_acl_ctcam_region_init(mlxsw_sp, &aregion->cregion,

					     region);

					     region, ops);

	if (err)

		goto err_ctcam_region_init;

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c

+11 −3
Original line number Diff line number Diff line
@@ -98,6 +98,10 @@ mlxsw_sp_acl_ctcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp, 
	mlxsw_afk_encode(afk, region->key_info, &rulei->values, key, mask, 0,

			 blocks_count - 1);



	err = cregion->ops->entry_insert(cregion, centry, mask);

	if (err)

		return err;



	/* Only the first action set belongs here, the rest is in KVD */

	act_set = mlxsw_afa_block_first_set(rulei->act_block);

	mlxsw_reg_ptce2_flex_action_set_memcpy_to(ptce2_pl, act_set);
@@ -116,6 +120,7 @@ mlxsw_sp_acl_ctcam_region_entry_remove(struct mlxsw_sp *mlxsw_sp, 
			     cregion->region->tcam_region_info,

			     centry->parman_item.index, 0);

	mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl);

	cregion->ops->entry_remove(cregion, centry);

}



static int mlxsw_sp_acl_ctcam_region_parman_resize(void *priv,
@@ -153,11 +158,14 @@ static const struct parman_ops mlxsw_sp_acl_ctcam_region_parman_ops = { 
	.algo		= PARMAN_ALGO_TYPE_LSORT,

};



int mlxsw_sp_acl_ctcam_region_init(struct mlxsw_sp *mlxsw_sp,

int

mlxsw_sp_acl_ctcam_region_init(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_acl_ctcam_region *cregion,

				   struct mlxsw_sp_acl_tcam_region *region)

			       struct mlxsw_sp_acl_tcam_region *region,

			       const struct mlxsw_sp_acl_ctcam_region_ops *ops)

{

	cregion->region = region;

	cregion->ops = ops;

	cregion->parman = parman_create(&mlxsw_sp_acl_ctcam_region_parman_ops,

					cregion);

	if (!cregion->parman)