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

Merge tag 'mlx5-updates-2021-08-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
This patch series contains various fixes, additions and improvements to
mlx5 software steering.

Patch 1:
  adds support for REMOVE_HEADER packet reformat - a new reformat type
  that is supported starting with ConnectX-6 DX, and allows removing an
  arbitrary size packet segment at a selected position.

Patches 2 and 3:
  add support for VLAN pop on TX and VLAN push on RX flows.

Patch 4:
  enables retransmission mechanism for the SW Steering RC QP.

Patch 5:
  does some improvements to error flow in building STE array and adds
  a more informative printout of an invalid actions sequence.

Patch 6:
  improves error flow on SW Steering QP error.

Patch 7:
  reduces the log level of a message that is printed when a table is
  connected to a lower/same level destination table, as this case proves to
  be not as rare as it was in the past.

Patch 8:
  adds missing support for matching on IPv6 flow label for devices
  older than ConnectX-6 DX.

Patch 9:
  replaces uintN_t types with kernel-style types.

Patch 10:
  allows for using the right API for updating flow tables - if it is
  a FW-owned table, then FW API will be used.

Patch 11:
  adds support for 'ignore_flow_level' on multi-destination flow
  tables that are created by SW Steering.

Patch 12:
   optimizes FDB RX steering rule by skipping matching on source port,
   as the source port for all incoming packets equals to wire.

Patch 13:
   is a small code refactoring - it merges several DR_STE_SIZE enums
   into a single enum.

Patch 14:
   does some additional refactoring and removes HW-specific STE type
   from NIC domain.

Patch 15:
   removes rehash ctrl struct from dr_htbl struct and saves some memory.

Patch 16:
   does a more significant improvement in terms of memory consumption
   and was able to save about 1.6 Gb for 8M rules.

Patch 17:
   adds support for update FTE, which is needed for cases where there
   are multiple rules with the same match.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5ab54e57 a2ebfbb7

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c

+213 −58
Original line number Diff line number Diff line
@@ -18,12 +18,39 @@ enum dr_action_valid_state { 
	DR_ACTION_STATE_ENCAP,

	DR_ACTION_STATE_DECAP,

	DR_ACTION_STATE_MODIFY_HDR,

	DR_ACTION_STATE_MODIFY_VLAN,

	DR_ACTION_STATE_POP_VLAN,

	DR_ACTION_STATE_PUSH_VLAN,

	DR_ACTION_STATE_NON_TERM,

	DR_ACTION_STATE_TERM,

	DR_ACTION_STATE_MAX,

};



static const char * const action_type_to_str[] = {

	[DR_ACTION_TYP_TNL_L2_TO_L2] = "DR_ACTION_TYP_TNL_L2_TO_L2",

	[DR_ACTION_TYP_L2_TO_TNL_L2] = "DR_ACTION_TYP_L2_TO_TNL_L2",

	[DR_ACTION_TYP_TNL_L3_TO_L2] = "DR_ACTION_TYP_TNL_L3_TO_L2",

	[DR_ACTION_TYP_L2_TO_TNL_L3] = "DR_ACTION_TYP_L2_TO_TNL_L3",

	[DR_ACTION_TYP_DROP] = "DR_ACTION_TYP_DROP",

	[DR_ACTION_TYP_QP] = "DR_ACTION_TYP_QP",

	[DR_ACTION_TYP_FT] = "DR_ACTION_TYP_FT",

	[DR_ACTION_TYP_CTR] = "DR_ACTION_TYP_CTR",

	[DR_ACTION_TYP_TAG] = "DR_ACTION_TYP_TAG",

	[DR_ACTION_TYP_MODIFY_HDR] = "DR_ACTION_TYP_MODIFY_HDR",

	[DR_ACTION_TYP_VPORT] = "DR_ACTION_TYP_VPORT",

	[DR_ACTION_TYP_POP_VLAN] = "DR_ACTION_TYP_POP_VLAN",

	[DR_ACTION_TYP_PUSH_VLAN] = "DR_ACTION_TYP_PUSH_VLAN",

	[DR_ACTION_TYP_INSERT_HDR] = "DR_ACTION_TYP_INSERT_HDR",

	[DR_ACTION_TYP_REMOVE_HDR] = "DR_ACTION_TYP_REMOVE_HDR",

	[DR_ACTION_TYP_MAX] = "DR_ACTION_UNKNOWN",

};



