DPDK patches and discussions
 help / color / mirror / Atom feed
From: Zhirun Yan <zhirun.yan@intel.com>
To: dev@dpdk.org, qi.z.zhang@intel.com, yahui.cao@intel.com,
	xiao.w.wang@intel.com, junfeng.guo@intel.com
Cc: simei.su@intel.com, ting.xu@intel.com, yuying.zhang@intel.com,
	Zhirun Yan <zhirun.yan@intel.com>
Subject: [dpdk-dev] [PATCH v1 3/5] net/ice: add outer input set mask to distinguish outer fields
Date: Mon, 21 Dec 2020 14:51:48 +0800
Message-ID: <20201221065150.1600719-4-zhirun.yan@intel.com> (raw)
In-Reply-To: <20201221065150.1600719-1-zhirun.yan@intel.com>

Add 64-bit input_set_mask_f for outer input set. input_set_mask_f is
used for inner fields or non-tunnel fields. Adjust indentation of
ice_pattern_match_item list in switch, RSS and FDIR for easy
review. For fields in tunnel layer, like GTPU TEID, put them in
outer part.

Signed-off-by: Zhirun Yan <zhirun.yan@intel.com>
---
 drivers/net/ice/ice_fdir_filter.c   | 110 ++++-----
 drivers/net/ice/ice_generic_flow.h  |   1 +
 drivers/net/ice/ice_hash.c          | 192 ++++++---------
 drivers/net/ice/ice_switch_filter.c | 348 ++++++++++------------------
 4 files changed, 231 insertions(+), 420 deletions(-)

diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index 1f2576a444..76e0a8df38 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -55,92 +55,74 @@
 	ICE_FDIR_INSET_ETH_IPV6 | \
 	ICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT)
 
-#define ICE_FDIR_INSET_VXLAN_IPV4 (\
+#define ICE_FDIR_INSET_VXLAN_IPV4_L (\
 	ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST)
 
-#define ICE_FDIR_INSET_VXLAN_IPV4_TCP (\
-	ICE_FDIR_INSET_VXLAN_IPV4 | \
+#define ICE_FDIR_INSET_VXLAN_IPV4_TCP_L (\
+	ICE_FDIR_INSET_VXLAN_IPV4_L | \
 	ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)
 
-#define ICE_FDIR_INSET_VXLAN_IPV4_UDP (\
-	ICE_FDIR_INSET_VXLAN_IPV4 | \
+#define ICE_FDIR_INSET_VXLAN_IPV4_UDP_L (\
+	ICE_FDIR_INSET_VXLAN_IPV4_L | \
 	ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)
 
-#define ICE_FDIR_INSET_VXLAN_IPV4_SCTP (\
-	ICE_FDIR_INSET_VXLAN_IPV4 | \
+#define ICE_FDIR_INSET_VXLAN_IPV4_SCTP_L (\
+	ICE_FDIR_INSET_VXLAN_IPV4_L | \
 	ICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT)
 
-#define ICE_FDIR_INSET_IPV4_GTPU (\
+#define ICE_FDIR_INSET_IPV4_GTPU_F (\
 	ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID)
 
-#define ICE_FDIR_INSET_IPV4_GTPU_EH (\
+#define ICE_FDIR_INSET_IPV4_GTPU_EH_F (\
 	ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
 	ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI)
 
-#define ICE_FDIR_INSET_IPV6_GTPU (\
+#define ICE_FDIR_INSET_IPV6_GTPU_F (\
 	ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | ICE_INSET_GTPU_TEID)
 
