net/bonding: fix MAC address when one port resets
[dpdk.git] / drivers / net / ice / ice_hash.c
index ad018de..e57feff 100644 (file)
@@ -25,6 +25,9 @@
 #include "ice_ethdev.h"
 #include "ice_generic_flow.h"
 
+#define ICE_GTPU_EH_DWNLINK    0
+#define ICE_GTPU_EH_UPLINK     1
+
 struct rss_type_match_hdr {
        uint32_t hdr_mask;
        uint64_t eth_rss_hint;
@@ -93,6 +96,54 @@ struct rss_type_match_hdr hint_eth_ipv4_sctp = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_SCTP,
        ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_SCTP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6 = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4 = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6 = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
 struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {
        ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
        ICE_FLOW_SEG_HDR_IPV_OTHER,
@@ -105,18 +156,97 @@ struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = {
        ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
        ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6 = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4 = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6 = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
 struct rss_type_match_hdr hint_eth_pppoes_ipv4 = {
-       ICE_FLOW_SEG_HDR_PPPOE,
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4};
 struct rss_type_match_hdr hint_eth_pppoes_ipv4_udp = {
-       ICE_FLOW_SEG_HDR_PPPOE,
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_UDP};
 struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {
-       ICE_FLOW_SEG_HDR_PPPOE,
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP};
 struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = {
-       ICE_FLOW_SEG_HDR_PPPOE,
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_SCTP};
+struct rss_type_match_hdr hint_eth_ipv4_esp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_ESP,
+       ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_ESP};
+struct rss_type_match_hdr hint_eth_ipv4_udp_esp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_NAT_T_ESP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_ESP};
+struct rss_type_match_hdr hint_eth_ipv4_ah = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_AH,
+       ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_AH};
+struct rss_type_match_hdr hint_eth_ipv4_l2tpv3 = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_L2TPV3,
+       ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_L2TPV3};
+struct rss_type_match_hdr hint_eth_ipv4_pfcp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_PFCP_SESSION,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_PFCP};
+struct rss_type_match_hdr hint_eth_vlan_ipv4 = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_C_VLAN};
+struct rss_type_match_hdr hint_eth_vlan_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_vlan_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_vlan_ipv4_sctp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV4_SCTP};
 struct rss_type_match_hdr hint_eth_ipv6 = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER,
        ETH_RSS_ETH | ETH_RSS_IPV6};
@@ -132,17 +262,60 @@ struct rss_type_match_hdr hint_eth_ipv6_sctp = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_SCTP,
        ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_SCTP};
+struct rss_type_match_hdr hint_eth_ipv6_esp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_ESP,
+       ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_ESP};
+struct rss_type_match_hdr hint_eth_ipv6_udp_esp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_NAT_T_ESP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_ESP};
+struct rss_type_match_hdr hint_eth_ipv6_ah = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_AH,
+       ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_AH};
+struct rss_type_match_hdr hint_eth_ipv6_l2tpv3 = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_L2TPV3,
+       ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_L2TPV3};
+struct rss_type_match_hdr hint_eth_ipv6_pfcp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_PFCP_SESSION,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_PFCP};
+struct rss_type_match_hdr hint_eth_vlan_ipv6 = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_C_VLAN};
+struct rss_type_match_hdr hint_eth_vlan_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_vlan_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_vlan_ipv6_sctp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV6_SCTP};
 struct rss_type_match_hdr hint_eth_pppoes_ipv6 = {
-       ICE_FLOW_SEG_HDR_PPPOE,
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV6};
 struct rss_type_match_hdr hint_eth_pppoes_ipv6_udp = {
-       ICE_FLOW_SEG_HDR_PPPOE,
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_UDP};
 struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = {
-       ICE_FLOW_SEG_HDR_PPPOE,
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP};
 struct rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = {
-       ICE_FLOW_SEG_HDR_PPPOE,
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_SCTP};
 struct rss_type_match_hdr hint_eth_pppoes = {
        ICE_FLOW_SEG_HDR_PPPOE,
@@ -173,12 +346,54 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
                &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,
@@ -187,6 +402,24 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
                &hint_eth_pppoes_ipv4_tcp},
        {pattern_eth_pppoes_ipv4_sctp,      ICE_INSET_NONE,
                &hint_eth_pppoes_ipv4_sctp},
