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

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

Merge branch 'mlxsw-Implement-flower-ingress-device-matching-offload' 



Ido Schimmel says:

====================
mlxsw: Implement flower ingress device matching offload

Jiri says:

In case of using shared block, user might find it handy to be able to insert
filters to match on particular ingress device. This patchset exposes the
ingress ifindex through flow_dissector and flow_offload so mlxsw can use it to
push down to HW. See the selftests for examples of usage.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 39f58860 dcc5e1f9

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

+10 −8
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ static bool mlxsw_afk_blocks_check(struct mlxsw_afk *mlxsw_afk) 


			elinst = &block->instances[j];

			if (elinst->type != elinst->info->type ||

			    (!elinst->avoid_size_check &&

			     elinst->item.size.bits !=

			    elinst->info->item.size.bits)

			     elinst->info->item.size.bits))

				return false;

		}

	}
@@ -385,12 +386,12 @@ EXPORT_SYMBOL(mlxsw_afk_values_add_buf); 


static void mlxsw_sp_afk_encode_u32(const struct mlxsw_item *storage_item,

				    const struct mlxsw_item *output_item,

				    char *storage, char *output)

				    char *storage, char *output, int diff)

{

	u32 value;



	value = __mlxsw_item_get32(storage, storage_item, 0);

	__mlxsw_item_set32(output, output_item, 0, value);

	__mlxsw_item_set32(output, output_item, 0, value + diff);

}



static void mlxsw_sp_afk_encode_buf(const struct mlxsw_item *storage_item,
@@ -406,14 +407,14 @@ static void mlxsw_sp_afk_encode_buf(const struct mlxsw_item *storage_item, 


static void

mlxsw_sp_afk_encode_one(const struct mlxsw_afk_element_inst *elinst,

			char *output, char *storage)

			char *output, char *storage, int u32_diff)

{

	const struct mlxsw_item *storage_item = &elinst->info->item;

	const struct mlxsw_item *output_item = &elinst->item;



	if (elinst->type == MLXSW_AFK_ELEMENT_TYPE_U32)

		mlxsw_sp_afk_encode_u32(storage_item, output_item,

					storage, output);

					storage, output, u32_diff);

	else if (elinst->type == MLXSW_AFK_ELEMENT_TYPE_BUF)

		mlxsw_sp_afk_encode_buf(storage_item, output_item,

					storage, output);
@@ -446,9 +447,10 @@ void mlxsw_afk_encode(struct mlxsw_afk *mlxsw_afk, 
				continue;



			mlxsw_sp_afk_encode_one(elinst, block_key,

						values->storage.key);

						values->storage.key,

						elinst->u32_key_diff);

			mlxsw_sp_afk_encode_one(elinst, block_mask,

						values->storage.mask);

						values->storage.mask, 0);

		}



		mlxsw_afk->ops->encode_block(key, i, block_key);

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

+18 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct mlxsw_afk_element_info { 
 * define an internal storage geometry.

 */

static const struct mlxsw_afk_element_info mlxsw_afk_element_infos[] = {

	MLXSW_AFK_ELEMENT_INFO_U32(SRC_SYS_PORT, 0x00, 16, 8),

	MLXSW_AFK_ELEMENT_INFO_U32(SRC_SYS_PORT, 0x00, 16, 16),

	MLXSW_AFK_ELEMENT_INFO_BUF(DMAC_32_47, 0x04, 2),

	MLXSW_AFK_ELEMENT_INFO_BUF(DMAC_0_31, 0x06, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(SMAC_32_47, 0x0A, 2),
@@ -107,9 +107,14 @@ struct mlxsw_afk_element_inst { /* element instance in actual block */ 
	const struct mlxsw_afk_element_info *info;

	enum mlxsw_afk_element_type type;

	struct mlxsw_item item; /* element geometry in block */

	int u32_key_diff; /* in case value needs to be adjusted before write

			   * this diff is here to handle that

			   */

	bool avoid_size_check;

};



#define MLXSW_AFK_ELEMENT_INST(_type, _element, _offset, _shift, _size)		\

#define MLXSW_AFK_ELEMENT_INST(_type, _element, _offset,			\

			       _shift, _size, _u32_key_diff, _avoid_size_check)	\

	{									\

		.info = &mlxsw_afk_element_infos[MLXSW_AFK_ELEMENT_##_element],	\

		.type = _type,							\
@@ -119,15 +124,24 @@ struct mlxsw_afk_element_inst { /* element instance in actual block */ 
			.size = {.bits = _size},				\

			.name = #_element,					\

		},								\

		.u32_key_diff = _u32_key_diff,					\

		.avoid_size_check = _avoid_size_check,				\

	}



#define MLXSW_AFK_ELEMENT_INST_U32(_element, _offset, _shift, _size)		\

	MLXSW_AFK_ELEMENT_INST(MLXSW_AFK_ELEMENT_TYPE_U32,			\

			       _element, _offset, _shift, _size)

			       _element, _offset, _shift, _size, 0, false)



#define MLXSW_AFK_ELEMENT_INST_EXT_U32(_element, _offset,			\

				       _shift, _size, _key_diff,		\

				       _avoid_size_check)			\

	MLXSW_AFK_ELEMENT_INST(MLXSW_AFK_ELEMENT_TYPE_U32,			\

			       _element, _offset, _shift, _size,		\

			       _key_diff, _avoid_size_check)



#define MLXSW_AFK_ELEMENT_INST_BUF(_element, _offset, _size)			\

	MLXSW_AFK_ELEMENT_INST(MLXSW_AFK_ELEMENT_TYPE_BUF,			\

			       _element, _offset, 0, _size)

			       _element, _offset, 0, _size, 0, false)



