git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/qede: remove flags from Tx entry
[dpdk.git] / drivers / net / ice / ice_switch_filter.c
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 5ca0985..6f9e861 100644 (file)
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -38,7 +38,8 @@
        ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE | \
        ICE_INSET_VLAN_INNER)
 #define ICE_SW_INSET_MAC_QINQ  ( \
-       ICE_SW_INSET_MAC_VLAN | ICE_INSET_VLAN_OUTER)
+       ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_VLAN_INNER | \
+       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)
@@ -148,206 +149,108 @@ static struct ice_flow_parser ice_switch_perm_parser;
 
 static struct
 ice_pattern_match_item ice_switch_pattern_dist_list[] = {
-       {pattern_ethertype,
-                       ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-       {pattern_ethertype_vlan,
-                       ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
-       {pattern_ethertype_qinq,
-                       ICE_SW_INSET_MAC_QINQ, 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_eth_qinq_ipv4,
-                       ICE_SW_INSET_MAC_QINQ_IPV4, ICE_INSET_NONE},
-       {pattern_eth_qinq_ipv6,
-                       ICE_SW_INSET_MAC_QINQ_IPV6, ICE_INSET_NONE},
-       {pattern_eth_qinq_pppoes,
-                       ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-       {pattern_eth_qinq_pppoes_proto,
-                       ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-       {pattern_eth_qinq_pppoes_ipv4,
-                       ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-       {pattern_eth_qinq_pppoes_ipv6,
-                       ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
+       {pattern_ethertype,                             ICE_SW_INSET_ETHER,                     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_ethertype_vlan,                        ICE_SW_INSET_MAC_VLAN,                  ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_ethertype_qinq,                        ICE_SW_INSET_MAC_QINQ,                  ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_arp,                               ICE_INSET_NONE,                         ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4,                              ICE_SW_INSET_MAC_IPV4,                  ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp,                          ICE_SW_INSET_MAC_IPV4_UDP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_tcp,                          ICE_SW_INSET_MAC_IPV4_TCP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6,                              ICE_SW_INSET_MAC_IPV6,                  ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_udp,                          ICE_SW_INSET_MAC_IPV6_UDP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_tcp,                          ICE_SW_INSET_MAC_IPV6_TCP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp_vxlan_eth_ipv4,           ICE_SW_INSET_DIST_VXLAN_IPV4,           ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,       ICE_SW_INSET_DIST_VXLAN_IPV4_UDP,       ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,       ICE_SW_INSET_DIST_VXLAN_IPV4_TCP,       ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_nvgre_eth_ipv4,               ICE_SW_INSET_DIST_NVGRE_IPV4,           ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_nvgre_eth_ipv4_udp,           ICE_SW_INSET_DIST_NVGRE_IPV4_UDP,       ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_nvgre_eth_ipv4_tcp,           ICE_SW_INSET_DIST_NVGRE_IPV4_TCP,       ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes,                            ICE_SW_INSET_MAC_PPPOE,                 ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes,                       ICE_SW_INSET_MAC_PPPOE,                 ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_proto,                      ICE_SW_INSET_MAC_PPPOE_PROTO,           ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_proto,                 ICE_SW_INSET_MAC_PPPOE_PROTO,           ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv4,                       ICE_SW_INSET_MAC_PPPOE_IPV4,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv4_tcp,                   ICE_SW_INSET_MAC_PPPOE_IPV4_TCP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv4_udp,                   ICE_SW_INSET_MAC_PPPOE_IPV4_UDP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv6,                       ICE_SW_INSET_MAC_PPPOE_IPV6,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv6_tcp,                   ICE_SW_INSET_MAC_PPPOE_IPV6_TCP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv6_udp,                   ICE_SW_INSET_MAC_PPPOE_IPV6_UDP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv4,                  ICE_SW_INSET_MAC_PPPOE_IPV4,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv4_tcp,              ICE_SW_INSET_MAC_PPPOE_IPV4_TCP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv4_udp,              ICE_SW_INSET_MAC_PPPOE_IPV4_UDP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv6,                  ICE_SW_INSET_MAC_PPPOE_IPV6,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv6_tcp,              ICE_SW_INSET_MAC_PPPOE_IPV6_TCP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv6_udp,              ICE_SW_INSET_MAC_PPPOE_IPV6_UDP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_esp,                          ICE_SW_INSET_MAC_IPV4_ESP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp_esp,                      ICE_SW_INSET_MAC_IPV4_ESP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_esp,                          ICE_SW_INSET_MAC_IPV6_ESP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_udp_esp,                      ICE_SW_INSET_MAC_IPV6_ESP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_ah,                           ICE_SW_INSET_MAC_IPV4_AH,               ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_ah,                           ICE_SW_INSET_MAC_IPV6_AH,               ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_udp_ah,                       ICE_INSET_NONE,                         ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_l2tp,                         ICE_SW_INSET_MAC_IPV4_L2TP,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_l2tp,                         ICE_SW_INSET_MAC_IPV6_L2TP,             ICE_INSET_NONE, 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},
+       {pattern_eth_qinq_ipv4,                         ICE_SW_INSET_MAC_QINQ_IPV4,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_ipv6,                         ICE_SW_INSET_MAC_QINQ_IPV6,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_pppoes,                       ICE_SW_INSET_MAC_PPPOE,                 ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_pppoes_proto,                 ICE_SW_INSET_MAC_PPPOE_PROTO,           ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_pppoes_ipv4,                  ICE_SW_INSET_MAC_PPPOE_IPV4,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_pppoes_ipv6,                  ICE_SW_INSET_MAC_PPPOE_IPV6,            ICE_INSET_NONE, ICE_INSET_NONE},
 };
 
 static struct
 ice_pattern_match_item ice_switch_pattern_perm_list[] = {
-       {pattern_ethertype,
-                       ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-       {pattern_ethertype_vlan,
-                       ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
-       {pattern_ethertype_qinq,
-                       ICE_SW_INSET_MAC_QINQ, 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_eth_qinq_ipv4,
-                       ICE_SW_INSET_MAC_QINQ_IPV4, ICE_INSET_NONE},
-       {pattern_eth_qinq_ipv6,
-                       ICE_SW_INSET_MAC_QINQ_IPV6, ICE_INSET_NONE},
-       {pattern_eth_qinq_pppoes,
-                       ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-       {pattern_eth_qinq_pppoes_proto,
-                       ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-       {pattern_eth_qinq_pppoes_ipv4,
-                       ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-       {pattern_eth_qinq_pppoes_ipv6,
-                       ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
+       {pattern_ethertype,                             ICE_SW_INSET_ETHER,                     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_ethertype_vlan,                        ICE_SW_INSET_MAC_VLAN,                  ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_ethertype_qinq,                        ICE_SW_INSET_MAC_QINQ,                  ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_arp,                               ICE_INSET_NONE,                         ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4,                              ICE_SW_INSET_MAC_IPV4,                  ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp,                          ICE_SW_INSET_MAC_IPV4_UDP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_tcp,                          ICE_SW_INSET_MAC_IPV4_TCP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6,                              ICE_SW_INSET_MAC_IPV6,                  ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_udp,                          ICE_SW_INSET_MAC_IPV6_UDP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_tcp,                          ICE_SW_INSET_MAC_IPV6_TCP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp_vxlan_eth_ipv4,           ICE_SW_INSET_PERM_TUNNEL_IPV4,          ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,       ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,      ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,       ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,      ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_nvgre_eth_ipv4,               ICE_SW_INSET_PERM_TUNNEL_IPV4,          ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_nvgre_eth_ipv4_udp,           ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,      ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_nvgre_eth_ipv4_tcp,           ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,      ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes,                            ICE_SW_INSET_MAC_PPPOE,                 ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes,                       ICE_SW_INSET_MAC_PPPOE,                 ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_proto,                      ICE_SW_INSET_MAC_PPPOE_PROTO,           ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_proto,                 ICE_SW_INSET_MAC_PPPOE_PROTO,           ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv4,                       ICE_SW_INSET_MAC_PPPOE_IPV4,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv4_tcp,                   ICE_SW_INSET_MAC_PPPOE_IPV4_TCP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv4_udp,                   ICE_SW_INSET_MAC_PPPOE_IPV4_UDP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv6,                       ICE_SW_INSET_MAC_PPPOE_IPV6,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv6_tcp,                   ICE_SW_INSET_MAC_PPPOE_IPV6_TCP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_pppoes_ipv6_udp,                   ICE_SW_INSET_MAC_PPPOE_IPV6_UDP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv4,                  ICE_SW_INSET_MAC_PPPOE_IPV4,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv4_tcp,              ICE_SW_INSET_MAC_PPPOE_IPV4_TCP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv4_udp,              ICE_SW_INSET_MAC_PPPOE_IPV4_UDP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv6,                  ICE_SW_INSET_MAC_PPPOE_IPV6,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv6_tcp,              ICE_SW_INSET_MAC_PPPOE_IPV6_TCP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_vlan_pppoes_ipv6_udp,              ICE_SW_INSET_MAC_PPPOE_IPV6_UDP,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_esp,                          ICE_SW_INSET_MAC_IPV4_ESP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_udp_esp,                      ICE_SW_INSET_MAC_IPV4_ESP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_esp,                          ICE_SW_INSET_MAC_IPV6_ESP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_udp_esp,                      ICE_SW_INSET_MAC_IPV6_ESP,              ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_ah,                           ICE_SW_INSET_MAC_IPV4_AH,               ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_ah,                           ICE_SW_INSET_MAC_IPV6_AH,               ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_udp_ah,                       ICE_INSET_NONE,                         ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_l2tp,                         ICE_SW_INSET_MAC_IPV4_L2TP,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_l2tp,                         ICE_SW_INSET_MAC_IPV6_L2TP,             ICE_INSET_NONE, 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},
+       {pattern_eth_qinq_ipv4,                         ICE_SW_INSET_MAC_QINQ_IPV4,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_ipv6,                         ICE_SW_INSET_MAC_QINQ_IPV6,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_pppoes,                       ICE_SW_INSET_MAC_PPPOE,                 ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_pppoes_proto,                 ICE_SW_INSET_MAC_PPPOE_PROTO,           ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_pppoes_ipv4,                  ICE_SW_INSET_MAC_PPPOE_IPV4,            ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_qinq_pppoes_ipv6,                  ICE_SW_INSET_MAC_PPPOE_IPV6,            ICE_INSET_NONE, ICE_INSET_NONE},
 };
 
 static int
@@ -1623,26 +1526,6 @@ ice_switch_check_action(const struct rte_flow_action *actions,
        return 0;
 }
 
-static bool
-ice_is_profile_rule(enum ice_sw_tunnel_type tun_type)
-{
-       switch (tun_type) {
-       case ICE_SW_TUN_PROFID_IPV6_ESP:
-       case ICE_SW_TUN_PROFID_IPV6_AH:
-       case ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3:
-       case ICE_SW_TUN_PROFID_IPV6_NAT_T:
-       case ICE_SW_TUN_PROFID_IPV4_PFCP_NODE:
-       case ICE_SW_TUN_PROFID_IPV4_PFCP_SESSION:
-       case ICE_SW_TUN_PROFID_IPV6_PFCP_NODE:
-       case ICE_SW_TUN_PROFID_IPV6_PFCP_SESSION:
-               return true;
-       default:
-               break;
-       }
-
-       return false;
-}
-
 static int
 ice_switch_parse_pattern_action(struct ice_adapter *ad,
                struct ice_pattern_match_item *array,
@@ -1722,8 +1605,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
 
        inputset = ice_switch_inset_get
                (pattern, error, list, &lkups_num, &tun_type);
-       if ((!inputset && !ice_is_profile_rule(tun_type)) ||
-               (inputset & ~pattern_match_item->input_set_mask)) {
+       if ((!inputset && !ice_is_prof_rule(tun_type)) ||
+               (inputset & ~pattern_match_item->input_set_mask_o)) {
                rte_flow_error_set(error, EINVAL,
                                   RTE_FLOW_ERROR_TYPE_ITEM_SPEC,
                                   pattern,
DPDK repo used for reviews