+       {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,
@@ -195,6 +428,24 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
                &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,
@@ -212,11 +463,34 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
  * the second member is hash fields.
  */
 struct ice_hash_match_type ice_hash_type_list[] = {
+       {ETH_RSS_L2_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},
+       {ETH_RSS_L2_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)},
+       {ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},
+       {ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)},
+       {ETH_RSS_ETH,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)},
        {ETH_RSS_PPPOE,
                ICE_FLOW_HASH_PPPOE_SESS_ID},
        {ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_L2_SRC_ONLY,
                ICE_FLOW_HASH_PPPOE_SESS_ID |
                BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},
+       {ETH_RSS_C_VLAN,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_C_VLAN)},
+       {ETH_RSS_S_VLAN,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_S_VLAN)},
+       {ETH_RSS_ESP,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI)},
+       {ETH_RSS_AH,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_AH_SPI)},
+       {ETH_RSS_L2TPV3,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID)},
+       {ETH_RSS_PFCP,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)},
        /* IPV4 */
        {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
@@ -316,6 +590,21 @@ struct ice_hash_match_type ice_hash_type_list[] = {
        {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
        {ETH_RSS_IPV6, ICE_FLOW_HASH_IPV6},
+       {ETH_RSS_IPV6_PRE32 | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},
+       {ETH_RSS_IPV6_PRE32 | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)},
+       {ETH_RSS_IPV6_PRE32, ICE_FLOW_HASH_IPV6_PRE32},
+       {ETH_RSS_IPV6_PRE48 | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)},
+       {ETH_RSS_IPV6_PRE48 | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)},
+       {ETH_RSS_IPV6_PRE48, ICE_FLOW_HASH_IPV6_PRE48},
+       {ETH_RSS_IPV6_PRE64 | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)},
+       {ETH_RSS_IPV6_PRE64 | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)},
+       {ETH_RSS_IPV6_PRE64, ICE_FLOW_HASH_IPV6_PRE64},
        {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
@@ -347,6 +636,69 @@ struct ice_hash_match_type ice_hash_type_list[] = {
        {ETH_RSS_NONFRAG_IPV6_UDP,
                ICE_HASH_UDP_IPV6 |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP, ICE_HASH_UDP_IPV6_PRE32},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP, ICE_HASH_UDP_IPV6_PRE48},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP, ICE_HASH_UDP_IPV6_PRE64},
        {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
@@ -376,6 +728,69 @@ struct ice_hash_match_type ice_hash_type_list[] = {
        {ETH_RSS_NONFRAG_IPV6_TCP,
                ICE_HASH_TCP_IPV6 |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP, ICE_HASH_TCP_IPV6_PRE32},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP, ICE_HASH_TCP_IPV6_PRE48},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP, ICE_HASH_TCP_IPV6_PRE64},
        {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
@@ -405,6 +820,69 @@ struct ice_hash_match_type ice_hash_type_list[] = {
        {ETH_RSS_NONFRAG_IPV6_SCTP,
                ICE_HASH_SCTP_IPV6 |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP, ICE_HASH_SCTP_IPV6_PRE32},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP, ICE_HASH_SCTP_IPV6_PRE48},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP, ICE_HASH_SCTP_IPV6_PRE64},
 };
 
 static struct ice_flow_engine ice_hash_engine = {
@@ -459,10 +937,15 @@ ice_hash_init(struct ice_adapter *ad)
 }
 
 static int
