Commit 5d5c3ba9 authored by Amit Cohen's avatar Amit Cohen Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_acl_bloom_filter: Make mlxsw_sp_acl_bf_key_encode() more flexible 



Spectrum-4 will calculate hash function for bloom filter differently from
the existing ASICs.

One of the changes is related to the way that the chunks will be build -
without padding.

As preparation for support of Spectrum-4 bloom filter, make
mlxsw_sp_acl_bf_key_encode() more flexible, so it will be able to use it
for Spectrum-4 as well.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 47116712

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

+25 −11
Original line number Diff line number Diff line
@@ -116,9 +116,10 @@ static u16 mlxsw_sp_acl_bf_crc(const u8 *buffer, size_t len) 
}



static void

mlxsw_sp_acl_bf_key_encode(struct mlxsw_sp_acl_atcam_region *aregion,

__mlxsw_sp_acl_bf_key_encode(struct mlxsw_sp_acl_atcam_region *aregion,

			     struct mlxsw_sp_acl_atcam_entry *aentry,

			   char *output, u8 *len)

			     char *output, u8 *len, u8 max_chunks, u8 pad_bytes,

			     u8 key_offset, u8 chunk_key_len, u8 chunk_len)

{

	struct mlxsw_afk_key_info *key_info = aregion->region->key_info;

	u8 chunk_index, chunk_count, block_count;
@@ -129,17 +130,30 @@ mlxsw_sp_acl_bf_key_encode(struct mlxsw_sp_acl_atcam_region *aregion, 
	chunk_count = 1 + ((block_count - 1) >> 2);

	erp_region_id = cpu_to_be16(aentry->ht_key.erp_id |

				   (aregion->region->id << 4));

	for (chunk_index = MLXSW_BLOOM_KEY_CHUNKS - chunk_count;

	     chunk_index < MLXSW_BLOOM_KEY_CHUNKS; chunk_index++) {

		memset(chunk, 0, MLXSW_BLOOM_CHUNK_PAD_BYTES);

		memcpy(chunk + MLXSW_BLOOM_CHUNK_PAD_BYTES, &erp_region_id,

	for (chunk_index = max_chunks - chunk_count; chunk_index < max_chunks;

	     chunk_index++) {

		memset(chunk, 0, pad_bytes);

		memcpy(chunk + pad_bytes, &erp_region_id,

		       sizeof(erp_region_id));

		memcpy(chunk + MLXSW_BLOOM_CHUNK_KEY_OFFSET,

		memcpy(chunk + key_offset,

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

		       MLXSW_BLOOM_CHUNK_KEY_BYTES);

		chunk += MLXSW_BLOOM_KEY_CHUNK_BYTES;

		       chunk_key_len);

		chunk += chunk_len;

	}

	*len = chunk_count * chunk_len;

}

	*len = chunk_count * MLXSW_BLOOM_KEY_CHUNK_BYTES;



static void

mlxsw_sp_acl_bf_key_encode(struct mlxsw_sp_acl_atcam_region *aregion,

			   struct mlxsw_sp_acl_atcam_entry *aentry,

			   char *output, u8 *len)

{

	__mlxsw_sp_acl_bf_key_encode(aregion, aentry, output, len,

				     MLXSW_BLOOM_KEY_CHUNKS,

				     MLXSW_BLOOM_CHUNK_PAD_BYTES,

				     MLXSW_BLOOM_CHUNK_KEY_OFFSET,

				     MLXSW_BLOOM_CHUNK_KEY_BYTES,

				     MLXSW_BLOOM_KEY_CHUNK_BYTES);

}



static unsigned int