Commit 8d466c8f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-acl-fixes' 



Petr Machata says:

====================
mlxsw: ACL fixes

Ido Schimmel writes:

Patches #1-#3 fix various spelling mistakes I noticed while working on
the code base.

Patch #4 fixes a general protection fault by bailing out when the error
occurs and warning.

Patch #5 fixes the warning.

Patch #6 fixes ACL scale regression and firmware errors.

See the commit messages for more info.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 28f961f9 75d8d7a6

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

+9 −11
Original line number Diff line number Diff line
@@ -391,7 +391,8 @@ mlxsw_sp_acl_atcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		return err;



	lkey_id = aregion->ops->lkey_id_get(aregion, aentry->enc_key, erp_id);

	lkey_id = aregion->ops->lkey_id_get(aregion, aentry->ht_key.enc_key,

					    erp_id);

	if (IS_ERR(lkey_id))

		return PTR_ERR(lkey_id);

	aentry->lkey_id = lkey_id;
@@ -399,7 +400,7 @@ mlxsw_sp_acl_atcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp, 
	kvdl_index = mlxsw_afa_block_first_kvdl_index(rulei->act_block);

	mlxsw_reg_ptce3_pack(ptce3_pl, true, MLXSW_REG_PTCE3_OP_WRITE_WRITE,

			     priority, region->tcam_region_info,

			     aentry->enc_key, erp_id,

			     aentry->ht_key.enc_key, erp_id,

			     aentry->delta_info.start,

			     aentry->delta_info.mask,

			     aentry->delta_info.value,
@@ -428,7 +429,7 @@ mlxsw_sp_acl_atcam_region_entry_remove(struct mlxsw_sp *mlxsw_sp, 


	mlxsw_reg_ptce3_pack(ptce3_pl, false, MLXSW_REG_PTCE3_OP_WRITE_WRITE, 0,

			     region->tcam_region_info,

			     aentry->enc_key, erp_id,

			     aentry->ht_key.enc_key, erp_id,

			     aentry->delta_info.start,

			     aentry->delta_info.mask,

			     aentry->delta_info.value,
@@ -457,7 +458,7 @@ mlxsw_sp_acl_atcam_region_entry_action_replace(struct mlxsw_sp *mlxsw_sp, 
	kvdl_index = mlxsw_afa_block_first_kvdl_index(rulei->act_block);

	mlxsw_reg_ptce3_pack(ptce3_pl, true, MLXSW_REG_PTCE3_OP_WRITE_UPDATE,

			     priority, region->tcam_region_info,

			     aentry->enc_key, erp_id,

			     aentry->ht_key.enc_key, erp_id,

			     aentry->delta_info.start,

			     aentry->delta_info.mask,

			     aentry->delta_info.value,
@@ -480,26 +481,23 @@ __mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp, 
	int err;



	mlxsw_afk_encode(afk, region->key_info, &rulei->values,

			 aentry->ht_key.full_enc_key, mask);

			 aentry->ht_key.enc_key, mask);



	erp_mask = mlxsw_sp_acl_erp_mask_get(aregion, mask, false);

	if (IS_ERR(erp_mask))

		return PTR_ERR(erp_mask);

	aentry->erp_mask = erp_mask;

	aentry->ht_key.erp_id = mlxsw_sp_acl_erp_mask_erp_id(erp_mask);

	memcpy(aentry->enc_key, aentry->ht_key.full_enc_key,

	       sizeof(aentry->enc_key));



	/* Compute all needed delta information and clear the delta bits

	 * from the encrypted key.

	 * from the encoded key.

	 */

	delta = mlxsw_sp_acl_erp_delta(aentry->erp_mask);

	aentry->delta_info.start = mlxsw_sp_acl_erp_delta_start(delta);

	aentry->delta_info.mask = mlxsw_sp_acl_erp_delta_mask(delta);

	aentry->delta_info.value =

		mlxsw_sp_acl_erp_delta_value(delta,

					     aentry->ht_key.full_enc_key);

	mlxsw_sp_acl_erp_delta_clear(delta, aentry->enc_key);

		mlxsw_sp_acl_erp_delta_value(delta, aentry->ht_key.enc_key);

	mlxsw_sp_acl_erp_delta_clear(delta, aentry->ht_key.enc_key);



	/* Add rule to the list of A-TCAM rules, assuming this

	 * rule is intended to A-TCAM. In case this rule does

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

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ __mlxsw_sp_acl_bf_key_encode(struct mlxsw_sp_acl_atcam_region *aregion, 
		memcpy(chunk + pad_bytes, &erp_region_id,

		       sizeof(erp_region_id));

		memcpy(chunk + key_offset,

		       &aentry->enc_key[chunk_key_offsets[chunk_index]],

		       &aentry->ht_key.enc_key[chunk_key_offsets[chunk_index]],

		       chunk_key_len);

		chunk += chunk_len;

	}

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

+0 −13
Original line number Diff line number Diff line
@@ -1217,18 +1217,6 @@ static bool mlxsw_sp_acl_erp_delta_check(void *priv, const void *parent_obj, 
	return err ? false : true;

}



static int mlxsw_sp_acl_erp_hints_obj_cmp(const void *obj1, const void *obj2)

{

	const struct mlxsw_sp_acl_erp_key *key1 = obj1;

	const struct mlxsw_sp_acl_erp_key *key2 = obj2;



	/* For hints purposes, two objects are considered equal

	 * in case the masks are the same. Does not matter what

	 * the "ctcam" value is.

	 */

	return memcmp(key1->mask, key2->mask, sizeof(key1->mask));

}



static void *mlxsw_sp_acl_erp_delta_create(void *priv, void *parent_obj,

					   void *obj)

{
@@ -1308,7 +1296,6 @@ static void mlxsw_sp_acl_erp_root_destroy(void *priv, void *root_priv) 
static const struct objagg_ops mlxsw_sp_acl_erp_objagg_ops = {

	.obj_size = sizeof(struct mlxsw_sp_acl_erp_key),

	.delta_check = mlxsw_sp_acl_erp_delta_check,

	.hints_obj_cmp = mlxsw_sp_acl_erp_hints_obj_cmp,

	.delta_create = mlxsw_sp_acl_erp_delta_create,

	.delta_destroy = mlxsw_sp_acl_erp_delta_destroy,

	.root_create = mlxsw_sp_acl_erp_root_create,

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

+3 −6
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ struct mlxsw_sp_acl_atcam_region { 
};



struct mlxsw_sp_acl_atcam_entry_ht_key {

	char full_enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN]; /* Encoded

								 * key.

	char enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN]; /* Encoded key, minus

							    * delta bits.

							    */

	u8 erp_id;

};
@@ -181,9 +181,6 @@ struct mlxsw_sp_acl_atcam_entry { 
	struct rhash_head ht_node;

	struct list_head list; /* Member in entries_list */

	struct mlxsw_sp_acl_atcam_entry_ht_key ht_key;

	char enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN]; /* Encoded key,

							    * minus delta bits.

							    */

	struct {

		u16 start;

		u8 mask;

include/linux/objagg.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ struct objagg_ops { 
	size_t obj_size;

	bool (*delta_check)(void *priv, const void *parent_obj,

			    const void *obj);

	int (*hints_obj_cmp)(const void *obj1, const void *obj2);

	void * (*delta_create)(void *priv, void *parent_obj, void *obj);

	void (*delta_destroy)(void *priv, void *delta_priv);

	void * (*root_create)(void *priv, void *obj, unsigned int root_id);