-ice_hash_check_inset(const struct rte_flow_item pattern[],
-               struct rte_flow_error *error)
+ice_hash_parse_pattern(struct ice_pattern_match_item *pattern_match_item,
+                      const struct rte_flow_item pattern[], void **meta,
+                      struct rte_flow_error *error)
 {
+       uint32_t hdr_mask = ((struct rss_type_match_hdr *)
+               (pattern_match_item->meta))->hdr_mask;
        const struct rte_flow_item *item = pattern;
+       const struct rte_flow_item_gtp_psc *psc;
+       uint32_t hdrs = 0;
 
        for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
                if (item->last) {
@@ -472,15 +955,29 @@ ice_hash_check_inset(const struct rte_flow_item pattern[],
                        return -rte_errno;
                }
 
-               /* Ignore spec and mask. */
-               if (item->spec || item->mask) {
-                       rte_flow_error_set(error, EINVAL,
-                                       RTE_FLOW_ERROR_TYPE_ITEM, item,
-                                       "Invalid spec/mask.");
-                       return -rte_errno;
+               switch (item->type) {
+               case RTE_FLOW_ITEM_TYPE_GTPU:
+                       hdrs |= ICE_FLOW_SEG_HDR_GTPU_IP;
+                       break;
+               case RTE_FLOW_ITEM_TYPE_GTP_PSC:
+                       psc = item->spec;
+                       hdr_mask &= ~ICE_FLOW_SEG_HDR_GTPU_EH;
+                       hdrs &= ~ICE_FLOW_SEG_HDR_GTPU_IP;
+                       if (!psc)
+                               hdrs |= ICE_FLOW_SEG_HDR_GTPU_EH;
+                       else if (psc->pdu_type == ICE_GTPU_EH_UPLINK)
+                               hdrs |= ICE_FLOW_SEG_HDR_GTPU_UP;
+                       else if (psc->pdu_type == ICE_GTPU_EH_DWNLINK)
+                               hdrs |= ICE_FLOW_SEG_HDR_GTPU_DWN;
+                       break;
+               default:
+                       break;
                }
        }
 
+       /* Save protocol header to rss_meta. */
+       ((struct rss_meta *)*meta)->pkt_hdr |= hdr_mask | hdrs;
+
        return 0;
 }
 
@@ -551,6 +1048,9 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 
                        combine_type = ETH_RSS_L2_SRC_ONLY |
                                        ETH_RSS_L2_DST_ONLY |
+                                       RTE_ETH_RSS_L3_PRE32    |
+                                       RTE_ETH_RSS_L3_PRE48    |
+                                       RTE_ETH_RSS_L3_PRE64    |
                                        ETH_RSS_L3_SRC_ONLY |
                                        ETH_RSS_L3_DST_ONLY |
                                        ETH_RSS_L4_SRC_ONLY |
@@ -575,6 +1075,31 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                                }
                        }
 
+                       /* update hash field for nat-t esp. */
+                       if (rss_type == ETH_RSS_ESP &&
+                           (m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP)) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI));
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI);
+                       }
+
+                       /* update hash field for gtpu-ip and gtpu-eh. */
+                       if (rss_type != ETH_RSS_GTPU)
+                               break;
+                       else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_IP)
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID);
+                       else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH)
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_EH_TEID);
+                       else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_DWN)
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID);
+                       else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_UP)
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_UP_TEID);
+
                        break;
 
                case RTE_FLOW_ACTION_TYPE_END:
@@ -620,14 +1145,11 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad,
                goto error;
        }
 
-       ret = ice_hash_check_inset(pattern, error);
+       ret = ice_hash_parse_pattern(pattern_match_item, pattern,
+                                    (void **)&rss_meta_ptr, error);
        if (ret)
                goto error;
 
-       /* Save protocol header to rss_meta. */
-       rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *)
-               (pattern_match_item->meta))->hdr_mask;
-
        /* Check rss action. */
        ret = ice_hash_parse_action(pattern_match_item, actions,
                                    (void **)&rss_meta_ptr, error);