net/iavf: support RSS for IPv4 IPv6 mix of GTP

RSS for GTP with outer & inner ipv4 & ipv6 combination are supported
in this patch, so that we can process RSS based on inner 5 tuples or
3 tuples of all the cases below of GTP packets:
        1. ipv4 (outer) + ipv4 (inner)
        2. ipv4 (outer) + ipv6 (inner)
        3. ipv6 (outer) + ipv4 (inner)
        4. ipv6 (outer) + ipv6 (inner)

Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c
index c6d48f0..321a4dc 100644 (file)
--- a/drivers/net/iavf/iavf_generic_flow.c
+++ b/drivers/net/iavf/iavf_generic_flow.c
@@ -361,6 +361,156 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = {
        RTE_FLOW_ITEM_TYPE_END,
 };
 
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_udp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_tcp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_TCP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_icmp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_ICMP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+/* IPV4 GTPU IPv6 */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_udp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_tcp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_TCP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_icmp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_ICMP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+/* IPV6 GTPU IPv4 */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_udp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_tcp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_TCP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_icmp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_ICMP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+/* IPV6 GTPU IPv6 */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_udp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_tcp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_TCP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_icmp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_ICMP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV4 GTPU EH IPv4 */
 enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[] = {
        RTE_FLOW_ITEM_TYPE_ETH,
@@ -392,7 +542,6 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = {
        RTE_FLOW_ITEM_TYPE_IPV4,
        RTE_FLOW_ITEM_TYPE_TCP,
        RTE_FLOW_ITEM_TYPE_END,
-
 };
 
 enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
@@ -406,6 +555,138 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
        RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPV4 GTPU EH IPv6 */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_TCP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_icmp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_ICMP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+/* IPV6 GTPU EH IPv4 */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_TCP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_icmp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV4,
+       RTE_FLOW_ITEM_TYPE_ICMP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+/* IPV6 GTPU EH IPv6 */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_TCP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_icmp[] = {
+       RTE_FLOW_ITEM_TYPE_ETH,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_UDP,
+       RTE_FLOW_ITEM_TYPE_GTPU,
+       RTE_FLOW_ITEM_TYPE_GTP_PSC,
+       RTE_FLOW_ITEM_TYPE_IPV6,
+       RTE_FLOW_ITEM_TYPE_ICMP,
+       RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* ESP */
 enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[] = {
        RTE_FLOW_ITEM_TYPE_ETH,

diff --git a/drivers/net/iavf/iavf_generic_flow.h b/drivers/net/iavf/iavf_generic_flow.h
index 8a66875..f365cc3 100644 (file)
--- a/drivers/net/iavf/iavf_generic_flow.h
+++ b/drivers/net/iavf/iavf_generic_flow.h
@@ -192,6 +192,27 @@ extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[];
 
 /* IPv4 GTPU IPv4 */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_icmp[];
+
+/* IPv4 GTPU IPv6 */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_icmp[];
+
+/* IPv6 GTPU IPv4 */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_icmp[];
+
+/* IPv6 GTPU IPv6 */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_icmp[];
 
 /* IPv4 GTPU EH IPv4 */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[];
@@ -199,6 +220,24 @@ extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp[];
 extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];
 extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[];
 
+/* IPv4 GTPU EH IPv6 */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_icmp[];
+
+/* IPv6 GTPU EH IPv4 */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_icmp[];
+
+/* IPv6 GTPU EH IPv6 */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_icmp[];
+
 /* ESP */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[];
 extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[];

diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 1394519..967e6b6 100644 (file)
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -37,6 +37,10 @@ enum iavf_pattern_hint_type {
        IAVF_PHINT_IPV4_GTPU_EH                 = 0x00000200,
        IAVF_PHINT_IPV4_GTPU_EH_DWNLINK         = 0x00000400,
        IAVF_PHINT_IPV4_GTPU_EH_UPLINK          = 0x00000800,
+       IAVF_PHINT_IPV6_GTPU_IP                 = 0x00001000,
+       IAVF_PHINT_IPV6_GTPU_EH                 = 0x00002000,
+       IAVF_PHINT_IPV6_GTPU_EH_DWNLINK         = 0x00004000,
+       IAVF_PHINT_IPV6_GTPU_EH_UPLINK          = 0x00008000,
 };
 
 #define IAVF_GTPU_EH_DWNLINK   0
@@ -95,12 +99,52 @@ static struct iavf_pattern_match_type phint_eth_ipv4_sctp = {
        IAVF_PHINT_IPV4_SCTP};
 static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4 = {
        IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
 static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4 = {
        IAVF_PHINT_IPV4};
 static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_udp = {
        IAVF_PHINT_IPV4_UDP};
 static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_tcp = {
        IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
 static struct iavf_pattern_match_type phint_eth_ipv4_esp = {
        IAVF_PHINT_IPV4};
 static struct iavf_pattern_match_type phint_eth_ipv4_udp_esp = {
@@ -159,12 +203,52 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {
        {iavf_pattern_eth_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_sctp},
        {iavf_pattern_eth_ipv4_gtpu_ipv4, IAVF_INSET_NONE,
                                        &phint_eth_ipv4_gtpu_ipv4},
+       {iavf_pattern_eth_ipv4_gtpu_ipv4_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv4_udp},
+       {iavf_pattern_eth_ipv4_gtpu_ipv4_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv4_tcp},
+       {iavf_pattern_eth_ipv4_gtpu_ipv6, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv6},
+       {iavf_pattern_eth_ipv4_gtpu_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv6_udp},
+       {iavf_pattern_eth_ipv4_gtpu_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv6_tcp},
+       {iavf_pattern_eth_ipv6_gtpu_ipv4, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv4},
+       {iavf_pattern_eth_ipv6_gtpu_ipv4_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv4_udp},
+       {iavf_pattern_eth_ipv6_gtpu_ipv4_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv4_tcp},
+       {iavf_pattern_eth_ipv6_gtpu_ipv6, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv6},
+       {iavf_pattern_eth_ipv6_gtpu_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv6_udp},
+       {iavf_pattern_eth_ipv6_gtpu_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv6_tcp},
        {iavf_pattern_eth_ipv4_gtpu_eh_ipv4, IAVF_INSET_NONE,
                                        &phint_eth_ipv4_gtpu_eh_ipv4},
        {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp, IAVF_INSET_NONE,
                                        &phint_eth_ipv4_gtpu_eh_ipv4_udp},
        {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE,
                                        &phint_eth_ipv4_gtpu_eh_ipv4_tcp},
+       {iavf_pattern_eth_ipv4_gtpu_eh_ipv6, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_eh_ipv6},
+       {iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_eh_ipv6_udp},
+       {iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_eh_ipv6_tcp},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv4, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv4},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv4_udp},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv4_tcp},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv6, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv6},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv6_udp},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv6_tcp},
        {iavf_pattern_eth_ipv4_esp, IAVF_INSET_NONE, &phint_eth_ipv4_esp},
        {iavf_pattern_eth_ipv4_udp_esp, IAVF_INSET_NONE,
                                        &phint_eth_ipv4_udp_esp},