-#define ICE_FDIR_INSET_IPV6_GTPU_EH (\
+#define ICE_FDIR_INSET_IPV6_GTPU_EH_F (\
 	ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | \
 	ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI)
 
 static struct ice_pattern_match_item ice_fdir_pattern_os[] = {
-	{pattern_eth_ipv4,             ICE_FDIR_INSET_ETH_IPV4,              ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp,         ICE_FDIR_INSET_ETH_IPV4_UDP,          ICE_INSET_NONE},
-	{pattern_eth_ipv4_tcp,         ICE_FDIR_INSET_ETH_IPV4_TCP,          ICE_INSET_NONE},
-	{pattern_eth_ipv4_sctp,        ICE_FDIR_INSET_ETH_IPV4_SCTP,         ICE_INSET_NONE},
-	{pattern_eth_ipv6,             ICE_FDIR_INSET_ETH_IPV6,              ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp,         ICE_FDIR_INSET_ETH_IPV6_UDP,          ICE_INSET_NONE},
-	{pattern_eth_ipv6_tcp,         ICE_FDIR_INSET_ETH_IPV6_TCP,          ICE_INSET_NONE},
-	{pattern_eth_ipv6_sctp,        ICE_FDIR_INSET_ETH_IPV6_SCTP,         ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_ipv4,
-				       ICE_FDIR_INSET_VXLAN_IPV4,            ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_ipv4_udp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_UDP,        ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_ipv4_tcp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_TCP,        ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_ipv4_sctp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,
-				       ICE_FDIR_INSET_VXLAN_IPV4,            ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_UDP,        ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_TCP,        ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},
+	{pattern_eth_ipv4,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV4_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_tcp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV4_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_sctp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV4_SCTP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV6,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV6_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_tcp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV6_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_sctp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV6_SCTP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_ipv4,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_L,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_ipv4_udp,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_UDP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_ipv4_tcp,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_TCP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_ipv4_sctp,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_SCTP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_L,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,	ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_UDP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,	ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_TCP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,	ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_SCTP_L,	ICE_INSET_NONE},
 };
 
 static struct ice_pattern_match_item ice_fdir_pattern_comms[] = {
-	{pattern_ethertype,	       ICE_FDIR_INSET_ETH,		     ICE_INSET_NONE},
-	{pattern_eth_ipv4,             ICE_FDIR_INSET_ETH_IPV4,              ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp,         ICE_FDIR_INSET_ETH_IPV4_UDP,          ICE_INSET_NONE},
-	{pattern_eth_ipv4_tcp,         ICE_FDIR_INSET_ETH_IPV4_TCP,          ICE_INSET_NONE},
-	{pattern_eth_ipv4_sctp,        ICE_FDIR_INSET_ETH_IPV4_SCTP,         ICE_INSET_NONE},
-	{pattern_eth_ipv6,             ICE_FDIR_INSET_ETH_IPV6,              ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp,         ICE_FDIR_INSET_ETH_IPV6_UDP,          ICE_INSET_NONE},
-	{pattern_eth_ipv6_tcp,         ICE_FDIR_INSET_ETH_IPV6_TCP,          ICE_INSET_NONE},
-	{pattern_eth_ipv6_sctp,        ICE_FDIR_INSET_ETH_IPV6_SCTP,         ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_ipv4,
-				       ICE_FDIR_INSET_VXLAN_IPV4,            ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_ipv4_udp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_UDP,        ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_ipv4_tcp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_TCP,        ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_ipv4_sctp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,
-				       ICE_FDIR_INSET_VXLAN_IPV4,            ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_UDP,        ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_TCP,        ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,
-				       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},
-	{pattern_eth_ipv4_gtpu,	       ICE_FDIR_INSET_IPV4_GTPU,             ICE_INSET_NONE},
-	{pattern_eth_ipv4_gtpu_eh,     ICE_FDIR_INSET_IPV4_GTPU_EH,          ICE_INSET_NONE},
-	{pattern_eth_ipv6_gtpu,	       ICE_FDIR_INSET_IPV6_GTPU,             ICE_INSET_NONE},
-	{pattern_eth_ipv6_gtpu_eh,     ICE_FDIR_INSET_IPV6_GTPU_EH,          ICE_INSET_NONE},
+	{pattern_ethertype,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH,			ICE_INSET_NONE},
+	{pattern_eth_ipv4,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV4_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_tcp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV4_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_sctp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV4_SCTP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV6,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp,				ICE_INSET_NONE,			ICE_FDIR_INSET_ETH_IPV6_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_ipv4,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_L,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_ipv4_udp,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_UDP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_ipv4_tcp,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_TCP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_ipv4_sctp,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_SCTP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,		ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_L,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,	ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_UDP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,	ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_TCP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,	ICE_INSET_NONE,			ICE_FDIR_INSET_VXLAN_IPV4_SCTP_L,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_gtpu,				ICE_FDIR_INSET_IPV4_GTPU_F,	ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv4_gtpu_eh,			ICE_FDIR_INSET_IPV4_GTPU_EH_F,	ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv6_gtpu,				ICE_FDIR_INSET_IPV6_GTPU_F,	ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv6_gtpu_eh,			ICE_FDIR_INSET_IPV6_GTPU_EH_F,	ICE_INSET_NONE,				ICE_INSET_NONE},
 };
 
 static struct ice_flow_parser ice_fdir_parser_os;
diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
index a03b2fc21d..f15c262625 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -473,6 +473,7 @@ enum ice_flow_classification_stage {
 struct ice_pattern_match_item {
 	enum rte_flow_item_type *pattern_list;
 	/* pattern_list must end with RTE_FLOW_ITEM_TYPE_END */
+	uint64_t input_set_mask_f;
 	uint64_t input_set_mask;
 	void *meta;
 };
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index fe3e06c579..72558161bf 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -315,135 +315,77 @@ struct rss_type_match_hdr hint_eth_pppoes = {
 
 /* Supported pattern for os default package. */
 static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {
-	{pattern_eth_ipv4,	ICE_INSET_NONE,	&hint_eth_ipv4},
-	{pattern_eth_ipv4_udp,	ICE_INSET_NONE,	&hint_eth_ipv4_udp},
-	{pattern_eth_ipv4_tcp,	ICE_INSET_NONE,	&hint_eth_ipv4_tcp},
-	{pattern_eth_ipv4_sctp,	ICE_INSET_NONE,	&hint_eth_ipv4_sctp},
-	{pattern_eth_ipv6,	ICE_INSET_NONE,	&hint_eth_ipv6},
-	{pattern_eth_ipv6_udp,	ICE_INSET_NONE,	&hint_eth_ipv6_udp},
-	{pattern_eth_ipv6_tcp,	ICE_INSET_NONE,	&hint_eth_ipv6_tcp},
-	{pattern_eth_ipv6_sctp,	ICE_INSET_NONE,	&hint_eth_ipv6_sctp},
-	{pattern_empty,		ICE_INSET_NONE,	&hint_empty},
+	{pattern_eth_ipv4,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4},
+	{pattern_eth_ipv4_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_udp},
+	{pattern_eth_ipv4_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_tcp},
+	{pattern_eth_ipv4_sctp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_sctp},
+	{pattern_eth_ipv6,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6},
+	{pattern_eth_ipv6_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_udp},
+	{pattern_eth_ipv6_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_tcp},
+	{pattern_eth_ipv6_sctp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_sctp},
+	{pattern_empty,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_empty},
 };
 
 /* Supported pattern for comms package. */
 static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
-	{pattern_empty,			    ICE_INSET_NONE,
-		&hint_empty},
-	{pattern_eth_ipv4,		    ICE_INSET_NONE,
-		&hint_eth_ipv4},
-	{pattern_eth_ipv4_udp,		    ICE_INSET_NONE,
-		&hint_eth_ipv4_udp},
-	{pattern_eth_ipv4_tcp,		    ICE_INSET_NONE,
-		&hint_eth_ipv4_tcp},
-	{pattern_eth_ipv4_sctp,		    ICE_INSET_NONE,
-		&hint_eth_ipv4_sctp},
-	{pattern_eth_ipv4_gtpu_ipv4,	    ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_ipv4},
-	{pattern_eth_ipv4_gtpu_ipv4_udp,    ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_ipv4_udp},
-	{pattern_eth_ipv4_gtpu_ipv4_tcp,    ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_ipv4_tcp},
-	{pattern_eth_ipv4_gtpu_ipv6,	    ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_ipv6},
-	{pattern_eth_ipv4_gtpu_ipv6_udp,    ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_ipv6_udp},
-	{pattern_eth_ipv4_gtpu_ipv6_tcp,    ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_ipv6_tcp},
-	{pattern_eth_ipv6_gtpu_ipv4,	    ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_ipv4},
-	{pattern_eth_ipv6_gtpu_ipv4_udp,    ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_ipv4_udp},
-	{pattern_eth_ipv6_gtpu_ipv4_tcp,    ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_ipv4_tcp},
-	{pattern_eth_ipv6_gtpu_ipv6,	    ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_ipv6},
-	{pattern_eth_ipv6_gtpu_ipv6_udp,    ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_ipv6_udp},
-	{pattern_eth_ipv6_gtpu_ipv6_tcp,    ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_ipv6_tcp},
-	{pattern_eth_ipv4_gtpu_eh_ipv4,	    ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_eh_ipv4},
-	{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_eh_ipv4_udp},
-	{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_eh_ipv4_tcp},
-	{pattern_eth_ipv4_gtpu_eh_ipv6,	    ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_eh_ipv6},
-	{pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_eh_ipv6_udp},
-	{pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
-		&hint_eth_ipv4_gtpu_eh_ipv6_tcp},
-	{pattern_eth_ipv6_gtpu_eh_ipv4,	    ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_eh_ipv4},
-	{pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_eh_ipv4_udp},
-	{pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_eh_ipv4_tcp},
-	{pattern_eth_ipv6_gtpu_eh_ipv6,	    ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_eh_ipv6},
-	{pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_eh_ipv6_udp},
-	{pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
-		&hint_eth_ipv6_gtpu_eh_ipv6_tcp},
-	{pattern_eth_pppoes_ipv4,	    ICE_INSET_NONE,
-		&hint_eth_pppoes_ipv4},
-	{pattern_eth_pppoes_ipv4_udp,	    ICE_INSET_NONE,
-		&hint_eth_pppoes_ipv4_udp},
-	{pattern_eth_pppoes_ipv4_tcp,	    ICE_INSET_NONE,
-		&hint_eth_pppoes_ipv4_tcp},
-	{pattern_eth_ipv4_esp,		    ICE_INSET_NONE,
-		&hint_eth_ipv4_esp},
-	{pattern_eth_ipv4_udp_esp,	    ICE_INSET_NONE,
-		&hint_eth_ipv4_udp_esp},
-	{pattern_eth_ipv4_ah,		    ICE_INSET_NONE,
-		&hint_eth_ipv4_ah},
-	{pattern_eth_ipv4_l2tp,		    ICE_INSET_NONE,
-		&hint_eth_ipv4_l2tpv3},
-	{pattern_eth_ipv4_pfcp,		    ICE_INSET_NONE,
-		&hint_eth_ipv4_pfcp},
-	{pattern_eth_vlan_ipv4,		    ICE_INSET_NONE,
-		&hint_eth_vlan_ipv4},
-	{pattern_eth_vlan_ipv4_udp,	    ICE_INSET_NONE,
-		&hint_eth_vlan_ipv4_udp},
-	{pattern_eth_vlan_ipv4_tcp,	    ICE_INSET_NONE,
-		&hint_eth_vlan_ipv4_tcp},
-	{pattern_eth_vlan_ipv4_sctp,	    ICE_INSET_NONE,
-		&hint_eth_vlan_ipv4_sctp},
-	{pattern_eth_ipv6,		    ICE_INSET_NONE,
-		&hint_eth_ipv6},
-	{pattern_eth_ipv6_udp,		    ICE_INSET_NONE,
-		&hint_eth_ipv6_udp},
-	{pattern_eth_ipv6_tcp,		    ICE_INSET_NONE,
-		&hint_eth_ipv6_tcp},
-	{pattern_eth_ipv6_sctp,		    ICE_INSET_NONE,
-		&hint_eth_ipv6_sctp},
-	{pattern_eth_ipv6_esp,		    ICE_INSET_NONE,
-		&hint_eth_ipv6_esp},
-	{pattern_eth_ipv6_udp_esp,	    ICE_INSET_NONE,
-		&hint_eth_ipv6_udp_esp},
-	{pattern_eth_ipv6_ah,		    ICE_INSET_NONE,
-		&hint_eth_ipv6_ah},
-	{pattern_eth_ipv6_l2tp,		    ICE_INSET_NONE,
-		&hint_eth_ipv6_l2tpv3},
-	{pattern_eth_ipv6_pfcp,		    ICE_INSET_NONE,
-		&hint_eth_ipv6_pfcp},
-	{pattern_eth_vlan_ipv6,		    ICE_INSET_NONE,
-		&hint_eth_vlan_ipv6},
-	{pattern_eth_vlan_ipv6_udp,	    ICE_INSET_NONE,
-		&hint_eth_vlan_ipv6_udp},
-	{pattern_eth_vlan_ipv6_tcp,	    ICE_INSET_NONE,
-		&hint_eth_vlan_ipv6_tcp},
-	{pattern_eth_vlan_ipv6_sctp,	    ICE_INSET_NONE,
-		&hint_eth_vlan_ipv6_sctp},
-	{pattern_eth_pppoes_ipv6,	    ICE_INSET_NONE,
-		&hint_eth_pppoes_ipv6},
-	{pattern_eth_pppoes_ipv6_udp,	    ICE_INSET_NONE,
-		&hint_eth_pppoes_ipv6_udp},
-	{pattern_eth_pppoes_ipv6_tcp,	    ICE_INSET_NONE,
-		&hint_eth_pppoes_ipv6_tcp},
-	{pattern_eth_pppoes,		    ICE_INSET_NONE,
-		&hint_eth_pppoes},
+	{pattern_empty,				ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_empty},
+	{pattern_eth_ipv4,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4},
+	{pattern_eth_ipv4_udp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_udp},
+	{pattern_eth_ipv4_tcp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_tcp},
+	{pattern_eth_ipv4_sctp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_sctp},
+	{pattern_eth_ipv4_gtpu_ipv4,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_ipv4},
+	{pattern_eth_ipv4_gtpu_ipv4_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_ipv4_udp},
+	{pattern_eth_ipv4_gtpu_ipv4_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_ipv4_tcp},
+	{pattern_eth_ipv4_gtpu_ipv6,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_ipv6},
+	{pattern_eth_ipv4_gtpu_ipv6_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_ipv6_udp},
+	{pattern_eth_ipv4_gtpu_ipv6_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_ipv6_tcp},
+	{pattern_eth_ipv6_gtpu_ipv4,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_ipv4},
+	{pattern_eth_ipv6_gtpu_ipv4_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_ipv4_udp},
+	{pattern_eth_ipv6_gtpu_ipv4_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_ipv4_tcp},
+	{pattern_eth_ipv6_gtpu_ipv6,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_ipv6},
+	{pattern_eth_ipv6_gtpu_ipv6_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_ipv6_udp},
+	{pattern_eth_ipv6_gtpu_ipv6_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_ipv6_tcp},
+	{pattern_eth_ipv4_gtpu_eh_ipv4,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_eh_ipv4},
+	{pattern_eth_ipv4_gtpu_eh_ipv4_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_eh_ipv4_udp},
+	{pattern_eth_ipv4_gtpu_eh_ipv4_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_eh_ipv4_tcp},
+	{pattern_eth_ipv4_gtpu_eh_ipv6,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_eh_ipv6},
+	{pattern_eth_ipv4_gtpu_eh_ipv6_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_eh_ipv6_udp},
+	{pattern_eth_ipv4_gtpu_eh_ipv6_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_gtpu_eh_ipv6_tcp},
+	{pattern_eth_ipv6_gtpu_eh_ipv4,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_eh_ipv4},
+	{pattern_eth_ipv6_gtpu_eh_ipv4_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_eh_ipv4_udp},
+	{pattern_eth_ipv6_gtpu_eh_ipv4_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_eh_ipv4_tcp},
+	{pattern_eth_ipv6_gtpu_eh_ipv6,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_eh_ipv6},
+	{pattern_eth_ipv6_gtpu_eh_ipv6_udp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_eh_ipv6_udp},
+	{pattern_eth_ipv6_gtpu_eh_ipv6_tcp,	ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_gtpu_eh_ipv6_tcp},
+	{pattern_eth_pppoes_ipv4,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_pppoes_ipv4},
+	{pattern_eth_pppoes_ipv4_udp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_pppoes_ipv4_udp},
+	{pattern_eth_pppoes_ipv4_tcp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_pppoes_ipv4_tcp},
+	{pattern_eth_ipv4_esp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_esp},
+	{pattern_eth_ipv4_udp_esp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_udp_esp},
+	{pattern_eth_ipv4_ah,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_ah},
+	{pattern_eth_ipv4_l2tp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_l2tpv3},
+	{pattern_eth_ipv4_pfcp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv4_pfcp},
+	{pattern_eth_vlan_ipv4,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_vlan_ipv4},
+	{pattern_eth_vlan_ipv4_udp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_vlan_ipv4_udp},
+	{pattern_eth_vlan_ipv4_tcp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_vlan_ipv4_tcp},
+	{pattern_eth_vlan_ipv4_sctp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_vlan_ipv4_sctp},
+	{pattern_eth_ipv6,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6},
+	{pattern_eth_ipv6_udp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_udp},
+	{pattern_eth_ipv6_tcp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_tcp},
+	{pattern_eth_ipv6_sctp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_sctp},
+	{pattern_eth_ipv6_esp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_esp},
+	{pattern_eth_ipv6_udp_esp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_udp_esp},
+	{pattern_eth_ipv6_ah,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_ah},
+	{pattern_eth_ipv6_l2tp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_l2tpv3},
+	{pattern_eth_ipv6_pfcp,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_ipv6_pfcp},
+	{pattern_eth_vlan_ipv6,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_vlan_ipv6},
+	{pattern_eth_vlan_ipv6_udp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_vlan_ipv6_udp},
+	{pattern_eth_vlan_ipv6_tcp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_vlan_ipv6_tcp},
+	{pattern_eth_vlan_ipv6_sctp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_vlan_ipv6_sctp},
+	{pattern_eth_pppoes_ipv6,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_pppoes_ipv6},
+	{pattern_eth_pppoes_ipv6_udp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_pppoes_ipv6_udp},
+	{pattern_eth_pppoes_ipv6_tcp,		ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_pppoes_ipv6_tcp},
+	{pattern_eth_pppoes,			ICE_INSET_NONE,	ICE_INSET_NONE,	&hint_eth_pppoes},
 };
 
 /**
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 8cba6eb7b1..48e1c69756 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -35,8 +35,8 @@
 #define ICE_SW_INSET_ETHER ( \
 	ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
 #define ICE_SW_INSET_MAC_VLAN ( \
-		ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE | \
-		ICE_INSET_VLAN_OUTER)
+	ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE | \
+	ICE_INSET_VLAN_OUTER)
 #define ICE_SW_INSET_MAC_IPV4 ( \
 	ICE_INSET_DMAC | ICE_INSET_IPV4_DST | ICE_INSET_IPV4_SRC | \
 	ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_TOS)
@@ -93,7 +93,7 @@
 	ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
 	ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \
 	ICE_INSET_TUN_IPV4_TOS)
-#define ICE_SW_INSET_MAC_PPPOE  ( \
+#define ICE_SW_INSET_MAC_PPPOE ( \
 	ICE_INSET_VLAN_OUTER | ICE_INSET_VLAN_INNER | \
 	ICE_INSET_DMAC | ICE_INSET_ETHERTYPE | ICE_INSET_PPPOE_SESSION)
 #define ICE_SW_INSET_MAC_PPPOE_PROTO  ( \
@@ -144,246 +144,132 @@ static struct ice_flow_parser ice_switch_perm_parser_comms;
 
 static struct
 ice_pattern_match_item ice_switch_pattern_dist_os[] = {
-	{pattern_ethertype,
-			ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-	{pattern_ethertype_vlan,
-			ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
-	{pattern_eth_arp,
-			ICE_INSET_NONE, ICE_INSET_NONE},
-	{pattern_eth_ipv4,
-			ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp,
-			ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_tcp,
-			ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv6,
-			ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp,
-			ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_tcp,
-			ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,
-			ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
-			ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
-			ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4,
-			ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4_udp,
-			ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
-			ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},
+	{pattern_ethertype,				ICE_INSET_NONE,		ICE_SW_INSET_ETHER,			ICE_INSET_NONE},
+	{pattern_ethertype_vlan,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_VLAN,			ICE_INSET_NONE},
+	{pattern_eth_arp,				ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv4,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4,			ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_tcp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6,			ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_tcp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,		ICE_INSET_NONE,		ICE_SW_INSET_DIST_VXLAN_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,	ICE_INSET_NONE,		ICE_SW_INSET_DIST_VXLAN_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,	ICE_INSET_NONE,		ICE_SW_INSET_DIST_VXLAN_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4,		ICE_INSET_NONE,		ICE_SW_INSET_DIST_NVGRE_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4_udp,		ICE_INSET_NONE,		ICE_SW_INSET_DIST_NVGRE_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,		ICE_INSET_NONE,		ICE_SW_INSET_DIST_NVGRE_IPV4_TCP,	ICE_INSET_NONE},
 };
 
 static struct
 ice_pattern_match_item ice_switch_pattern_dist_comms[] = {
-	{pattern_ethertype,
-			ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-	{pattern_ethertype_vlan,
-			ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
-	{pattern_eth_arp,
-			ICE_INSET_NONE, ICE_INSET_NONE},
-	{pattern_eth_ipv4,
-			ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp,
-			ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_tcp,
-			ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv6,
-			ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp,
-			ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_tcp,
-			ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,
-			ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
-			ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
-			ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4,
-			ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4_udp,
-			ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
-			ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_pppoes,
-			ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes,
-			ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-	{pattern_eth_pppoes_proto,
-			ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_proto,
-			ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv4,
-			ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv4_tcp,
-			ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv4_udp,
-			ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv6,
-			ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv6_tcp,
-			ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv6_udp,
-			ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv4,
-			ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv4_tcp,
-			ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv4_udp,
-			ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv6,
-			ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv6_tcp,
-			ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv6_udp,
-			ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_esp,
-			ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_esp,
-			ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_esp,
-			ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp_esp,
-			ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_ah,
-			ICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE},
-	{pattern_eth_ipv6_ah,
-			ICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp_ah,
-			ICE_INSET_NONE, ICE_INSET_NONE},
-	{pattern_eth_ipv4_l2tp,
-			ICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_l2tp,
-			ICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_pfcp,
-			ICE_INSET_NONE, ICE_INSET_NONE},
-	{pattern_eth_ipv6_pfcp,
-			ICE_INSET_NONE, ICE_INSET_NONE},
+	{pattern_ethertype,				ICE_INSET_NONE,		ICE_SW_INSET_ETHER,			ICE_INSET_NONE},
+	{pattern_ethertype_vlan,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_VLAN,			ICE_INSET_NONE},
+	{pattern_eth_arp,				ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv4,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4,			ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_tcp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6,			ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_tcp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,		ICE_INSET_NONE,		ICE_SW_INSET_DIST_VXLAN_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,	ICE_INSET_NONE,		ICE_SW_INSET_DIST_VXLAN_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,	ICE_INSET_NONE,		ICE_SW_INSET_DIST_VXLAN_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4,		ICE_INSET_NONE,		ICE_SW_INSET_DIST_NVGRE_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4_udp,		ICE_INSET_NONE,		ICE_SW_INSET_DIST_NVGRE_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,		ICE_INSET_NONE,		ICE_SW_INSET_DIST_NVGRE_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_pppoes,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE,			ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE,			ICE_INSET_NONE},
+	{pattern_eth_pppoes_proto,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_PROTO,		ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_proto,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_PROTO,		ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv4,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv4_tcp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv4_udp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv6,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6,		ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv6_tcp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6_TCP,	ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv6_udp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6_UDP,	ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv4,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv4_tcp,		ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv4_udp,		ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv6,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6,		ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv6_tcp,		ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6_TCP,	ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv6_udp,		ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_esp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_ESP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_esp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_ESP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_esp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_ESP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp_esp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_ESP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_ah,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_AH,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_ah,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_AH,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp_ah,			ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv4_l2tp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_L2TP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_l2tp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_L2TP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_pfcp,				ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv6_pfcp,				ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
 };
 
 static struct
 ice_pattern_match_item ice_switch_pattern_perm_os[] = {
-	{pattern_ethertype,
-			ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-	{pattern_ethertype_vlan,
-			ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
-	{pattern_eth_arp,
-			ICE_INSET_NONE, ICE_INSET_NONE},
-	{pattern_eth_ipv4,
-			ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp,
-			ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_tcp,
-			ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv6,
-			ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp,
-			ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_tcp,
-			ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4_udp,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},
+	{pattern_ethertype,				ICE_INSET_NONE,		ICE_SW_INSET_ETHER,			ICE_INSET_NONE},
+	{pattern_ethertype_vlan,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_VLAN,			ICE_INSET_NONE},
+	{pattern_eth_arp,				ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv4,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4,			ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_tcp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6,			ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_tcp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,		ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,	ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,	ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4,		ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4_udp,		ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,		ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,	ICE_INSET_NONE},
 };
 
 static struct
 ice_pattern_match_item ice_switch_pattern_perm_comms[] = {
-	{pattern_ethertype,
-			ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-	{pattern_ethertype_vlan,
-			ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
-	{pattern_eth_arp,
-		ICE_INSET_NONE, ICE_INSET_NONE},
-	{pattern_eth_ipv4,
-			ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp,
-			ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_tcp,
-			ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv6,
-			ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp,
-			ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_tcp,
-			ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4_udp,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
-			ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_pppoes,
-			ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes,
-			ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-	{pattern_eth_pppoes_proto,
-			ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_proto,
-			ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv4,
-			ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv4_tcp,
-			ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv4_udp,
-			ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv6,
-			ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv6_tcp,
-			ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},
-	{pattern_eth_pppoes_ipv6_udp,
-			ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv4,
-			ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv4_tcp,
-			ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv4_udp,
-			ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv6,
-			ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv6_tcp,
-			ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},
-	{pattern_eth_vlan_pppoes_ipv6_udp,
-			ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_esp,
-			ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_udp_esp,
-			ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_esp,
-			ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp_esp,
-			ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_ah,
-			ICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE},
-	{pattern_eth_ipv6_ah,
-			ICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE},
-	{pattern_eth_ipv6_udp_ah,
-			ICE_INSET_NONE, ICE_INSET_NONE},
-	{pattern_eth_ipv4_l2tp,
-			ICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE},
-	{pattern_eth_ipv6_l2tp,
-			ICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE},
-	{pattern_eth_ipv4_pfcp,
-			ICE_INSET_NONE, ICE_INSET_NONE},
-	{pattern_eth_ipv6_pfcp,
-			ICE_INSET_NONE, ICE_INSET_NONE},
+	{pattern_ethertype,				ICE_INSET_NONE,		ICE_SW_INSET_ETHER,			ICE_INSET_NONE},
+	{pattern_ethertype_vlan,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_VLAN,			ICE_INSET_NONE},
+	{pattern_eth_arp,				ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv4,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4,			ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_tcp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6,			ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_UDP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_tcp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_TCP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4,		ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,	ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,	ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4,		ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4_udp,		ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,		ICE_INSET_NONE,		ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_pppoes,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE,			ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE,			ICE_INSET_NONE},
+	{pattern_eth_pppoes_proto,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_PROTO,		ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_proto,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_PROTO,		ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv4,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv4_tcp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv4_udp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv6,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6,		ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv6_tcp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6_TCP,	ICE_INSET_NONE},
+	{pattern_eth_pppoes_ipv6_udp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6_UDP,	ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv4,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4,		ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv4_tcp,		ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4_TCP,	ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv4_udp,		ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV4_UDP,	ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv6,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6,		ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv6_tcp,		ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6_TCP,	ICE_INSET_NONE},
+	{pattern_eth_vlan_pppoes_ipv6_udp,		ICE_INSET_NONE,		ICE_SW_INSET_MAC_PPPOE_IPV6_UDP,	ICE_INSET_NONE},
+	{pattern_eth_ipv4_esp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_ESP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_udp_esp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_ESP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_esp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_ESP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp_esp,			ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_ESP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_ah,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_AH,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_ah,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_AH,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_udp_ah,			ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv4_l2tp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV4_L2TP,		ICE_INSET_NONE},
+	{pattern_eth_ipv6_l2tp,				ICE_INSET_NONE,		ICE_SW_INSET_MAC_IPV6_L2TP,		ICE_INSET_NONE},
+	{pattern_eth_ipv4_pfcp,				ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
+	{pattern_eth_ipv6_pfcp,				ICE_INSET_NONE,		ICE_INSET_NONE,				ICE_INSET_NONE},
 };
 
 static int
-- 
2.25.1


  parent reply	other threads:[~2020-12-21  6:57 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-21  6:51 [dpdk-dev] [PATCH v1 0/5] Refactor FDIR pattern parser Zhirun Yan
2020-12-21  6:51 ` [dpdk-dev] [PATCH v1 1/5] net/ice: clean input set macro definition Zhirun Yan
2020-12-21  6:51 ` [dpdk-dev] [PATCH v1 2/5] net/ice: refactor flow pattern parser Zhirun Yan
2020-12-25  5:21   ` Cao, Yahui
2021-01-07  3:07     ` Yan, Zhirun
2020-12-21  6:51 ` Zhirun Yan [this message]
2020-12-25  5:27   ` [dpdk-dev] [PATCH v1 3/5] net/ice: add outer input set mask to distinguish outer fields Cao, Yahui
2021-01-07  3:11     ` Yan, Zhirun
2020-12-21  6:51 ` [dpdk-dev] [PATCH v1 4/5] net/ice: add outer input set mask check Zhirun Yan
2020-12-25  5:28   ` Cao, Yahui
2021-01-07  3:14     ` Yan, Zhirun
2020-12-21  6:51 ` [dpdk-dev] [PATCH v1 5/5] net/ice: enable FDIR outer/inner fields for VXLAN Zhirun Yan
2021-01-27  5:29 ` [dpdk-dev] [PATCH v2 0/3] Refactor FDIR pattern parser Zhirun Yan
2021-01-27  5:29   ` [dpdk-dev] [PATCH v2 1/3] net/ice: clean input set macro definition Zhirun Yan
2021-01-27  5:29   ` [dpdk-dev] [PATCH v2 2/3] net/ice: refactor flow pattern parser Zhirun Yan
2021-01-27  5:29   ` [dpdk-dev] [PATCH v2 3/3] net/ice: add outer input set mask to distinguish outer fields Zhirun Yan
2021-03-02  2:54   ` [dpdk-dev] [PATCH v3 0/6] Refactor FDIR pattern parser Zhirun Yan
2021-03-02  2:54     ` [dpdk-dev] [PATCH v3 1/6] net/ice: clean input set macro definition Zhirun Yan
2021-03-02  2:54     ` [dpdk-dev] [PATCH v3 2/6] net/ice: refactor structure field Zhirun Yan
2021-03-02  2:54     ` [dpdk-dev] [PATCH v3 3/6] net/ice: refactor flow pattern parser Zhirun Yan
2021-03-02  2:54     ` [dpdk-dev] [PATCH v3 4/6] net/ice: refactor input set conf Zhirun Yan
2021-03-02  2:54     ` [dpdk-dev] [PATCH v3 5/6] net/ice: add outer input set mask to distinguish outer fields Zhirun Yan
2021-03-02  2:54     ` [dpdk-dev] [PATCH v3 6/6] net/ice: clean GTPU flow_type for FDIR Zhirun Yan
2021-03-05  8:46     ` [dpdk-dev] [PATCH v3 0/6] Refactor FDIR pattern parser Zhang, Qi Z

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201221065150.1600719-4-zhirun.yan@intel.com \
    --to=zhirun.yan@intel.com \
    --cc=dev@dpdk.org \
    --cc=junfeng.guo@intel.com \
    --cc=qi.z.zhang@intel.com \
    --cc=simei.su@intel.com \
    --cc=ting.xu@intel.com \
    --cc=xiao.w.wang@intel.com \
    --cc=yahui.cao@intel.com \
    --cc=yuying.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git