net/ice: support GTPU TEID pattern for switch filter
[dpdk.git] / drivers / net / ice / ice_switch_filter.c
index 7bac77e..7560fc4 100644 (file)
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
@@ -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)
 #define ICE_SW_INSET_MAC_IPV6_PFCP ( \
        ICE_SW_INSET_MAC_IPV6 | \
        ICE_INSET_PFCP_S_FIELD | ICE_INSET_PFCP_SEID)
+#define ICE_SW_INSET_MAC_IPV4_GTPU ( \
+       ICE_SW_INSET_MAC_IPV4 | ICE_INSET_GTPU_TEID)
+#define ICE_SW_INSET_MAC_IPV6_GTPU ( \
+       ICE_SW_INSET_MAC_IPV6 | ICE_INSET_GTPU_TEID)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 ( \
+       ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \
+       ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | ICE_INSET_GTPU_QFI)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 ( \
+       ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \
+       ICE_INSET_TUN_IPV6_SRC | ICE_INSET_TUN_IPV6_DST)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6 ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 | ICE_INSET_GTPU_QFI)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 ( \
+       ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \
+       ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4 ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 | ICE_INSET_GTPU_QFI)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 ( \
+       ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \
+       ICE_INSET_TUN_IPV6_SRC | ICE_INSET_TUN_IPV6_DST)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6 ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 | ICE_INSET_GTPU_QFI)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_UDP ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | \
+       ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_UDP ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 | \
+       ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_TCP ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | \
+       ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_TCP ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 | \
+       ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6_UDP ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 | \
+       ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6_UDP ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6 | \
+       ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6_TCP ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 | \
+       ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6_TCP ( \
+       ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6 | \
+       ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV4_UDP ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 | \
+       ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4_UDP ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4 | \
+       ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV4_TCP ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 | \
+       ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4_TCP ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4 | \
+       ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV6_UDP ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 | \
+       ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6_UDP ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6 | \
+       ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV6_TCP ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 | \
+       ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)
+#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6_TCP ( \
+       ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6 | \
+       ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)
 
 struct sw_meta {
        struct ice_adv_lkup_elem *list;
@@ -148,206 +221,160 @@ 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},
+       {pattern_eth_ipv4_gtpu,                         ICE_SW_INSET_MAC_IPV4_GTPU,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu,                         ICE_SW_INSET_MAC_IPV6_GTPU,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv4,                    ICE_SW_INSET_MAC_IPV4_GTPU_IPV4,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv4,                 ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4,     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv4_udp,                ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv4_udp,             ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_UDP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv4_tcp,                ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_TCP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,             ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_TCP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv6,                    ICE_SW_INSET_MAC_IPV4_GTPU_IPV6,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv6,                 ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6,     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv6_udp,                ICE_SW_INSET_MAC_IPV4_GTPU_IPV6_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_udp,             ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6_UDP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv6_tcp,                ICE_SW_INSET_MAC_IPV4_GTPU_IPV6_TCP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_tcp,             ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6_TCP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv4,                    ICE_SW_INSET_MAC_IPV6_GTPU_IPV4,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv4,                 ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4,     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv4_udp,                ICE_SW_INSET_MAC_IPV6_GTPU_IPV4_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_udp,             ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4_UDP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv4_tcp,                ICE_SW_INSET_MAC_IPV6_GTPU_IPV4_TCP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_tcp,             ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4_TCP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv6,                    ICE_SW_INSET_MAC_IPV6_GTPU_IPV6,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv6,                 ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6,     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv6_udp,                ICE_SW_INSET_MAC_IPV6_GTPU_IPV6_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_udp,             ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6_UDP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv6_tcp,                ICE_SW_INSET_MAC_IPV6_GTPU_IPV6_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_tcp,             ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6_TCP, 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},
+       {pattern_eth_ipv4_gtpu,                         ICE_SW_INSET_MAC_IPV4_GTPU,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu,                         ICE_SW_INSET_MAC_IPV6_GTPU,             ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv4,                    ICE_SW_INSET_MAC_IPV4_GTPU_IPV4,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv4,                 ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4,     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv4_udp,                ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv4_udp,             ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_UDP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv4_tcp,                ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_TCP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,             ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_TCP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv6,                    ICE_SW_INSET_MAC_IPV4_GTPU_IPV6,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv6,                 ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6,     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv6_udp,                ICE_SW_INSET_MAC_IPV4_GTPU_IPV6_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_udp,             ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6_UDP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_ipv6_tcp,                ICE_SW_INSET_MAC_IPV4_GTPU_IPV6_TCP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_tcp,             ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6_TCP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv4,                    ICE_SW_INSET_MAC_IPV6_GTPU_IPV4,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv4,                 ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4,     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv4_udp,                ICE_SW_INSET_MAC_IPV6_GTPU_IPV4_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_udp,             ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4_UDP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv4_tcp,                ICE_SW_INSET_MAC_IPV6_GTPU_IPV4_TCP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_tcp,             ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4_TCP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv6,                    ICE_SW_INSET_MAC_IPV6_GTPU_IPV6,        ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv6,                 ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6,     ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv6_udp,                ICE_SW_INSET_MAC_IPV6_GTPU_IPV6_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_udp,             ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6_UDP, ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_ipv6_tcp,                ICE_SW_INSET_MAC_IPV6_GTPU_IPV6_UDP,    ICE_INSET_NONE, ICE_INSET_NONE},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_tcp,             ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6_TCP, ICE_INSET_NONE, ICE_INSET_NONE},
 };
 
 static int