static const char *dr_action_id_to_str(enum mlx5dr_action_type action_id)

{

	if (action_id > DR_ACTION_TYP_MAX)

		action_id = DR_ACTION_TYP_MAX;

	return action_type_to_str[action_id];

}



static const enum dr_action_valid_state

next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] = {

	[DR_ACTION_DOMAIN_NIC_INGRESS] = {
@@ -39,8 +66,10 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_REMOVE_HDR]	= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

		},

		[DR_ACTION_STATE_DECAP] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,
@@ -53,7 +82,8 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

		},

		[DR_ACTION_STATE_ENCAP] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,
@@ -73,20 +103,31 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

		},

		[DR_ACTION_STATE_MODIFY_VLAN] = {

		[DR_ACTION_STATE_POP_VLAN] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_QP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_TAG]		= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_TAG]		= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

		},

		[DR_ACTION_STATE_PUSH_VLAN] = {

			[DR_ACTION_TYP_QP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_TAG]		= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

		},

		[DR_ACTION_STATE_NON_TERM] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_QP]		= DR_ACTION_STATE_TERM,
@@ -99,8 +140,10 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_REMOVE_HDR]	= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

		},

		[DR_ACTION_STATE_TERM] = {

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_TERM,
@@ -115,8 +158,16 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_REMOVE_HDR]	= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

		},

		[DR_ACTION_STATE_DECAP] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_DECAP,

		},

		[DR_ACTION_STATE_ENCAP] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,
@@ -132,14 +183,25 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

		},

		[DR_ACTION_STATE_MODIFY_VLAN] = {

		[DR_ACTION_STATE_POP_VLAN] = {

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

		},

		[DR_ACTION_STATE_PUSH_VLAN] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,
@@ -152,8 +214,10 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_REMOVE_HDR]	= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

		},

		[DR_ACTION_STATE_TERM] = {

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_TERM,
@@ -170,8 +234,10 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_REMOVE_HDR]	= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

		},

		[DR_ACTION_STATE_DECAP] = {
@@ -180,11 +246,12 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

		},

		[DR_ACTION_STATE_ENCAP] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,
@@ -203,13 +270,26 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

		},

		[DR_ACTION_STATE_POP_VLAN] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

		},

		[DR_ACTION_STATE_MODIFY_VLAN] = {

		[DR_ACTION_STATE_PUSH_VLAN] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,
@@ -226,8 +306,10 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_REMOVE_HDR]	= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

		},

		[DR_ACTION_STATE_TERM] = {
@@ -244,8 +326,17 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_REMOVE_HDR]	= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

		},

		[DR_ACTION_STATE_DECAP] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

		},

		[DR_ACTION_STATE_ENCAP] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,
@@ -262,15 +353,27 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

		},

		[DR_ACTION_STATE_POP_VLAN] = {

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_MODIFY_HDR]	= DR_ACTION_STATE_MODIFY_HDR,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

		},

		[DR_ACTION_STATE_MODIFY_VLAN] = {

		[DR_ACTION_STATE_PUSH_VLAN] = {

			[DR_ACTION_TYP_DROP]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_FT]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_SAMPLER]		= DR_ACTION_STATE_TERM,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_CTR]		= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,
