git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/ice: fix GTPU down/uplink and extension conflict
[dpdk.git] / drivers / net / ice / ice_hash.c
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 8ad1e2a..c0271df 100644 (file)
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -100,6 +100,50 @@ 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,
@@ -112,18 +156,93 @@ 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,
-       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};
@@ -139,18 +258,57 @@ 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,
-       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_SCTP};
 struct rss_type_match_hdr hint_eth_pppoes = {
        ICE_FLOW_SEG_HDR_PPPOE,
        ETH_RSS_ETH | ETH_RSS_PPPOE};
@@ -182,20 +340,76 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
                &hint_eth_ipv4_sctp},
        {pattern_eth_ipv4_gtpu_ipv4,        ICE_INSET_NONE,
                &hint_eth_ipv4_gtpu_ipv4},
+       {pattern_eth_ipv4_gtpu_ipv4_udp,    ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv4_udp},
+       {pattern_eth_ipv4_gtpu_ipv4_tcp,    ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv4_tcp},
+       {pattern_eth_ipv4_gtpu_ipv6,        ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv6},
+       {pattern_eth_ipv4_gtpu_ipv6_udp,    ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv6_udp},
+       {pattern_eth_ipv4_gtpu_ipv6_tcp,    ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv6_tcp},
+       {pattern_eth_ipv6_gtpu_ipv4,        ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv4},
+       {pattern_eth_ipv6_gtpu_ipv4_udp,    ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv4_udp},
+       {pattern_eth_ipv6_gtpu_ipv4_tcp,    ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv4_tcp},
+       {pattern_eth_ipv6_gtpu_ipv6,        ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv6},
+       {pattern_eth_ipv6_gtpu_ipv6_udp,    ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv6_udp},
+       {pattern_eth_ipv6_gtpu_ipv6_tcp,    ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv6_tcp},
        {pattern_eth_ipv4_gtpu_eh_ipv4,     ICE_INSET_NONE,
                &hint_eth_ipv4_gtpu_eh_ipv4},
        {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
                &hint_eth_ipv4_gtpu_eh_ipv4_udp},
        {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
                &hint_eth_ipv4_gtpu_eh_ipv4_tcp},
+       {pattern_eth_ipv4_gtpu_eh_ipv6,     ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv6},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv6_udp},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv6_tcp},
+       {pattern_eth_ipv6_gtpu_eh_ipv4,     ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv4},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv4_udp},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv4_tcp},
+       {pattern_eth_ipv6_gtpu_eh_ipv6,     ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv6},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv6_udp},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv6_tcp},
        {pattern_eth_pppoes_ipv4,           ICE_INSET_NONE,
                &hint_eth_pppoes_ipv4},
        {pattern_eth_pppoes_ipv4_udp,       ICE_INSET_NONE,
                &hint_eth_pppoes_ipv4_udp},
        {pattern_eth_pppoes_ipv4_tcp,       ICE_INSET_NONE,
                &hint_eth_pppoes_ipv4_tcp},
-       {pattern_eth_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,
@@ -204,14 +418,30 @@ 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,
                &hint_eth_pppoes_ipv6_udp},
        {pattern_eth_pppoes_ipv6_tcp,       ICE_INSET_NONE,
                &hint_eth_pppoes_ipv6_tcp},
-       {pattern_eth_pppoes_ipv6_sctp,      ICE_INSET_NONE,
-               &hint_eth_pppoes_ipv6_sctp},
        {pattern_eth_pppoes,                ICE_INSET_NONE,
                &hint_eth_pppoes},
 };