@@ -475,6 +502,8 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
        const struct rte_flow_item_ah *ah_spec, *ah_mask;
        const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;
        const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;
+       const struct rte_flow_item_gtp *gtp_spec, *gtp_mask;
+       const struct rte_flow_item_gtp_psc *gtp_psc_spec, *gtp_psc_mask;
        uint64_t input_set = ICE_INSET_NONE;
        uint16_t input_set_byte = 0;
        bool pppoe_elem_valid = 0;
@@ -486,11 +515,22 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
        bool profile_rule = 0;
        bool nvgre_valid = 0;
        bool vxlan_valid = 0;
+       bool qinq_valid = 0;
        bool ipv6_valid = 0;
        bool ipv4_valid = 0;
        bool udp_valid = 0;
        bool tcp_valid = 0;
-       uint16_t j, t = 0;
+       bool gtpu_valid = 0;
+       bool gtpu_psc_valid = 0;
+       bool inner_ipv4_valid = 0;
+       bool inner_ipv6_valid = 0;
+       bool inner_tcp_valid = 0;
+       bool inner_udp_valid = 0;
+       uint16_t j, k, t = 0;
+
+       if (*tun_type == ICE_SW_TUN_AND_NON_TUN_QINQ ||
+           *tun_type == ICE_NON_TUN_QINQ)
+               qinq_valid = 1;
 
        for (item = pattern; item->type !=
                        RTE_FLOW_ITEM_TYPE_END; item++) {
@@ -576,7 +616,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                case RTE_FLOW_ITEM_TYPE_IPV4:
                        ipv4_spec = item->spec;
                        ipv4_mask = item->mask;
-                       ipv4_valid = 1;
+                       if (tunnel_valid)
+                               inner_ipv4_valid = 1;
+                       else
+                               ipv4_valid = 1;
+
                        if (ipv4_spec && ipv4_mask) {
                                /* Check IPv4 mask and update input set */
                                if (ipv4_mask->hdr.version_ihl ||
@@ -668,7 +712,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                case RTE_FLOW_ITEM_TYPE_IPV6:
                        ipv6_spec = item->spec;
                        ipv6_mask = item->mask;
-                       ipv6_valid = 1;
+                       if (tunnel_valid)
+                               inner_ipv6_valid = 1;
+                       else
+                               ipv6_valid = 1;
                        if (ipv6_spec && ipv6_mask) {
                                if (ipv6_mask->hdr.payload_len) {
                                        rte_flow_error_set(error, EINVAL,
@@ -786,7 +833,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                case RTE_FLOW_ITEM_TYPE_UDP:
                        udp_spec = item->spec;
                        udp_mask = item->mask;
-                       udp_valid = 1;
+                       if (tunnel_valid)
+                               inner_udp_valid = 1;
+                       else
+                               udp_valid = 1;
                        if (udp_spec && udp_mask) {
                                /* Check UDP mask and update input set*/
                                if (udp_mask->hdr.dgram_len ||
@@ -839,7 +889,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                case RTE_FLOW_ITEM_TYPE_TCP:
                        tcp_spec = item->spec;
                        tcp_mask = item->mask;
-                       tcp_valid = 1;
+                       if (tunnel_valid)
+                               inner_tcp_valid = 1;
+                       else
+                               tcp_valid = 1;
                        if (tcp_spec && tcp_mask) {
                                /* Check TCP mask and update input set */
                                if (tcp_mask->hdr.sent_seq ||
@@ -1029,22 +1082,25 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                                return 0;
                        }
 
-                       if (!outer_vlan_valid &&
-                           (*tun_type == ICE_SW_TUN_AND_NON_TUN_QINQ ||
-                            *tun_type == ICE_NON_TUN_QINQ))
-                               outer_vlan_valid = 1;
-                       else if (!inner_vlan_valid &&
-                                (*tun_type == ICE_SW_TUN_AND_NON_TUN_QINQ ||
-                                 *tun_type == ICE_NON_TUN_QINQ))
-                               inner_vlan_valid = 1;
-                       else if (!inner_vlan_valid)
-                               inner_vlan_valid = 1;
+                       if (qinq_valid) {
+                               if (!outer_vlan_valid)
+                                       outer_vlan_valid = 1;
+                               else
+                                       inner_vlan_valid = 1;
+                       }
 
                        if (vlan_spec && vlan_mask) {
-                               if (outer_vlan_valid && !inner_vlan_valid) {
-                                       list[t].type = ICE_VLAN_EX;
-                                       input_set |= ICE_INSET_VLAN_OUTER;
-                               } else if (inner_vlan_valid) {
+                               if (qinq_valid) {
+                                       if (!inner_vlan_valid) {
+                                               list[t].type = ICE_VLAN_EX;
+                                               input_set |=
+                                                       ICE_INSET_VLAN_OUTER;
+                                       } else {
+                                               list[t].type = ICE_VLAN_IN;
+                                               input_set |=
+                                                       ICE_INSET_VLAN_INNER;
+                                       }
+                               } else {
                                        list[t].type = ICE_VLAN_OFOS;
                                        input_set |= ICE_INSET_VLAN_INNER;
                                }
@@ -1352,6 +1408,71 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                        }
                        break;
 
+               case RTE_FLOW_ITEM_TYPE_GTPU:
+                       gtp_spec = item->spec;
+                       gtp_mask = item->mask;
+                       if (gtp_spec && !gtp_mask) {
+                               rte_flow_error_set(error, EINVAL,
+                                       RTE_FLOW_ERROR_TYPE_ITEM,
+                                       item,
+                                       "Invalid GTP item");
+                               return 0;
+                       }
+                       if (gtp_spec && gtp_mask) {
+                               if (gtp_mask->v_pt_rsv_flags ||
+                                   gtp_mask->msg_type ||
+                                   gtp_mask->msg_len) {
+                                       rte_flow_error_set(error, EINVAL,
+                                               RTE_FLOW_ERROR_TYPE_ITEM,
+                                               item,
+                                               "Invalid GTP mask");
+                                       return 0;
+                               }
+                               if (gtp_mask->teid)
+                                       input_set |= ICE_INSET_GTPU_TEID;
+                               list[t].type = ICE_GTP;
+                               list[t].h_u.gtp_hdr.teid =
+                                       gtp_spec->teid;
+                               list[t].m_u.gtp_hdr.teid =
+                                       gtp_mask->teid;
+                               input_set_byte += 4;
+                               t++;
+                       }
+                       tunnel_valid = 1;
+                       gtpu_valid = 1;
+                       break;
+
+               case RTE_FLOW_ITEM_TYPE_GTP_PSC:
+                       gtp_psc_spec = item->spec;
+                       gtp_psc_mask = item->mask;
+                       if (gtp_psc_spec && !gtp_psc_mask) {
+                               rte_flow_error_set(error, EINVAL,
+                                       RTE_FLOW_ERROR_TYPE_ITEM,
+                                       item,
+                                       "Invalid GTPU_EH item");
+                               return 0;
+                       }
+                       if (gtp_psc_spec && gtp_psc_mask) {
+                               if (gtp_psc_mask->pdu_type) {
+                                       rte_flow_error_set(error, EINVAL,
+                                               RTE_FLOW_ERROR_TYPE_ITEM,
+                                               item,
+                                               "Invalid GTPU_EH mask");
+                                       return 0;
+                               }
+                               if (gtp_psc_mask->qfi)
+                                       input_set |= ICE_INSET_GTPU_QFI;
+                               list[t].type = ICE_GTP;
+                               list[t].h_u.gtp_hdr.qfi =
+                                       gtp_psc_spec->qfi;
+                               list[t].m_u.gtp_hdr.qfi =
+                                       gtp_psc_mask->qfi;
+                               input_set_byte += 1;
+                               t++;
+                       }
+                       gtpu_psc_valid = 1;
+                       break;
+
                case RTE_FLOW_ITEM_TYPE_VOID:
                        break;
 
@@ -1399,6 +1520,74 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
                        *tun_type = ICE_SW_TUN_PPPOE;
        }
 
+       if (gtpu_valid && gtpu_psc_valid) {
+               if (ipv4_valid && inner_ipv4_valid && inner_udp_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_EH_IPV4_UDP;
+               else if (ipv4_valid && inner_ipv4_valid && inner_tcp_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_EH_IPV4_TCP;
+               else if (ipv4_valid && inner_ipv4_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_EH_IPV4;
+               else if (ipv4_valid && inner_ipv6_valid && inner_udp_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_EH_IPV6_UDP;
+               else if (ipv4_valid && inner_ipv6_valid && inner_tcp_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_EH_IPV6_TCP;
+               else if (ipv4_valid && inner_ipv6_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_EH_IPV6;
+               else if (ipv6_valid && inner_ipv4_valid && inner_udp_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_EH_IPV4_UDP;
+               else if (ipv6_valid && inner_ipv4_valid && inner_tcp_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_EH_IPV4_TCP;
+               else if (ipv6_valid && inner_ipv4_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_EH_IPV4;
+               else if (ipv6_valid && inner_ipv6_valid && inner_udp_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_EH_IPV6_UDP;
+               else if (ipv6_valid && inner_ipv6_valid && inner_tcp_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_EH_IPV6_TCP;
+               else if (ipv6_valid && inner_ipv6_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_EH_IPV6;
+               else if (ipv4_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_NO_PAY;
+               else if (ipv6_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_NO_PAY;
+       } else if (gtpu_valid) {
+               if (ipv4_valid && inner_ipv4_valid && inner_udp_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_IPV4_UDP;
+               else if (ipv4_valid && inner_ipv4_valid && inner_tcp_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_IPV4_TCP;
+               else if (ipv4_valid && inner_ipv4_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_IPV4;
+               else if (ipv4_valid && inner_ipv6_valid && inner_udp_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_IPV6_UDP;
+               else if (ipv4_valid && inner_ipv6_valid && inner_tcp_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_IPV6_TCP;
+               else if (ipv4_valid && inner_ipv6_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_IPV6;
+               else if (ipv6_valid && inner_ipv4_valid && inner_udp_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_IPV4_UDP;
+               else if (ipv6_valid && inner_ipv4_valid && inner_tcp_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_IPV4_TCP;
+               else if (ipv6_valid && inner_ipv4_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_IPV4;
+               else if (ipv6_valid && inner_ipv6_valid && inner_udp_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_IPV6_UDP;
+               else if (ipv6_valid && inner_ipv6_valid && inner_tcp_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_IPV6_TCP;
+               else if (ipv6_valid && inner_ipv6_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_IPV6;
+               else if (ipv4_valid)
+                       *tun_type = ICE_SW_TUN_IPV4_GTPU_NO_PAY;
+               else if (ipv6_valid)
+                       *tun_type = ICE_SW_TUN_IPV6_GTPU_NO_PAY;
+       }
+
+       if (*tun_type == ICE_SW_TUN_IPV4_GTPU_NO_PAY ||
+           *tun_type == ICE_SW_TUN_IPV6_GTPU_NO_PAY) {
+               for (k = 0; k < t; k++) {
+                       if (list[k].type == ICE_GTP)
+                               list[k].type = ICE_GTP_NO_PAY;
+               }
+       }
+
        if (*tun_type == ICE_NON_TUN) {
                if (vxlan_valid)
                        *tun_type = ICE_SW_TUN_VXLAN;
@@ -1623,26 +1812,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 +1891,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,