@@ -641,7 +725,8 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_esp = {
        proto_hint_udp_only, proto_hint_esp }
 };
 
-/* GTPU IP */
+/* IPv4 GTPU IP */
+
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_ip = {
        TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
        proto_hint_ipv4_src }
@@ -657,11 +742,168 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_ip = {
        proto_hint_ipv4 }
 };
 
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_prot, proto_hint_tcp}
+};
+
 struct virtchnl_proto_hdrs hdrs_hint_teid_gtpu_ip = {
        TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_teid}
 };
 
-/* GTPU EH */
+/* IPv6 GTPU IP */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+               proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+               proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+               proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_prot, proto_hint_tcp}
+};
+
+/* IPv4 GTPU EH */
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_eh = {
        TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
@@ -748,7 +990,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = {
        proto_hint_ipv4_prot, proto_hint_tcp}
 };
 
-/* GTPU UP */
+/* IPv6 GTPU EH */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_prot, proto_hint_tcp}
+};
+
+/* IPv4 GTPU UP */
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_up = {
        TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
@@ -835,7 +1164,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = {
        proto_hint_ipv4_prot, proto_hint_tcp}
 };
 
-/* GTPU DWN */
+/* IPv6 GTPU UP */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_prot, proto_hint_tcp}
+};
+
+/* IPv4 GTPU DWN */
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_dwn = {
        TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
@@ -922,70 +1338,157 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = {
        proto_hint_ipv4_prot, proto_hint_tcp}
 };
 