struct mlxsw_afk_block {

	u16 encoding; /* block ID */

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

+9 −0
Original line number Diff line number Diff line
@@ -623,6 +623,15 @@ enum mlxsw_sp_acl_profile { 
	MLXSW_SP_ACL_PROFILE_MR,

};



struct mlxsw_sp_acl_block {

	struct list_head binding_list;

	struct mlxsw_sp_acl_ruleset *ruleset_zero;

	struct mlxsw_sp *mlxsw_sp;

	unsigned int rule_count;

	unsigned int disable_count;

	struct net *net;

};



struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl);

struct mlxsw_sp *mlxsw_sp_acl_block_mlxsw_sp(struct mlxsw_sp_acl_block *block);

unsigned int mlxsw_sp_acl_block_rule_count(struct mlxsw_sp_acl_block *block);

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

+1 −8
Original line number Diff line number Diff line
@@ -45,14 +45,6 @@ struct mlxsw_sp_acl_block_binding { 
	bool ingress;

};



struct mlxsw_sp_acl_block {

	struct list_head binding_list;

	struct mlxsw_sp_acl_ruleset *ruleset_zero;

	struct mlxsw_sp *mlxsw_sp;

	unsigned int rule_count;

	unsigned int disable_count;

};



struct mlxsw_sp_acl_ruleset_ht_key {

	struct mlxsw_sp_acl_block *block;

	u32 chain_index;
@@ -221,6 +213,7 @@ struct mlxsw_sp_acl_block *mlxsw_sp_acl_block_create(struct mlxsw_sp *mlxsw_sp, 
		return NULL;

	INIT_LIST_HEAD(&block->binding_list);

	block->mlxsw_sp = mlxsw_sp;

	block->net = net;

	return block;

}

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

+5 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_l2_dmac[] = { 
	MLXSW_AFK_ELEMENT_INST_BUF(DMAC_0_31, 0x02, 4),

	MLXSW_AFK_ELEMENT_INST_U32(PCP, 0x08, 13, 3),

	MLXSW_AFK_ELEMENT_INST_U32(VID, 0x08, 0, 12),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 8),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 16),

};



static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_l2_smac[] = {
@@ -20,7 +20,7 @@ static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_l2_smac[] = { 
	MLXSW_AFK_ELEMENT_INST_BUF(SMAC_0_31, 0x02, 4),

	MLXSW_AFK_ELEMENT_INST_U32(PCP, 0x08, 13, 3),

	MLXSW_AFK_ELEMENT_INST_U32(VID, 0x08, 0, 12),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 8),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 16),

};



static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_l2_smac_ex[] = {
@@ -32,13 +32,13 @@ static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_l2_smac_ex[] = { 
static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_ipv4_sip[] = {

	MLXSW_AFK_ELEMENT_INST_BUF(SRC_IP_0_31, 0x00, 4),

	MLXSW_AFK_ELEMENT_INST_U32(IP_PROTO, 0x08, 0, 8),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 8),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 16),

};



static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_ipv4_dip[] = {

	MLXSW_AFK_ELEMENT_INST_BUF(DST_IP_0_31, 0x00, 4),

	MLXSW_AFK_ELEMENT_INST_U32(IP_PROTO, 0x08, 0, 8),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 8),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 16),

};



static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_ipv4[] = {
@@ -149,7 +149,7 @@ static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_mac_4[] = { 


static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_mac_5[] = {

	MLXSW_AFK_ELEMENT_INST_U32(VID, 0x04, 16, 12),

	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x04, 0, 8), /* RX_ACL_SYSTEM_PORT */

	MLXSW_AFK_ELEMENT_INST_EXT_U32(SRC_SYS_PORT, 0x04, 0, 8, -1, true), /* RX_ACL_SYSTEM_PORT */

};



static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_ipv4_0[] = {