@@ -285,7 +388,9 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX] 
			[DR_ACTION_TYP_L2_TO_TNL_L2]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_L2_TO_TNL_L3]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_INSERT_HDR]	= DR_ACTION_STATE_ENCAP,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_MODIFY_VLAN,

			[DR_ACTION_TYP_REMOVE_HDR]	= DR_ACTION_STATE_DECAP,

			[DR_ACTION_TYP_PUSH_VLAN]	= DR_ACTION_STATE_PUSH_VLAN,

			[DR_ACTION_TYP_POP_VLAN]	= DR_ACTION_STATE_POP_VLAN,

			[DR_ACTION_TYP_VPORT]		= DR_ACTION_STATE_TERM,

		},

		[DR_ACTION_STATE_TERM] = {
@@ -314,6 +419,9 @@ dr_action_reformat_to_action_type(enum mlx5dr_action_reformat_type reformat_type 
	case DR_ACTION_REFORMAT_TYP_INSERT_HDR:

		*action_type = DR_ACTION_TYP_INSERT_HDR;

		break;

	case DR_ACTION_REFORMAT_TYP_REMOVE_HDR:

		*action_type = DR_ACTION_TYP_REMOVE_HDR;

		break;

	default:

		return -EINVAL;

	}
@@ -326,7 +434,7 @@ dr_action_reformat_to_action_type(enum mlx5dr_action_reformat_type reformat_type 
 * the new size of the STEs array, rule with actions.

 */

static void dr_actions_apply(struct mlx5dr_domain *dmn,

			     enum mlx5dr_ste_entry_type ste_type,

			     enum mlx5dr_domain_nic_type nic_type,

			     u8 *action_type_set,

			     u8 *last_ste,

			     struct mlx5dr_ste_actions_attr *attr,
@@ -335,7 +443,7 @@ static void dr_actions_apply(struct mlx5dr_domain *dmn, 
	struct mlx5dr_ste_ctx *ste_ctx = dmn->ste_ctx;

	u32 added_stes = 0;



	if (ste_type == MLX5DR_STE_TYPE_RX)

	if (nic_type == DR_DOMAIN_NIC_TYPE_RX)

		mlx5dr_ste_set_actions_rx(ste_ctx, dmn, action_type_set,

					  last_ste, attr, &added_stes);

	else
@@ -347,7 +455,7 @@ static void dr_actions_apply(struct mlx5dr_domain *dmn, 


static enum dr_action_domain

dr_action_get_action_domain(enum mlx5dr_domain_type domain,

			    enum mlx5dr_ste_entry_type ste_type)

			    enum mlx5dr_domain_nic_type nic_type)

{

	switch (domain) {

	case MLX5DR_DOMAIN_TYPE_NIC_RX:
@@ -355,7 +463,7 @@ dr_action_get_action_domain(enum mlx5dr_domain_type domain, 
	case MLX5DR_DOMAIN_TYPE_NIC_TX:

		return DR_ACTION_DOMAIN_NIC_EGRESS;

	case MLX5DR_DOMAIN_TYPE_FDB:

		if (ste_type == MLX5DR_STE_TYPE_RX)

		if (nic_type == DR_DOMAIN_NIC_TYPE_RX)

			return DR_ACTION_DOMAIN_FDB_INGRESS;

		return DR_ACTION_DOMAIN_FDB_EGRESS;

	default:
@@ -421,6 +529,18 @@ static int dr_action_handle_cs_recalc(struct mlx5dr_domain *dmn, 
	return 0;

}



static void dr_action_print_sequence(struct mlx5dr_domain *dmn,

				     struct mlx5dr_action *actions[],

				     int last_idx)

{

	int i;



	for (i = 0; i <= last_idx; i++)

		mlx5dr_err(dmn, "< %s (%d) > ",

			   dr_action_id_to_str(actions[i]->action_type),

			   actions[i]->action_type);

}



#define WITH_VLAN_NUM_HW_ACTIONS 6



int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher,
@@ -431,7 +551,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
				 u32 *new_hw_ste_arr_sz)

{

	struct mlx5dr_domain_rx_tx *nic_dmn = nic_matcher->nic_tbl->nic_dmn;

	bool rx_rule = nic_dmn->ste_type == MLX5DR_STE_TYPE_RX;

	bool rx_rule = nic_dmn->type == DR_DOMAIN_NIC_TYPE_RX;

	struct mlx5dr_domain *dmn = matcher->tbl->dmn;

	u8 action_type_set[DR_ACTION_TYP_MAX] = {};

	struct mlx5dr_ste_actions_attr attr = {};
@@ -445,7 +565,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
	attr.gvmi = dmn->info.caps.gvmi;

	attr.hit_gvmi = dmn->info.caps.gvmi;

	attr.final_icm_addr = nic_dmn->default_icm_addr;

	action_domain = dr_action_get_action_domain(dmn->type, nic_dmn->ste_type);

	action_domain = dr_action_get_action_domain(dmn->type, nic_dmn->type);



	for (i = 0; i < num_actions; i++) {

		struct mlx5dr_action_dest_tbl *dest_tbl;
@@ -467,10 +587,10 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
				if (dest_tbl->tbl->dmn != dmn) {

					mlx5dr_err(dmn,

						   "Destination table belongs to a different domain\n");

					goto out_invalid_arg;

					return -EINVAL;

				}

				if (dest_tbl->tbl->level <= matcher->tbl->level) {

					mlx5_core_warn_once(dmn->mdev,

					mlx5_core_dbg_once(dmn->mdev,

							   "Connecting table to a lower/same level destination table\n");

					mlx5dr_dbg(dmn,

						   "Connecting table at level %d to a destination table at level %d\n",
@@ -509,7 +629,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
			break;

		case DR_ACTION_TYP_QP:

			mlx5dr_info(dmn, "Domain doesn't support QP\n");

			goto out_invalid_arg;

			return -EOPNOTSUPP;

		case DR_ACTION_TYP_CTR:

			attr.ctr_id = action->ctr->ctr_id +

				action->ctr->offeset;
@@ -536,7 +656,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
			if (rx_rule &&

			    !(dmn->ste_ctx->actions_caps & DR_STE_CTX_ACTION_CAP_RX_ENCAP)) {

				mlx5dr_info(dmn, "Device doesn't support Encap on RX\n");

				goto out_invalid_arg;

				return -EOPNOTSUPP;

			}

			attr.reformat.size = action->reformat->size;

			attr.reformat.id = action->reformat->id;
@@ -549,48 +669,66 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
			attr.hit_gvmi = action->vport->caps->vhca_gvmi;

			dest_action = action;

			if (rx_rule) {

				/* Loopback on WIRE vport is not supported */

				if (action->vport->caps->num == WIRE_PORT)

					goto out_invalid_arg;



				if (action->vport->caps->num == WIRE_PORT) {

					mlx5dr_dbg(dmn, "Device doesn't support Loopback on WIRE vport\n");

					return -EOPNOTSUPP;

				}

				attr.final_icm_addr = action->vport->caps->icm_address_rx;

			} else {

				attr.final_icm_addr = action->vport->caps->icm_address_tx;

			}

			break;

		case DR_ACTION_TYP_POP_VLAN:

			if (!rx_rule && !(dmn->ste_ctx->actions_caps &

					  DR_STE_CTX_ACTION_CAP_TX_POP)) {

				mlx5dr_dbg(dmn, "Device doesn't support POP VLAN action on TX\n");

				return -EOPNOTSUPP;

			}



			max_actions_type = MLX5DR_MAX_VLANS;

			attr.vlans.count++;

			break;

		case DR_ACTION_TYP_PUSH_VLAN:

			if (rx_rule && !(dmn->ste_ctx->actions_caps &

					 DR_STE_CTX_ACTION_CAP_RX_PUSH)) {

				mlx5dr_dbg(dmn, "Device doesn't support PUSH VLAN action on RX\n");

				return -EOPNOTSUPP;

			}



			max_actions_type = MLX5DR_MAX_VLANS;

			if (attr.vlans.count == MLX5DR_MAX_VLANS)

			if (attr.vlans.count == MLX5DR_MAX_VLANS) {

				mlx5dr_dbg(dmn, "Max VLAN push/pop count exceeded\n");

				return -EINVAL;

			}



			attr.vlans.headers[attr.vlans.count++] = action->push_vlan->vlan_hdr;

			break;

		case DR_ACTION_TYP_INSERT_HDR:

		case DR_ACTION_TYP_REMOVE_HDR:

			attr.reformat.size = action->reformat->size;

			attr.reformat.id = action->reformat->id;

			attr.reformat.param_0 = action->reformat->param_0;

			attr.reformat.param_1 = action->reformat->param_1;

			break;

		default:

			goto out_invalid_arg;

			mlx5dr_err(dmn, "Unsupported action type %d\n", action_type);

			return -EINVAL;

		}



		/* Check action duplication */

		if (++action_type_set[action_type] > max_actions_type) {

			mlx5dr_err(dmn, "Action type %d supports only max %d time(s)\n",

				   action_type, max_actions_type);

			goto out_invalid_arg;

			return -EINVAL;

		}



		/* Check action state machine is valid */

		if (dr_action_validate_and_get_next_state(action_domain,

							  action_type,

							  &state)) {

			mlx5dr_err(dmn, "Invalid action sequence provided\n");

			mlx5dr_err(dmn, "Invalid action (gvmi: %d, is_rx: %d) sequence provided:",

				   attr.gvmi, rx_rule);

			dr_action_print_sequence(dmn, actions, i);

			return -EOPNOTSUPP;

		}

	}
@@ -614,16 +752,13 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
	}



	dr_actions_apply(dmn,

			 nic_dmn->ste_type,

			 nic_dmn->type,

			 action_type_set,

			 last_ste,

			 &attr,

			 new_hw_ste_arr_sz);



	return 0;



out_invalid_arg:

	return -EINVAL;

}



static unsigned int action_size[DR_ACTION_TYP_MAX] = {
@@ -638,6 +773,7 @@ static unsigned int action_size[DR_ACTION_TYP_MAX] = { 
	[DR_ACTION_TYP_VPORT]        = sizeof(struct mlx5dr_action_vport),

	[DR_ACTION_TYP_PUSH_VLAN]    = sizeof(struct mlx5dr_action_push_vlan),

	[DR_ACTION_TYP_INSERT_HDR]   = sizeof(struct mlx5dr_action_reformat),

	[DR_ACTION_TYP_REMOVE_HDR]   = sizeof(struct mlx5dr_action_reformat),

	[DR_ACTION_TYP_SAMPLER]      = sizeof(struct mlx5dr_action_sampler),

};
@@ -709,7 +845,8 @@ mlx5dr_action_create_dest_table(struct mlx5dr_table *tbl) 
struct mlx5dr_action *

mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn,

				   struct mlx5dr_action_dest *dests,

				   u32 num_of_dests)

				   u32 num_of_dests,

				   bool ignore_flow_level)

{

	struct mlx5dr_cmd_flow_destination_hw_info *hw_dests;

	struct mlx5dr_action **ref_actions;
@@ -776,7 +913,8 @@ mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn, 
				      num_of_dests,

				      reformat_req,

				      &action->dest_tbl->fw_tbl.id,

				      &action->dest_tbl->fw_tbl.group_id);

				      &action->dest_tbl->fw_tbl.group_id,

				      ignore_flow_level);

	if (ret)

		goto free_action;
@@ -884,11 +1022,23 @@ dr_action_verify_reformat_params(enum mlx5dr_action_type reformat_type, 
				 size_t data_sz,

				 void *data)

{

	if (reformat_type == DR_ACTION_TYP_INSERT_HDR) {

		if ((!data && data_sz) || (data && !data_sz) ||

	    ((reformat_param_0 || reformat_param_1) &&

	     reformat_type != DR_ACTION_TYP_INSERT_HDR) ||

	    reformat_type > DR_ACTION_TYP_INSERT_HDR) {

		mlx5dr_dbg(dmn, "Invalid reformat parameter!\n");

		    MLX5_CAP_GEN_2(dmn->mdev, max_reformat_insert_size) < data_sz ||

		    MLX5_CAP_GEN_2(dmn->mdev, max_reformat_insert_offset) < reformat_param_1) {

			mlx5dr_dbg(dmn, "Invalid reformat parameters for INSERT_HDR\n");

			goto out_err;

		}

	} else if (reformat_type == DR_ACTION_TYP_REMOVE_HDR) {

		if (data ||

		    MLX5_CAP_GEN_2(dmn->mdev, max_reformat_remove_size) < data_sz ||

		    MLX5_CAP_GEN_2(dmn->mdev, max_reformat_remove_offset) < reformat_param_1) {

			mlx5dr_dbg(dmn, "Invalid reformat parameters for REMOVE_HDR\n");

			goto out_err;

		}

	} else if (reformat_param_0 || reformat_param_1 ||

		   reformat_type > DR_ACTION_TYP_REMOVE_HDR) {

		mlx5dr_dbg(dmn, "Invalid reformat parameters\n");

		goto out_err;

	}
@@ -987,7 +1137,6 @@ dr_action_create_reformat_action(struct mlx5dr_domain *dmn, 
		return 0;

	}

	case DR_ACTION_TYP_INSERT_HDR:

	{

		ret = mlx5dr_cmd_create_reformat_ctx(dmn->mdev,

						     MLX5_REFORMAT_TYPE_INSERT_HDR,

						     reformat_param_0,
@@ -1002,7 +1151,12 @@ dr_action_create_reformat_action(struct mlx5dr_domain *dmn, 
		action->reformat->param_0 = reformat_param_0;

		action->reformat->param_1 = reformat_param_1;

		return 0;

	}

	case DR_ACTION_TYP_REMOVE_HDR:

		action->reformat->id = 0;

		action->reformat->size = data_sz;

		action->reformat->param_0 = reformat_param_0;

		action->reformat->param_1 = reformat_param_1;

		return 0;

	default:

		mlx5dr_info(dmn, "Reformat type is not supported %d\n", action->action_type);

		return -EINVAL;
@@ -1658,6 +1812,7 @@ int mlx5dr_action_destroy(struct mlx5dr_action *action) 
		}

		break;

	case DR_ACTION_TYP_TNL_L2_TO_L2:

	case DR_ACTION_TYP_REMOVE_HDR:

		refcount_dec(&action->reformat->dmn->refcount);

		break;

	case DR_ACTION_TYP_TNL_L3_TO_L2:

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -655,6 +655,7 @@ int mlx5dr_cmd_set_fte(struct mlx5_core_dev *dev, 
	MLX5_SET(set_fte_in, in, table_type, ft->type);

	MLX5_SET(set_fte_in, in, table_id, ft->id);

	MLX5_SET(set_fte_in, in, flow_index, fte->index);

	MLX5_SET(set_fte_in, in, ignore_flow_level, fte->ignore_flow_level);

	if (ft->vport) {

		MLX5_SET(set_fte_in, in, vport_number, ft->vport);

		MLX5_SET(set_fte_in, in, other_vport, 1);

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c

+4 −4
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev, 
			return -ENOTSUPP;



		dmn->info.supp_sw_steering = true;

		dmn->info.rx.ste_type = MLX5DR_STE_TYPE_RX;

		dmn->info.rx.type = DR_DOMAIN_NIC_TYPE_RX;

		dmn->info.rx.default_icm_addr = dmn->info.caps.nic_rx_drop_address;

		dmn->info.rx.drop_icm_addr = dmn->info.caps.nic_rx_drop_address;

		break;
@@ -254,7 +254,7 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev, 
			return -ENOTSUPP;



		dmn->info.supp_sw_steering = true;

		dmn->info.tx.ste_type = MLX5DR_STE_TYPE_TX;

		dmn->info.tx.type = DR_DOMAIN_NIC_TYPE_TX;

		dmn->info.tx.default_icm_addr = dmn->info.caps.nic_tx_allow_address;

		dmn->info.tx.drop_icm_addr = dmn->info.caps.nic_tx_drop_address;

		break;
@@ -265,8 +265,8 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev, 
		if (!DR_DOMAIN_SW_STEERING_SUPPORTED(dmn, fdb))

			return -ENOTSUPP;



		dmn->info.rx.ste_type = MLX5DR_STE_TYPE_RX;

		dmn->info.tx.ste_type = MLX5DR_STE_TYPE_TX;

		dmn->info.rx.type = DR_DOMAIN_NIC_TYPE_RX;

		dmn->info.tx.type = DR_DOMAIN_NIC_TYPE_TX;

		vport_cap = mlx5dr_get_vport_cap(&dmn->info.caps, 0);

		if (!vport_cap) {

			mlx5dr_err(dmn, "Failed to get esw manager vport\n");

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_fw.c

+3 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn, 
			    int num_dest,

			    bool reformat_req,

			    u32 *tbl_id,

			    u32 *group_id)

			    u32 *group_id,

			    bool ignore_flow_level)

{

	struct mlx5dr_cmd_create_flow_table_attr ft_attr = {};

	struct mlx5dr_cmd_fte_info fte_info = {};
@@ -137,6 +138,7 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn, 
	fte_info.dests_size = num_dest;

	fte_info.val = val;

	fte_info.dest_arr = dest;

	fte_info.ignore_flow_level = ignore_flow_level;



	ret = mlx5dr_cmd_set_fte(dmn->mdev, 0, 0, &ft_info, *group_id, &fte_info);

	if (ret) {

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c

+14 −2

File changed.

Preview size limit exceeded, changes collapsed.