-/* IPV6 */
+/* IPv6 GTPU DWN */
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6 = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_src,
-       proto_hint_ipv6_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_src_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_udp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
-       proto_hint_ipv6_only, proto_hint_udp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_dst_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_tcp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
-       proto_hint_ipv6_only, proto_hint_tcp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_src_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_sctp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
-       proto_hint_ipv6_only, proto_hint_sctp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6 = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_dst,
-       proto_hint_ipv6_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_udp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
-       proto_hint_ipv6_only, proto_hint_udp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_src_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_tcp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
-       proto_hint_ipv6_only, proto_hint_tcp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_dst_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_sctp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
-       proto_hint_ipv6_only, proto_hint_sctp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_src_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6 = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth,
-       proto_hint_ipv6_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_udp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
-       proto_hint_ipv6_only, proto_hint_udp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_tcp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
-       proto_hint_ipv6_only, proto_hint_tcp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6 }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_sctp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
-       proto_hint_ipv6_only, proto_hint_sctp_only }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_src_port}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6 = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_svlan,
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_prot, proto_hint_tcp}
+};
+
+/* IPV6 */
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_src,
+       proto_hint_ipv6_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv6_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv6_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv6_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_dst,
+       proto_hint_ipv6_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv6_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv6_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv6_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth,
+       proto_hint_ipv6_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv6_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv6_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv6_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_svlan,
        proto_hint_ipv6_only}
 };
 
@@ -1540,7 +2043,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
        /* GTPU */
        /* GTPU IP */