@@ -221,11 +451,36 @@ 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)},
+       {ETH_RSS_GTPU,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID)},
        /* IPV4 */
        {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
@@ -241,6 +496,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
        {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
@@ -251,6 +507,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
        {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT) |
@@ -270,6 +527,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
        {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
@@ -280,6 +538,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
        {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT) |
@@ -299,6 +558,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
        {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
@@ -309,6 +569,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
        {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) |
@@ -325,6 +586,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) |
@@ -334,6 +610,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
        {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
@@ -344,6 +621,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
        {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT) |
@@ -356,6 +634,75 @@ 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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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) |
@@ -365,6 +712,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
        {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
@@ -375,6 +723,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
        {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT) |
@@ -385,6 +734,75 @@ 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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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) |
@@ -394,6 +812,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
        {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
@@ -404,6 +823,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
        {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
                BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
        {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,
                BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) |
@@ -414,6 +834,75 @@ 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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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_PROT) |
+               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 = {
@@ -525,7 +1014,11 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
        enum rte_flow_action_type action_type;
        const struct rte_flow_action_rss *rss;
        const struct rte_flow_action *action;
-       uint64_t combine_type;
+       bool hash_map_found = false;
+       uint64_t rss_attr_src_dst;
+       uint64_t rss_attr_l3_pre;
+       uint64_t rss_attr_symm;
+       uint64_t rss_attr_all;
        uint64_t rss_type;
        uint16_t i;
 
@@ -577,15 +1070,51 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                         */
                        rss_type = rte_eth_rss_hf_refine(rss_type);
 
-                       combine_type = ETH_RSS_L2_SRC_ONLY |
-                                       ETH_RSS_L2_DST_ONLY |
-                                       ETH_RSS_L3_SRC_ONLY |
-                                       ETH_RSS_L3_DST_ONLY |
-                                       ETH_RSS_L4_SRC_ONLY |
-                                       ETH_RSS_L4_DST_ONLY;
+                       rss_attr_src_dst = ETH_RSS_L2_SRC_ONLY |
+                                          ETH_RSS_L2_DST_ONLY |
+                                          ETH_RSS_L3_SRC_ONLY |
+                                          ETH_RSS_L3_DST_ONLY |
+                                          ETH_RSS_L4_SRC_ONLY |
+                                          ETH_RSS_L4_DST_ONLY;
+
+                       rss_attr_l3_pre = RTE_ETH_RSS_L3_PRE32 |
+                                         RTE_ETH_RSS_L3_PRE48 |
+                                         RTE_ETH_RSS_L3_PRE64;
+
+                       rss_attr_symm = ETH_RSS_IPV4 |
+                                       ETH_RSS_NONFRAG_IPV4_UDP |
+                                       ETH_RSS_NONFRAG_IPV4_TCP |
+                                       ETH_RSS_NONFRAG_IPV4_SCTP |
+                                       ETH_RSS_IPV6 |
+                                       ETH_RSS_NONFRAG_IPV6_UDP |
+                                       ETH_RSS_NONFRAG_IPV6_TCP |
+                                       ETH_RSS_NONFRAG_IPV6_SCTP;
+
+                       rss_attr_all = rss_attr_src_dst | rss_attr_l3_pre;
+
+                       /* Check if only SRC/DST_ONLY or ipv6 prefix exists. */
+                       if ((rss_type & ~rss_attr_all) == 0)
+                               return rte_flow_error_set(error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ACTION, action,
+                                       "invalid rss types");
+
+                       /**
+                        * Check if SRC/DST_ONLY is set for SYMMETRIC_TOEPLITZ
+                        * hash function.
+                        */
+                       if (rss->func ==
+                               RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
+                               if (rss_type & (rss_attr_src_dst |
+                                               ~rss_attr_symm))
+                                       return rte_flow_error_set(error,
+                                               ENOTSUP,
+                                               RTE_FLOW_ERROR_TYPE_ACTION,
+                                               action,
+                                               "invalid rss types");
+                       }
 
                        /* Check if rss types match pattern. */
-                       if (rss_type & ~combine_type & ~m->eth_rss_hint) {
+                       if (rss_type & ~rss_attr_all & ~m->eth_rss_hint) {
                                return rte_flow_error_set(error,
                                ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
                                action, "Not supported RSS types");
@@ -599,25 +1128,47 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                                if (rss_type == ht_map->hash_type) {
                                        hash_meta->hash_flds =
                                                        ht_map->hash_flds;
+                                       hash_map_found = true;
                                        break;
                                }
                        }
 
-                       /* 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)
+                       if (pattern_match_item->pattern_list !=
+                           pattern_empty && !hash_map_found) {
+                               return rte_flow_error_set(error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ACTION, action,
+                                       "Not supported flow");
+                       }
+
+                       /* update hash field for nat-t esp. */
+                       if (rss_type == ETH_RSS_ESP &&
+                           (m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP ||
+                            m->eth_rss_hint & ETH_RSS_NONFRAG_IPV6_UDP)) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI));
                                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)
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI);
+                       }
+
+                       /* update hash field for gtpu eh/gtpu dwn/gtpu up. */
+                       if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
                                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)
+                       } else if (hash_meta->pkt_hdr &
+                                  ICE_FLOW_SEG_HDR_GTPU_DWN) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
                                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)
+                       } else if (hash_meta->pkt_hdr &
+                                  ICE_FLOW_SEG_HDR_GTPU_UP) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
                                hash_meta->hash_flds |=
                                BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_UP_TEID);
+                       }
 
                        break;
 
@@ -726,7 +1277,7 @@ ice_hash_create(struct ice_adapter *ad,
                        (hash_function ==
                                RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ);
 
-               ret = ice_add_rss_cfg(hw, vsi->idx,
+               ret = ice_add_rss_cfg_wrap(pf, vsi->idx,
                                filter_ptr->rss_cfg.hashed_flds,
                                filter_ptr->rss_cfg.packet_hdr,
                                filter_ptr->rss_cfg.symm);
@@ -770,7 +1321,7 @@ ice_hash_destroy(struct ice_adapter *ad,
                        (1 << VSIQF_HASH_CTL_HASH_SCHEME_S);
                ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg);
        } else {
-               ret = ice_rem_rss_cfg(hw, vsi->idx,
+               ret = ice_rem_rss_cfg_wrap(pf, vsi->idx,
                                filter_ptr->rss_cfg.hashed_flds,
                                filter_ptr->rss_cfg.packet_hdr);
                /* Fixme: Ignore the error if a rule does not exist.
DPDK repo used for reviews