-       /* GTPU IPV4*/
+       /* IPv4 GTPU IP IPv4*/
        {ETH_RSS_L3_SRC_ONLY,
                &hdrs_hint_ipv4_src_gtpu_ip,
                IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
@@ -1561,173 +2064,850 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
        {ETH_RSS_GTPU,
                &hdrs_hint_teid_gtpu_ip,
                IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
-       /* GTPU EH */
-       /* Inner IPV4 */
-       {ETH_RSS_L3_SRC_ONLY,
-               &hdrs_hint_ipv4_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
-       {ETH_RSS_L3_DST_ONLY,
-               &hdrs_hint_ipv4_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       /* IPv4 GTPU IP IPv6*/
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_GTPU,
+               &hdrs_hint_teid_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+       /* IPv6 GTPU IP IPv4*/
        {ETH_RSS_IPV4 |
                ETH_RSS_L3_SRC_ONLY,
-               &hdrs_hint_ipv4_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
        {ETH_RSS_IPV4 |
                ETH_RSS_L3_DST_ONLY,
-               &hdrs_hint_ipv4_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
        {ETH_RSS_IPV4,
-               &hdrs_hint_ipv4_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
-       /* Inner IPV4->UDP */
+               &hdrs_hint_ipv4_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_GTPU,
+               &hdrs_hint_teid_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+       /* IPv6 GTPU IP IPv6*/
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_GTPU,
+               &hdrs_hint_teid_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},
+       /* IPv4 GTPU IP IPv4 UDP */
        {ETH_RSS_L3_SRC_ONLY |
                ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_src_udp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_L3_SRC_ONLY |
                ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_src_udp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_L3_SRC_ONLY,
-               &hdrs_hint_ipv4_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_udp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_L3_DST_ONLY |
                ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_dst_udp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_L3_DST_ONLY |
                ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_L3_DST_ONLY,
-               &hdrs_hint_ipv4_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_udp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_src_udp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_src_udp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_SRC_ONLY,
-               &hdrs_hint_ipv4_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_udp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_dst_udp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_DST_ONLY,
-               &hdrs_hint_ipv4_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_udp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+               &hdrs_hint_ipv4_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
        {ETH_RSS_NONFRAG_IPV4_UDP,
-               &hdrs_hint_ipv4_udp_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
-       /* Inner IPV4->TCP */
+               &hdrs_hint_ipv4_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       /* IPv4 GTPU IP IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       /* IPv6 GTPU IP IPv4 UDP */
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       /* IPv6 GTPU IP IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       /* IPv4 GTPU IP IPv4 TCP */
        {ETH_RSS_L3_SRC_ONLY |
                ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_src_tcp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_L3_SRC_ONLY |
                ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_L3_SRC_ONLY,
-               &hdrs_hint_ipv4_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_tcp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_L3_DST_ONLY |
                ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_L3_DST_ONLY |
                ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_L3_DST_ONLY,
-               &hdrs_hint_ipv4_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_src_tcp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_SRC_ONLY,
-               &hdrs_hint_ipv4_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_tcp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_DST_ONLY,
-               &hdrs_hint_ipv4_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+               &hdrs_hint_ipv4_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
        {ETH_RSS_NONFRAG_IPV4_TCP,
-               &hdrs_hint_ipv4_tcp_gtpu_eh,
-               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
-       /* GTPU EH UP */
-       /* Inner IPV4 */
-       {ETH_RSS_L3_SRC_ONLY,
-               &hdrs_hint_ipv4_src_gtpu_up,
-               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
-       {ETH_RSS_L3_DST_ONLY,
-               &hdrs_hint_ipv4_dst_gtpu_up,
-               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
-       {ETH_RSS_IPV4 |
+               &hdrs_hint_ipv4_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       /* IPv4 GTPU IP IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_SRC_ONLY,
-               &hdrs_hint_ipv4_src_gtpu_up,
-               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
-       {ETH_RSS_IPV4 |
-               ETH_RSS_L3_DST_ONLY,
-               &hdrs_hint_ipv4_dst_gtpu_up,
-               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
-       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv6_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       /* IPv6 GTPU IP IPv4 TCP */
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       /* IPv6 GTPU IP IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       /* GTPU EH */
+       /* IPv4 GTPU EH IPv4 */
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       /* IPv4 GTPU EH IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+       /* IPv6 GTPU EH IPv4 */
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+       /* IPv6 GTPU EH IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},
+       /* IPv4 GTPU EH IPv4 UDP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       /* IPv4 GTPU EH IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       /* IPv6 GTPU EH IPv4 UDP */
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       /* IPv6 GTPU EH IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       /* IPv4 GTPU EH IPv4 TCP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       /* IPv4 GTPU EH IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       /* IPv6 GTPU EH IPv4 TCP */
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       /* IPv6 GTPU EH IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       /* GTPU EH UP */
+       /* IPv4 GTPU EH UP IPv4 */
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
                &hdrs_hint_ipv4_gtpu_up,
                IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
-       /* Inner IPV4->UDP */
+       /* IPv4 GTPU EH UP IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       /* IPv6 GTPU EH UP IPv4 */
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       /* IPv6 GTPU EH UP IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       /* IPv4 GTPU EH UP IPv4 UDP */
        {ETH_RSS_L3_SRC_ONLY |
                ETH_RSS_L4_SRC_ONLY,
                &hdrs_hint_ipv4_src_udp_src_gtpu_up,
@@ -1791,7 +2971,115 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
        {ETH_RSS_NONFRAG_IPV4_UDP,
                &hdrs_hint_ipv4_udp_gtpu_up,
                IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
-       /* Inner IPV4->TCP */
+       /* IPv4 GTPU EH UP IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       /* IPv6 GTPU EH UP IPv4 UDP */
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       /* IPv6 GTPU EH UP IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       /* IPv4 GTPU EH UP IPv4 TCP */
        {ETH_RSS_L3_SRC_ONLY |
                ETH_RSS_L4_SRC_ONLY,
                &hdrs_hint_ipv4_src_tcp_src_gtpu_up,
@@ -1855,8 +3143,116 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
        {ETH_RSS_NONFRAG_IPV4_TCP,
                &hdrs_hint_ipv4_tcp_gtpu_up,
                IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       /* IPv4 GTPU EH UP IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       /* IPv6 GTPU EH UP IPv4 TCP */
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       /* IPv6 GTPU EH UP IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
        /* GTPU EH DWN */
-       /* Inner IPV4 */
+       /* IPv4 GTPU EH DWN IPv4 */
        {ETH_RSS_L3_SRC_ONLY,
                &hdrs_hint_ipv4_src_gtpu_dwn,
                IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
@@ -1874,7 +3270,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
        {ETH_RSS_IPV4,
                &hdrs_hint_ipv4_gtpu_dwn,
                IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
-       /* Inner IPV4->UDP */
+       /* IPv4 GTPU EH DWN IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       /* IPv6 GTPU EH DWN IPv4 */
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       /* IPv6 GTPU EH DWN IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       /* IPv4 GTPU EH DWN IPv4 UDP */
        {ETH_RSS_L3_SRC_ONLY |
                ETH_RSS_L4_SRC_ONLY,
                &hdrs_hint_ipv4_src_udp_src_gtpu_dwn,
@@ -1938,7 +3370,115 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
        {ETH_RSS_NONFRAG_IPV4_UDP,
                &hdrs_hint_ipv4_udp_gtpu_dwn,
                IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
-       /* Inner IPV4->TCP */
+       /* IPv4 GTPU EH DWN IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       /* IPv6 GTPU EH DWN IPv4 UDP */
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       /* IPv6 GTPU EH DWN IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       /* IPv4 GTPU EH DWN IPv4 TCP */
        {ETH_RSS_L3_SRC_ONLY |
                ETH_RSS_L4_SRC_ONLY,
                &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,
@@ -2002,6 +3542,114 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
        {ETH_RSS_NONFRAG_IPV4_TCP,
                &hdrs_hint_ipv4_tcp_gtpu_dwn,
                IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       /* IPv4 GTPU EH DWN IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       /* IPv6 GTPU EH DWN IPv4 TCP */
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       /* IPv6 GTPU EH DWN IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
 };
 
 struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
@@ -2105,6 +3753,7 @@ iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item,
 {
        const struct rte_flow_item *item = pattern;
        const struct rte_flow_item_gtp_psc *psc;
+       u8 outer_ipv6 = 0;
 
        for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
                if (item->last) {
@@ -2115,18 +3764,31 @@ iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item,
                }
 
                switch (item->type) {
+               case RTE_FLOW_ITEM_TYPE_IPV6:
+                       outer_ipv6 = 1;
+                       break;
                case RTE_FLOW_ITEM_TYPE_GTPU:
-                       *phint |= IAVF_PHINT_IPV4_GTPU_IP;
+                       *phint |= (outer_ipv6) ?
+                               IAVF_PHINT_IPV6_GTPU_IP :
+                               IAVF_PHINT_IPV4_GTPU_IP;
                        break;
                case RTE_FLOW_ITEM_TYPE_GTP_PSC:
                        psc = item->spec;
-                       *phint &= ~IAVF_PHINT_IPV4_GTPU_IP;
+                       *phint &= (outer_ipv6) ?
+                               ~IAVF_PHINT_IPV6_GTPU_IP :
+                               ~IAVF_PHINT_IPV4_GTPU_IP;
                        if (!psc)
-                               *phint |= IAVF_PHINT_IPV4_GTPU_EH;
+                               *phint |= (outer_ipv6) ?
+                                       IAVF_PHINT_IPV6_GTPU_EH :
+                                       IAVF_PHINT_IPV4_GTPU_EH;
                        else if (psc->pdu_type == IAVF_GTPU_EH_UPLINK)
-                               *phint |= IAVF_PHINT_IPV4_GTPU_EH_UPLINK;
+                               *phint |= (outer_ipv6) ?
+                                       IAVF_PHINT_IPV6_GTPU_EH_UPLINK :
+                                       IAVF_PHINT_IPV4_GTPU_EH_UPLINK;
                        else if (psc->pdu_type == IAVF_GTPU_EH_DWNLINK)
-                               *phint |= IAVF_PHINT_IPV4_GTPU_EH_DWNLINK;
+                               *phint |= (outer_ipv6) ?
+                                       IAVF_PHINT_IPV6_GTPU_EH_DWNLINK :
+                                       IAVF_PHINT_IPV4_GTPU_EH_DWNLINK;
                        break;
                default:
                        break;
@@ -2201,7 +3863,11 @@ iavf_hash_parse_action(const struct rte_flow_action actions[],
                        if ((pattern_hint & IAVF_PHINT_IPV4_GTPU_IP) ||
                            (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH) ||
                            (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_UPLINK) ||
-                           (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_DWNLINK)) {
+                           (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_DWNLINK) ||
+                           (pattern_hint & IAVF_PHINT_IPV6_GTPU_IP) ||
+                           (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH) ||
+                           (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH_UPLINK) ||
+                           (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH_DWNLINK)) {
                                hash_map_list = iavf_gtpu_hash_map_list;
                                mlist_len = RTE_DIM(iavf_gtpu_hash_map_list);
                        } else {