* [dpdk-dev] [PATCH 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF
@ 2020-06-12 8:10 Junfeng Guo
2020-06-12 8:10 ` [dpdk-dev] [PATCH 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-12 8:10 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
[PATCH 1/2] add RSS support for ipv4 ipv6 mix of GTP on PF
[PATCH 2/2] add RSS support for ipv4 ipv6 mix of GTP on VF
*** BLURB HERE ***
Junfeng Guo (2):
net/ice: add RSS support for ipv4 ipv6 mix of GTP
net/iavf: add RSS support for ipv4 ipv6 mix of GTP
drivers/net/iavf/iavf_generic_flow.c | 180 ++++++++++++++++++++++++++-
drivers/net/iavf/iavf_generic_flow.h | 30 ++++-
drivers/net/iavf/iavf_hash.c | 106 ++++++++++++----
drivers/net/ice/ice_generic_flow.c | 166 +++++++++++++++++++++++-
drivers/net/ice/ice_generic_flow.h | 24 ++++
drivers/net/ice/ice_hash.c | 94 ++++++++++----
6 files changed, 549 insertions(+), 51 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP
2020-06-12 8:10 [dpdk-dev] [PATCH 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
@ 2020-06-12 8:10 ` Junfeng Guo
2020-06-12 8:10 ` [dpdk-dev] [PATCH 2/2] net/iavf: " Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-12 8:10 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/ice/ice_generic_flow.c | 166 ++++++++++++++++++++++++++++-
drivers/net/ice/ice_generic_flow.h | 24 +++++
drivers/net/ice/ice_hash.c | 94 ++++++++++++----
3 files changed, 262 insertions(+), 22 deletions(-)
diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index ad103d0e8..e7cec44d8 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -1057,6 +1057,8 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[] = {
RTE_FLOW_ITEM_TYPE_GTP_PSC,
RTE_FLOW_ITEM_TYPE_END,
};
+
+/* IPv4 GTPU IPv4 */
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1085,7 +1087,16 @@ enum rte_flow_item_type 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 pattern_eth_ipv4_gtpu_eh_ipv4_sctp[] = {
+ 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_IPV4,
+ RTE_FLOW_ITEM_TYPE_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
};
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
@@ -1098,6 +1109,159 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+/* IPv4 GTPU IPv6 */
+enum rte_flow_item_type 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 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 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 pattern_eth_ipv4_gtpu_eh_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+enum rte_flow_item_type 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 IPv4 */
+enum rte_flow_item_type 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 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 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 pattern_eth_ipv6_gtpu_eh_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+enum rte_flow_item_type 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 IPv6 */
+enum rte_flow_item_type 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 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 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 pattern_eth_ipv6_gtpu_eh_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+enum rte_flow_item_type 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,
+};
+
/* PPPoE */
enum rte_flow_item_type pattern_eth_pppoed[] = {
RTE_FLOW_ITEM_TYPE_ETH,
diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
index 492a48cd9..5bce8c99e 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -365,11 +365,35 @@ extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[];
+
+/* IPv4 GTPU IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_sctp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[];
+/* IPv4 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_icmp[];
+
+/* IPv6 GTPU IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_icmp[];
+
+/* IPv6 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_icmp[];
+
/* PPPoE */
extern enum rte_flow_item_type pattern_eth_pppoed[];
extern enum rte_flow_item_type pattern_eth_vlan_pppoed[];
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 3d58b7184..a77bd3447 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -89,6 +89,7 @@ struct rss_type_match_hdr hint_3 = {
struct rss_type_match_hdr hint_4 = {
ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_SCTP |
ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV4_SCTP};
+
struct rss_type_match_hdr hint_5 = {
ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_IPV6};
struct rss_type_match_hdr hint_6 = {
@@ -100,20 +101,51 @@ struct rss_type_match_hdr hint_7 = {
struct rss_type_match_hdr hint_8 = {
ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_SCTP |
ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV6_SCTP};
+
struct rss_type_match_hdr hint_9 = {
- ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_IPV4};
-struct rss_type_match_hdr hint_10 = {
ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_IPV4};
-struct rss_type_match_hdr hint_11 = {
+struct rss_type_match_hdr hint_10 = {
ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_UDP};
-struct rss_type_match_hdr hint_12 = {
+struct rss_type_match_hdr hint_11 = {
ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_TCP};
-struct rss_type_match_hdr hint_13 = {
+struct rss_type_match_hdr hint_12 = {
ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_SCTP};
+
+struct rss_type_match_hdr hint_13 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_IPV4};
struct rss_type_match_hdr hint_14 = {
ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_UDP};
struct rss_type_match_hdr hint_15 = {
ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_16 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_SCTP};
+
+struct rss_type_match_hdr hint_17 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_18 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_19 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_20 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV6_SCTP};
+
+struct rss_type_match_hdr hint_21 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_22 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_23 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_24 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_SCTP};
+
+struct rss_type_match_hdr hint_25 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_26 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_27 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_28 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV6_SCTP};
/* Supported pattern for os default package. */
static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {
@@ -130,22 +162,42 @@ static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {
/* Supported pattern for comms package. */
static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
- {pattern_eth_ipv4, ICE_INSET_NONE, &hint_1},
- {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_2},
- {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_3},
- {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4},
- {pattern_eth_ipv6, ICE_INSET_NONE, &hint_5},
- {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_6},
- {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_7},
- {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8},
- {pattern_empty, ICE_INSET_NONE, &hint_0},
- {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE, &hint_9},
- {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, &hint_14},
- {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, &hint_15},
- {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, &hint_10},
- {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, &hint_11},
- {pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE, &hint_12},
- {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, &hint_13},
+ {pattern_eth_ipv4, ICE_INSET_NONE, &hint_1},
+ {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_2},
+ {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_3},
+ {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4},
+
+ {pattern_eth_ipv6, ICE_INSET_NONE, &hint_5},
+ {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_6},
+ {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_7},
+ {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8},
+
+ {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, &hint_9},
+ {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, &hint_10},
+ {pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE, &hint_11},
+ {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, &hint_12},
+
+ {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE, &hint_13},
+ {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, &hint_14},
+ {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, &hint_15},
+ {pattern_eth_ipv4_gtpu_eh_ipv4_sctp, ICE_INSET_NONE, &hint_16},
+
+ {pattern_eth_ipv4_gtpu_eh_ipv6, ICE_INSET_NONE, &hint_17},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE, &hint_18},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE, &hint_19},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_sctp, ICE_INSET_NONE, &hint_20},
+
+ {pattern_eth_ipv6_gtpu_eh_ipv4, ICE_INSET_NONE, &hint_21},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE, &hint_22},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, &hint_23},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_sctp, ICE_INSET_NONE, &hint_24},
+
+ {pattern_eth_ipv6_gtpu_eh_ipv6, ICE_INSET_NONE, &hint_25},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE, &hint_26},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE, &hint_27},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_sctp, ICE_INSET_NONE, &hint_28},
+
+ {pattern_empty, ICE_INSET_NONE, &hint_0},
};
/**
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH 2/2] net/iavf: add RSS support for ipv4 ipv6 mix of GTP
2020-06-12 8:10 [dpdk-dev] [PATCH 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
2020-06-12 8:10 ` [dpdk-dev] [PATCH 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
@ 2020-06-12 8:10 ` Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-12 8:10 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/iavf/iavf_generic_flow.c | 180 ++++++++++++++++++++++++++-
drivers/net/iavf/iavf_generic_flow.h | 30 ++++-
drivers/net/iavf/iavf_hash.c | 106 ++++++++++++----
3 files changed, 287 insertions(+), 29 deletions(-)
diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c
index b6c26c4fd..f8c5c02d2 100644
--- a/drivers/net/iavf/iavf_generic_flow.c
+++ b/drivers/net/iavf/iavf_generic_flow.c
@@ -315,7 +315,7 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[] = {
RTE_FLOW_ITEM_TYPE_END,
};
-/* GTPU */
+/* IPv4 GTPU (EH) */
enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -333,6 +333,7 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+/* IPv4 GTPU IPv4 */
enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -342,6 +343,8 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = {
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,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -372,7 +375,17 @@ 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_sctp[] = {
+ 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_IPV4,
+ RTE_FLOW_ITEM_TYPE_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
};
enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
@@ -386,6 +399,171 @@ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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 978d0716b..f7ce4dcc7 100644
--- a/drivers/net/iavf/iavf_generic_flow.h
+++ b/drivers/net/iavf/iavf_generic_flow.h
@@ -182,15 +182,41 @@ extern enum rte_flow_item_type iavf_pattern_eth_ipv6_icmp6[];
extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];
extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];
-/* GTPU */
+/* IPv4 GTPU (EH) */
extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[];
-extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[];
extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[];
+
+/* IPv4 GTPU IPv4 */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[];
+
+/* IPv4 GTPU EH IPv4 */
extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[];
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_sctp[];
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_sctp[];
+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_sctp[];
+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_sctp[];
+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 a7691ef0c..6bd49163b 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -85,6 +85,7 @@ iavf_hash_parse_pattern_action(struct iavf_adapter *ad,
struct iavf_pattern_match_type phint_empty = {
IAVF_PATTERN_HINT_NONE};
+
struct iavf_pattern_match_type phint_eth_ipv4 = {
IAVF_PATTERN_HINT_IPV4};
struct iavf_pattern_match_type phint_eth_ipv4_udp = {
@@ -93,8 +94,43 @@ struct iavf_pattern_match_type phint_eth_ipv4_tcp = {
IAVF_PATTERN_HINT_IPV4_TCP};
struct iavf_pattern_match_type phint_eth_ipv4_sctp = {
IAVF_PATTERN_HINT_IPV4_SCTP};
-struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh = {
+
+struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4 = {
+ IAVF_PATTERN_HINT_IPV4};
+struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_udp4 = {
IAVF_PATTERN_HINT_IPV4_UDP};
+struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_tcp4 = {
+ IAVF_PATTERN_HINT_IPV4_TCP};
+struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_sctp4 = {
+ IAVF_PATTERN_HINT_IPV4_SCTP};
+
+struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6 = {
+ IAVF_PATTERN_HINT_IPV6};
+struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_udp6 = {
+ IAVF_PATTERN_HINT_IPV6_UDP};
+struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_tcp6 = {
+ IAVF_PATTERN_HINT_IPV6_TCP};
+struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_sctp6 = {
+ IAVF_PATTERN_HINT_IPV6_SCTP};
+
+struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4 = {
+ IAVF_PATTERN_HINT_IPV4};
+struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_udp4 = {
+ IAVF_PATTERN_HINT_IPV4_UDP};
+struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_tcp4 = {
+ IAVF_PATTERN_HINT_IPV4_TCP};
+struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_sctp4 = {
+ IAVF_PATTERN_HINT_IPV4_SCTP};
+
+struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6 = {
+ IAVF_PATTERN_HINT_IPV6};
+struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_udp6 = {
+ IAVF_PATTERN_HINT_IPV6_UDP};
+struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_tcp6 = {
+ IAVF_PATTERN_HINT_IPV6_TCP};
+struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_sctp6 = {
+ IAVF_PATTERN_HINT_IPV6_SCTP};
+
struct iavf_pattern_match_type phint_eth_ipv4_esp = {
IAVF_PATTERN_HINT_IPV4};
struct iavf_pattern_match_type phint_eth_ipv4_ah = {
@@ -103,6 +139,7 @@ struct iavf_pattern_match_type phint_eth_ipv4_l2tpv3 = {
IAVF_PATTERN_HINT_IPV4};
struct iavf_pattern_match_type phint_eth_ipv4_pfcp = {
IAVF_PATTERN_HINT_IPV4_UDP};
+
struct iavf_pattern_match_type phint_eth_ipv6 = {
IAVF_PATTERN_HINT_IPV6};
struct iavf_pattern_match_type phint_eth_ipv6_udp = {
@@ -111,6 +148,7 @@ struct iavf_pattern_match_type phint_eth_ipv6_tcp = {
IAVF_PATTERN_HINT_IPV6_TCP};
struct iavf_pattern_match_type phint_eth_ipv6_sctp = {
IAVF_PATTERN_HINT_IPV6_SCTP};
+
struct iavf_pattern_match_type phint_eth_ipv6_esp = {
IAVF_PATTERN_HINT_IPV6};
struct iavf_pattern_match_type phint_eth_ipv6_ah = {
@@ -127,31 +165,47 @@ struct iavf_pattern_match_type phint_eth_ipv6_pfcp = {
* the third member is pattern hint for hash.
*/
static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {
- {iavf_pattern_eth_ipv4, IAVF_INSET_NONE, &phint_eth_ipv4},
- {iavf_pattern_eth_ipv4_udp, IAVF_INSET_NONE, &phint_eth_ipv4_udp},
- {iavf_pattern_eth_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_tcp},
- {iavf_pattern_eth_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_sctp},
- {iavf_pattern_eth_ipv6, IAVF_INSET_NONE, &phint_eth_ipv6},
- {iavf_pattern_eth_ipv4_gtpu_eh_ipv4, IAVF_INSET_NONE,
- &phint_eth_ipv4_gtpu_eh},
- {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp, IAVF_INSET_NONE,
- &phint_eth_ipv4_gtpu_eh},
- {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE,
- &phint_eth_ipv4_gtpu_eh},
- {iavf_pattern_eth_ipv4_esp, IAVF_INSET_NONE, &phint_eth_ipv4_esp},
- {iavf_pattern_eth_ipv4_ah, IAVF_INSET_NONE, &phint_eth_ipv4_ah},
- {iavf_pattern_eth_ipv4_l2tpv3, IAVF_INSET_NONE,
- &phint_eth_ipv4_l2tpv3},
- {iavf_pattern_eth_ipv4_pfcp, IAVF_INSET_NONE, &phint_eth_ipv4_pfcp},
- {iavf_pattern_eth_ipv6_udp, IAVF_INSET_NONE, &phint_eth_ipv6_udp},
- {iavf_pattern_eth_ipv6_tcp, IAVF_INSET_NONE, &phint_eth_ipv6_tcp},
- {iavf_pattern_eth_ipv6_sctp, IAVF_INSET_NONE, &phint_eth_ipv6_sctp},
- {iavf_pattern_eth_ipv6_esp, IAVF_INSET_NONE, &phint_eth_ipv6_esp},
- {iavf_pattern_eth_ipv6_ah, IAVF_INSET_NONE, &phint_eth_ipv6_ah},
- {iavf_pattern_eth_ipv6_l2tpv3, IAVF_INSET_NONE,
- &phint_eth_ipv6_l2tpv3},
- {iavf_pattern_eth_ipv6_pfcp, IAVF_INSET_NONE, &phint_eth_ipv6_pfcp},
- {iavf_pattern_empty, IAVF_INSET_NONE, &phint_empty},
+ {iavf_pattern_eth_ipv4, IAVF_INSET_NONE, &phint_eth_ipv4},
+ {iavf_pattern_eth_ipv4_udp, IAVF_INSET_NONE, &phint_eth_ipv4_udp},
+ {iavf_pattern_eth_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_tcp},
+ {iavf_pattern_eth_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_sctp},
+
+ {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_udp4},
+ {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_gtpu_eh_tcp4},
+ {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_gtpu_eh_sctp4},
+
+ {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_udp6},
+ {iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_gtpu_eh_tcp6},
+ {iavf_pattern_eth_ipv4_gtpu_eh_ipv6_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_gtpu_eh_sctp6},
+
+ {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_udp4},
+ {iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv6_gtpu_eh_tcp4},
+ {iavf_pattern_eth_ipv6_gtpu_eh_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv6_gtpu_eh_sctp4},
+
+ {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_udp6},
+ {iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE, &phint_eth_ipv6_gtpu_eh_tcp6},
+ {iavf_pattern_eth_ipv6_gtpu_eh_ipv6_sctp, IAVF_INSET_NONE, &phint_eth_ipv6_gtpu_eh_sctp6},
+
+ {iavf_pattern_eth_ipv4_esp, IAVF_INSET_NONE, &phint_eth_ipv4_esp},
+ {iavf_pattern_eth_ipv4_ah, IAVF_INSET_NONE, &phint_eth_ipv4_ah},
+ {iavf_pattern_eth_ipv4_l2tpv3, IAVF_INSET_NONE, &phint_eth_ipv4_l2tpv3},
+ {iavf_pattern_eth_ipv4_pfcp, IAVF_INSET_NONE, &phint_eth_ipv4_pfcp},
+
+ {iavf_pattern_eth_ipv6, IAVF_INSET_NONE, &phint_eth_ipv6},
+ {iavf_pattern_eth_ipv6_udp, IAVF_INSET_NONE, &phint_eth_ipv6_udp},
+ {iavf_pattern_eth_ipv6_tcp, IAVF_INSET_NONE, &phint_eth_ipv6_tcp},
+ {iavf_pattern_eth_ipv6_sctp, IAVF_INSET_NONE, &phint_eth_ipv6_sctp},
+
+ {iavf_pattern_eth_ipv6_esp, IAVF_INSET_NONE, &phint_eth_ipv6_esp},
+ {iavf_pattern_eth_ipv6_ah, IAVF_INSET_NONE, &phint_eth_ipv6_ah},
+ {iavf_pattern_eth_ipv6_l2tpv3, IAVF_INSET_NONE, &phint_eth_ipv6_l2tpv3},
+ {iavf_pattern_eth_ipv6_pfcp, IAVF_INSET_NONE, &phint_eth_ipv6_pfcp},
+
+ {iavf_pattern_empty, IAVF_INSET_NONE, &phint_empty},
};
#define TUNNEL_LEVEL_OUTER 0
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v2 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF
2020-06-12 8:10 [dpdk-dev] [PATCH 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
2020-06-12 8:10 ` [dpdk-dev] [PATCH 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-06-12 8:10 ` [dpdk-dev] [PATCH 2/2] net/iavf: " Junfeng Guo
@ 2020-06-17 7:36 ` Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
` (2 more replies)
2 siblings, 3 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-17 7:36 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
RSS for GTP with outer & inner ipv4 & ipv6 combination are supported
in this patchset, 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)
[PATCH v2 1/2] add RSS support for ipv4 ipv6 mix of GTP on PF
[PATCH v2 2/2] add RSS support for ipv4 ipv6 mix of GTP on VF
v2:
* Code rebase.
Junfeng Guo (2):
net/ice: add RSS support for ipv4 ipv6 mix of GTP
net/iavf: add RSS support for ipv4 ipv6 mix of GTP
drivers/net/iavf/iavf_generic_flow.c | 365 ++++++++
drivers/net/iavf/iavf_generic_flow.h | 54 ++
drivers/net/iavf/iavf_hash.c | 1202 ++++++++++++++++++++++++--
drivers/net/ice/ice_generic_flow.c | 368 ++++++++
drivers/net/ice/ice_generic_flow.h | 47 +
drivers/net/ice/ice_hash.c | 118 +++
6 files changed, 2104 insertions(+), 50 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v2 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
@ 2020-06-17 7:36 ` Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 2/2] net/iavf: " Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-17 7:36 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/ice/ice_generic_flow.c | 368 +++++++++++++++++++++++++++++
drivers/net/ice/ice_generic_flow.h | 47 ++++
drivers/net/ice/ice_hash.c | 118 +++++++++
3 files changed, 533 insertions(+)
diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index 9f83a428d..3b588b4ee 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -1079,6 +1079,196 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+enum rte_flow_item_type 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 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 pattern_eth_ipv4_gtpu_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv4_gtpu_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_ETH,
@@ -1089,6 +1279,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_IPV4,
RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1099,6 +1290,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = {
RTE_FLOW_ITEM_TYPE_UDP,
RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1108,8 +1300,19 @@ enum rte_flow_item_type 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 pattern_eth_ipv4_gtpu_eh_ipv4_sctp[] = {
+ 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_IPV4,
+ RTE_FLOW_ITEM_TYPE_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1121,6 +1324,171 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+/*IPv4 GTPU EH IPv6 */
+enum rte_flow_item_type 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 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 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 pattern_eth_ipv4_gtpu_eh_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_eh_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_eh_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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,
+};
+
/* PPPoE */
enum rte_flow_item_type pattern_eth_pppoed[] = {
RTE_FLOW_ITEM_TYPE_ETH,
diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
index 3ce9a1f27..2054d814e 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -371,13 +371,60 @@ extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh[];
/* IPv4 GTPU IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[];
+
+/* IPv4 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_icmp[];
+
+/* IPv6 GTPU IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_icmp[];
+
+/* IPv6 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_icmp[];
/* IPv4 GTPU EH IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_sctp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[];
+/* IPv4 GTPU EH IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_icmp[];
+
+/* IPv6 GTPU EH IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_icmp[];
+
+/* IPv6 GTPU EH IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_icmp[];
+
/* PPPoE */
extern enum rte_flow_item_type pattern_eth_pppoed[];
extern enum rte_flow_item_type pattern_eth_vlan_pppoed[];
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index f5c2879d0..e362480ad 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -96,9 +96,47 @@ struct rss_type_match_hdr hint_eth_ipv4_sctp = {
ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
ICE_FLOW_SEG_HDR_SCTP,
ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_SCTP};
+
struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = {
ICE_FLOW_SEG_HDR_GTPU_IP,
ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+
struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {
ICE_FLOW_SEG_HDR_GTPU_EH,
ETH_RSS_GTPU | ETH_RSS_IPV4};
@@ -108,6 +146,37 @@ struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = {
struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = {
ICE_FLOW_SEG_HDR_GTPU_EH,
ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+
struct rss_type_match_hdr hint_eth_pppoes_ipv4 = {
ICE_FLOW_SEG_HDR_PPPOE,
ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4};
@@ -216,14 +285,63 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
&hint_eth_ipv4_tcp},
{pattern_eth_ipv4_sctp, ICE_INSET_NONE,
&hint_eth_ipv4_sctp},
+
{pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_ipv4},
+ {pattern_eth_ipv4_gtpu_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv4_udp},
+ {pattern_eth_ipv4_gtpu_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv4_tcp},
+
+ {pattern_eth_ipv4_gtpu_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6},
+ {pattern_eth_ipv4_gtpu_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6_udp},
+ {pattern_eth_ipv4_gtpu_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6_tcp},
+
+ {pattern_eth_ipv6_gtpu_ipv4, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4},
+ {pattern_eth_ipv6_gtpu_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4_udp},
+ {pattern_eth_ipv6_gtpu_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4_tcp},
+
+ {pattern_eth_ipv6_gtpu_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6},
+ {pattern_eth_ipv6_gtpu_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6_udp},
+ {pattern_eth_ipv6_gtpu_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6_tcp},
+
{pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4},
{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4_udp},
{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4_tcp},
+
+ {pattern_eth_ipv4_gtpu_eh_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6_udp},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6_tcp},
+
+ {pattern_eth_ipv6_gtpu_eh_ipv4, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4_udp},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4_tcp},
+
+ {pattern_eth_ipv6_gtpu_eh_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6_udp},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6_tcp},
+
{pattern_eth_pppoes_ipv4, ICE_INSET_NONE,
&hint_eth_pppoes_ipv4},
{pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE,
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v2 2/2] net/iavf: add RSS support for ipv4 ipv6 mix of GTP
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
@ 2020-06-17 7:36 ` Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-17 7:36 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/iavf/iavf_generic_flow.c | 365 ++++++++
drivers/net/iavf/iavf_generic_flow.h | 54 ++
drivers/net/iavf/iavf_hash.c | 1202 ++++++++++++++++++++++++--
3 files changed, 1571 insertions(+), 50 deletions(-)
diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c
index c6d48f081..286d046dd 100644
--- a/drivers/net/iavf/iavf_generic_flow.c
+++ b/drivers/net/iavf/iavf_generic_flow.c
@@ -361,6 +361,196 @@ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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 +582,17 @@ 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_sctp[] = {
+ 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_IPV4,
+ RTE_FLOW_ITEM_TYPE_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
};
enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
@@ -406,6 +606,171 @@ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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 8a6687542..8b41b650f 100644
--- a/drivers/net/iavf/iavf_generic_flow.h
+++ b/drivers/net/iavf/iavf_generic_flow.h
@@ -192,13 +192,67 @@ 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_sctp[];
+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_sctp[];
+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_sctp[];
+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_sctp[];
+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[];
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_sctp[];
extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[];
+/* IPv4 GTPU EH IPv4 */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[];
+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_sctp[];
+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_sctp[];
+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_sctp[];
+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_sctp[];
+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 a25f39dfe..b8f551684 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -39,6 +39,10 @@ enum iavf_pattern_hint_type {
IAVF_PHINT_IPV4_GTPU_EH = 0x00000800,
IAVF_PHINT_IPV4_GTPU_EH_DWNLINK = 0x00001000,
IAVF_PHINT_IPV4_GTPU_EH_UPLINK = 0x00002000,
+ IAVF_PHINT_IPV6_GTPU_IP = 0x00004000,
+ IAVF_PHINT_IPV6_GTPU_EH = 0x00008000,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK = 0x00010000,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK = 0x00020000,
};
#define GTPU_EH_DWNLINK 0
@@ -95,14 +99,63 @@ static struct iavf_pattern_match_type phint_eth_ipv4_tcp = {
IAVF_PHINT_IPV4_TCP};
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_ah = {
@@ -143,14 +196,63 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {
{iavf_pattern_eth_ipv4_udp, IAVF_INSET_NONE, &phint_eth_ipv4_udp},
{iavf_pattern_eth_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_tcp},
{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_ah, IAVF_INSET_NONE, &phint_eth_ipv4_ah},
{iavf_pattern_eth_ipv4_l2tpv3, IAVF_INSET_NONE,
@@ -528,7 +630,8 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_pfcp = {
proto_hint_pfcp }
};
-/* 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 }
@@ -548,7 +651,24 @@ 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 }
+};
+
+/* 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,
@@ -625,7 +745,84 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh = {
proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
};
-/* 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}
+};
+
+/* 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,
@@ -702,7 +899,84 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_up = {
proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
};
-/* 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}
+};
+
+/* 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,
@@ -779,6 +1053,83 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn = {
proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
};
+/* IPv6 GTPU DWN */
+
+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_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_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_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_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_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_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_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_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_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_ipv6_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv6 }
+};
+
+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_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}
+};
+
/* IPV6 */
struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = {
@@ -1225,7 +1576,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 IPv4*/
{ETH_RSS_L3_SRC_ONLY,
&hdrs_hint_ipv4_src_gtpu_ip,
IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
@@ -1246,8 +1597,53 @@ 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},
+ /* IPv4 GTPU IPv6*/
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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 IPv4*/
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src_gtpu_ip,
+ IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_ip,
+ IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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 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},
/* GTPU EH */
- /* Inner IPV4 */
+ /* IPv4 GTPU EH IPv4 */
{ETH_RSS_L3_SRC_ONLY,
&hdrs_hint_ipv4_src_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
@@ -1265,7 +1661,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{ETH_RSS_IPV4,
&hdrs_hint_ipv4_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
- /* Inner IPV4->UDP */
+ /* IPv4 GTPU EH IPv6 */
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ /* IPv6 GTPU EH IPv4 */
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1326,44 +1758,143 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
ETH_RSS_L4_DST_ONLY,
&hdrs_hint_ipv4_udp_dst_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
- /* Inner 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 |
+ /* IPv4 GTPU EH IPv6 UDP */
+ {ETH_RSS_NONFRAG_IPV6_UDP |
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 |
+ &hdrs_hint_ipv4_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_ipv4_src_tcp_dst_gtpu_eh,
- IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
- {ETH_RSS_NONFRAG_IPV4_TCP |
+ &hdrs_hint_ipv4_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_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_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_ipv4_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_ipv4_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_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_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_ipv6_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_ipv6_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_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv6_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_ipv6_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_ipv6_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_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv6_udp_dst_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},
+ /* 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},
@@ -1387,8 +1918,107 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
ETH_RSS_L4_DST_ONLY,
&hdrs_hint_ipv4_tcp_dst_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_ipv4_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_ipv4_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_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_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_ipv4_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_ipv4_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_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_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_ipv6_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_ipv6_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_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv6_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_ipv6_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_ipv6_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_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv6_tcp_dst_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},
/* GTPU EH UP */
- /* Inner IPV4 */
+ /* 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},
@@ -1406,7 +2036,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{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_ipv4_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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_ipv6_src_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1467,7 +2133,106 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
ETH_RSS_L4_DST_ONLY,
&hdrs_hint_ipv4_udp_dst_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_udp_dst_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_udp_dst_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},
+ /* IPv4 GTPU EH UP IPv4 TCP */
{ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,
&hdrs_hint_ipv4_src_tcp_src_gtpu_up,
@@ -1528,8 +2293,107 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
ETH_RSS_L4_DST_ONLY,
&hdrs_hint_ipv4_tcp_dst_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_tcp_dst_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_tcp_dst_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},
/* 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},
@@ -1547,7 +2411,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_ipv4_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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_ipv6_src_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1608,7 +2508,106 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
ETH_RSS_L4_DST_ONLY,
&hdrs_hint_ipv4_udp_dst_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_udp_dst_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_udp_dst_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},
+ /* IPv4 GTPU EH DWN IPv4 TCP */
{ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,
&hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,
@@ -1669,6 +2668,105 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
ETH_RSS_L4_DST_ONLY,
&hdrs_hint_ipv4_tcp_dst_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_tcp_dst_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_tcp_dst_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},
};
struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
@@ -1876,7 +2974,11 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,
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 {
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v3 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 2/2] net/iavf: " Junfeng Guo
@ 2020-06-18 4:48 ` Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
` (2 more replies)
2 siblings, 3 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-18 4:48 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
RSS for GTP with outer & inner ipv4 & ipv6 combination are supported
in this patchset, 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)
[PATCH v3 1/2] add RSS support for ipv4 ipv6 mix of GTP on PF.
[PATCH v3 2/2] add RSS support for ipv4 ipv6 mix of GTP on VF.
v3:
* Code rebase.
v2:
* Code rebase.
Junfeng Guo (2):
net/ice: add RSS support for ipv4 ipv6 mix of GTP
net/iavf: add RSS support for ipv4 ipv6 mix of GTP
drivers/net/iavf/iavf_generic_flow.c | 365 +++++
drivers/net/iavf/iavf_generic_flow.h | 47 +
drivers/net/iavf/iavf_hash.c | 1287 +++++++++++++++-
drivers/net/iavf/iavf_hash.c.orig | 2104 ++++++++++++++++++++++++++
drivers/net/ice/ice_generic_flow.c | 368 +++++
drivers/net/ice/ice_generic_flow.h | 47 +
drivers/net/ice/ice_hash.c | 100 ++
7 files changed, 4266 insertions(+), 52 deletions(-)
create mode 100644 drivers/net/iavf/iavf_hash.c.orig
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v3 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
@ 2020-06-18 4:48 ` Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 2/2] net/iavf: " Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-18 4:48 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/ice/ice_generic_flow.c | 368 +++++++++++++++++++++++++++++
drivers/net/ice/ice_generic_flow.h | 47 ++++
drivers/net/ice/ice_hash.c | 100 ++++++++
3 files changed, 515 insertions(+)
diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index 9f83a428d..3b588b4ee 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -1079,6 +1079,196 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+enum rte_flow_item_type 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 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 pattern_eth_ipv4_gtpu_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv4_gtpu_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_ETH,
@@ -1089,6 +1279,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_IPV4,
RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1099,6 +1290,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = {
RTE_FLOW_ITEM_TYPE_UDP,
RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1108,8 +1300,19 @@ enum rte_flow_item_type 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 pattern_eth_ipv4_gtpu_eh_ipv4_sctp[] = {
+ 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_IPV4,
+ RTE_FLOW_ITEM_TYPE_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1121,6 +1324,171 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+/*IPv4 GTPU EH IPv6 */
+enum rte_flow_item_type 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 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 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 pattern_eth_ipv4_gtpu_eh_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_eh_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_eh_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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,
+};
+
/* PPPoE */
enum rte_flow_item_type pattern_eth_pppoed[] = {
RTE_FLOW_ITEM_TYPE_ETH,
diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
index 3ce9a1f27..2054d814e 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -371,13 +371,60 @@ extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh[];
/* IPv4 GTPU IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[];
+
+/* IPv4 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_icmp[];
+
+/* IPv6 GTPU IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_icmp[];
+
+/* IPv6 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_icmp[];
/* IPv4 GTPU EH IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_sctp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[];
+/* IPv4 GTPU EH IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_icmp[];
+
+/* IPv6 GTPU EH IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_icmp[];
+
+/* IPv6 GTPU EH IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_icmp[];
+
/* PPPoE */
extern enum rte_flow_item_type pattern_eth_pppoed[];
extern enum rte_flow_item_type pattern_eth_vlan_pppoed[];
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 628d3e184..c976285dd 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -99,6 +99,39 @@ struct rss_type_match_hdr hint_eth_ipv4_sctp = {
struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = {
ICE_FLOW_SEG_HDR_GTPU_IP,
ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {
ICE_FLOW_SEG_HDR_GTPU_EH,
ETH_RSS_GTPU | ETH_RSS_IPV4};
@@ -108,6 +141,33 @@ struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = {
struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = {
ICE_FLOW_SEG_HDR_GTPU_EH,
ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
struct rss_type_match_hdr hint_eth_pppoes_ipv4 = {
ICE_FLOW_SEG_HDR_PPPOE,
ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4};
@@ -226,12 +286,52 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
&hint_eth_ipv4_sctp},
{pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_ipv4},
+ {pattern_eth_ipv4_gtpu_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv4_udp},
+ {pattern_eth_ipv4_gtpu_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv4_tcp},
+ {pattern_eth_ipv4_gtpu_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6},
+ {pattern_eth_ipv4_gtpu_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6_udp},
+ {pattern_eth_ipv4_gtpu_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6_tcp},
+ {pattern_eth_ipv6_gtpu_ipv4, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4},
+ {pattern_eth_ipv6_gtpu_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4_udp},
+ {pattern_eth_ipv6_gtpu_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4_tcp},
+ {pattern_eth_ipv6_gtpu_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6},
+ {pattern_eth_ipv6_gtpu_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6_udp},
+ {pattern_eth_ipv6_gtpu_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6_tcp},
{pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4},
{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4_udp},
{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4_tcp},
+ {pattern_eth_ipv4_gtpu_eh_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6_udp},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6_tcp},
+ {pattern_eth_ipv6_gtpu_eh_ipv4, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4_udp},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4_tcp},
+ {pattern_eth_ipv6_gtpu_eh_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6_udp},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6_tcp},
{pattern_eth_pppoes_ipv4, ICE_INSET_NONE,
&hint_eth_pppoes_ipv4},
{pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE,
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v3 2/2] net/iavf: add RSS support for ipv4 ipv6 mix of GTP
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
@ 2020-06-18 4:48 ` Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-18 4:48 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/iavf/iavf_generic_flow.c | 365 +++++
drivers/net/iavf/iavf_generic_flow.h | 47 +
drivers/net/iavf/iavf_hash.c | 1287 +++++++++++++++-
drivers/net/iavf/iavf_hash.c.orig | 2104 ++++++++++++++++++++++++++
4 files changed, 3751 insertions(+), 52 deletions(-)
create mode 100644 drivers/net/iavf/iavf_hash.c.orig
diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c
index c6d48f081..286d046dd 100644
--- a/drivers/net/iavf/iavf_generic_flow.c
+++ b/drivers/net/iavf/iavf_generic_flow.c
@@ -361,6 +361,196 @@ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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 +582,17 @@ 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_sctp[] = {
+ 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_IPV4,
+ RTE_FLOW_ITEM_TYPE_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
};
enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
@@ -406,6 +606,171 @@ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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 8a6687542..9e640fb43 100644
--- a/drivers/net/iavf/iavf_generic_flow.h
+++ b/drivers/net/iavf/iavf_generic_flow.h
@@ -192,13 +192,60 @@ 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_sctp[];
+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_sctp[];
+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_sctp[];
+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_sctp[];
+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[];
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_sctp[];
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_sctp[];
+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_sctp[];
+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_sctp[];
+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 f8ff82d32..36456b2cd 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -39,6 +39,10 @@ enum iavf_pattern_hint_type {
IAVF_PHINT_IPV4_GTPU_EH = 0x00000800,
IAVF_PHINT_IPV4_GTPU_EH_DWNLINK = 0x00001000,
IAVF_PHINT_IPV4_GTPU_EH_UPLINK = 0x00002000,
+ IAVF_PHINT_IPV6_GTPU_IP = 0x00004000,
+ IAVF_PHINT_IPV6_GTPU_EH = 0x00008000,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK = 0x00010000,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK = 0x00020000,
};
#define IAVF_GTPU_EH_DWNLINK 0
@@ -97,12 +101,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 = {
@@ -149,12 +193,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},
@@ -541,7 +625,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 }
@@ -561,7 +646,24 @@ 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 }
+};
+
+/* 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,
@@ -648,7 +750,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = {
proto_hint_ipv4, 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, 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, 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,
@@ -735,7 +924,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = {
proto_hint_ipv4, 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, 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, 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,
@@ -822,6 +1098,93 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = {
proto_hint_ipv4, proto_hint_tcp}
};
+/* IPv6 GTPU DWN */
+
+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_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_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_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_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_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_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_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_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_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_ipv6_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv6 }
+};
+
+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_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, 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, proto_hint_tcp}
+};
+
/* IPV6 */
struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = {
@@ -1277,7 +1640,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 IPv4*/
{ETH_RSS_L3_SRC_ONLY,
&hdrs_hint_ipv4_src_gtpu_ip,
IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
@@ -1298,8 +1661,53 @@ 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},
+ /* IPv4 GTPU IPv6*/
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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 IPv4*/
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src_gtpu_ip,
+ IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_ip,
+ IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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 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},
/* GTPU EH */
- /* Inner IPV4 */
+ /* IPv4 GTPU EH IPv4 */
{ETH_RSS_L3_SRC_ONLY,
&hdrs_hint_ipv4_src_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
@@ -1317,7 +1725,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{ETH_RSS_IPV4,
&hdrs_hint_ipv4_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
- /* Inner IPV4->UDP */
+ /* IPv4 GTPU EH IPv6 */
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ /* IPv6 GTPU EH IPv4 */
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1381,40 +1825,148 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{ETH_RSS_NONFRAG_IPV4_UDP,
&hdrs_hint_ipv4_udp_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
- /* Inner 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 |
+ /* IPv4 GTPU EH IPv6 UDP */
+ {ETH_RSS_NONFRAG_IPV6_UDP |
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 |
+ &hdrs_hint_ipv4_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_ipv4_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_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_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_ipv4_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_ipv4_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_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv6_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_ipv6_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_ipv6_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_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv6_udp_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv6_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},
@@ -1445,8 +1997,116 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{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_ipv4_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_ipv4_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_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_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_ipv4_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_ipv4_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_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv6_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_ipv6_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_ipv6_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_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv6_tcp_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv6_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 */
- /* Inner IPV4 */
+ /* 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},
@@ -1464,7 +2124,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{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_ipv4_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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_ipv6_src_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1528,7 +2224,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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_udp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_udp_dst_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv6_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,
@@ -1592,8 +2396,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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_tcp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_tcp_dst_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv6_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},
@@ -1611,7 +2523,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_ipv4_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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_ipv6_src_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1675,7 +2623,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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_udp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_udp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv6_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,
@@ -1739,6 +2795,114 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{ETH_RSS_NONFRAG_IPV4_TCP,
&hdrs_hint_ipv4_udp_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_tcp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP,
+ &hdrs_hint_ipv4_udp_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_tcp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv6_udp_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_udp_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
};
struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
@@ -1842,6 +3006,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) {
@@ -1852,18 +3017,32 @@ 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;
@@ -1938,7 +3117,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 {
diff --git a/drivers/net/iavf/iavf_hash.c.orig b/drivers/net/iavf/iavf_hash.c.orig
new file mode 100644
index 000000000..f8ff82d32
--- /dev/null
+++ b/drivers/net/iavf/iavf_hash.c.orig
@@ -0,0 +1,2104 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Intel Corporation
+ */
+
+#include <sys/queue.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdarg.h>
+
+#include <rte_debug.h>
+#include <rte_ether.h>
+#include <rte_ethdev_driver.h>
+#include <rte_log.h>
+#include <rte_malloc.h>
+#include <rte_eth_ctrl.h>
+#include <rte_tailq.h>
+#include <rte_flow_driver.h>
+
+#include "iavf_log.h"
+#include "iavf.h"
+#include "iavf_generic_flow.h"
+
+enum iavf_pattern_hint_type {
+ IAVF_PHINT_NONE = 0x00000000,
+ IAVF_PHINT_IPV4 = 0x00000001,
+ IAVF_PHINT_IPV4_UDP = 0x00000002,
+ IAVF_PHINT_IPV4_TCP = 0x00000004,
+ IAVF_PHINT_IPV4_SCTP = 0x00000008,
+ IAVF_PHINT_IPV6 = 0x00000010,
+ IAVF_PHINT_IPV6_UDP = 0x00000020,
+ IAVF_PHINT_IPV6_TCP = 0x00000040,
+ IAVF_PHINT_IPV6_SCTP = 0x00000080,
+ IAVF_PHINT_C_VLAN = 0x00000100,
+ IAVF_PHINT_S_VLAN = 0x00000200,
+ IAVF_PHINT_IPV4_GTPU_IP = 0x00000400,
+ IAVF_PHINT_IPV4_GTPU_EH = 0x00000800,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK = 0x00001000,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK = 0x00002000,
+};
+
+#define IAVF_GTPU_EH_DWNLINK 0
+#define IAVF_GTPU_EH_UPLINK 1
+
+struct iavf_pattern_match_type {
+ uint64_t pattern_hint;
+};
+
+struct iavf_hash_match_type {
+ uint64_t hash_type;
+ struct virtchnl_proto_hdrs *proto_hdrs;
+ uint64_t pattern_hint;
+};
+
+struct iavf_rss_meta {
+ struct virtchnl_proto_hdrs *proto_hdrs;
+ enum virtchnl_rss_algorithm rss_algorithm;
+};
+
+struct iavf_hash_flow_cfg {
+ struct virtchnl_rss_cfg *rss_cfg;
+ bool simple_xor;
+};
+
+static int
+iavf_hash_init(struct iavf_adapter *ad);
+static int
+iavf_hash_create(struct iavf_adapter *ad, struct rte_flow *flow, void *meta,
+ struct rte_flow_error *error);
+static int
+iavf_hash_destroy(struct iavf_adapter *ad, struct rte_flow *flow,
+ struct rte_flow_error *error);
+static void
+iavf_hash_uninit(struct iavf_adapter *ad);
+static void
+iavf_hash_free(struct rte_flow *flow);
+static int
+iavf_hash_parse_pattern_action(struct iavf_adapter *ad,
+ struct iavf_pattern_match_item *array,
+ uint32_t array_len,
+ const struct rte_flow_item pattern[],
+ const struct rte_flow_action actions[],
+ void **meta,
+ struct rte_flow_error *error);
+
+static struct iavf_pattern_match_type phint_empty = {
+ IAVF_PHINT_NONE};
+static struct iavf_pattern_match_type phint_eth_ipv4 = {
+ IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_udp = {
+ IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_tcp = {
+ IAVF_PHINT_IPV4_TCP};
+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_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_esp = {
+ IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_udp_esp = {
+ IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_ah = {
+ IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_l2tpv3 = {
+ IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_pfcp = {
+ IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv4 = {
+ IAVF_PHINT_C_VLAN};
+static struct iavf_pattern_match_type phint_eth_ipv6 = {
+ IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_udp = {
+ IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_tcp = {
+ IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_sctp = {
+ IAVF_PHINT_IPV6_SCTP};
+static struct iavf_pattern_match_type phint_eth_ipv6_esp = {
+ IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_udp_esp = {
+ IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_ah = {
+ IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_l2tpv3 = {
+ IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_pfcp = {
+ IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv6 = {
+ IAVF_PHINT_C_VLAN};
+
+/**
+ * Supported pattern for hash.
+ * The first member is pattern item type,
+ * the second member is input set mask,
+ * the third member is pattern hint for hash.
+ */
+static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {
+ {iavf_pattern_eth_ipv4, IAVF_INSET_NONE, &phint_eth_ipv4},
+ {iavf_pattern_eth_ipv4_udp, IAVF_INSET_NONE, &phint_eth_ipv4_udp},
+ {iavf_pattern_eth_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_tcp},
+ {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_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_esp, IAVF_INSET_NONE, &phint_eth_ipv4_esp},
+ {iavf_pattern_eth_ipv4_udp_esp, IAVF_INSET_NONE,
+ &phint_eth_ipv4_udp_esp},
+ {iavf_pattern_eth_ipv4_ah, IAVF_INSET_NONE, &phint_eth_ipv4_ah},
+ {iavf_pattern_eth_ipv4_l2tpv3, IAVF_INSET_NONE,
+ &phint_eth_ipv4_l2tpv3},
+ {iavf_pattern_eth_ipv4_pfcp, IAVF_INSET_NONE, &phint_eth_ipv4_pfcp},
+ {iavf_pattern_eth_vlan_ipv4, IAVF_INSET_NONE, &phint_eth_vlan_ipv4},
+ {iavf_pattern_eth_ipv6, IAVF_INSET_NONE, &phint_eth_ipv6},
+ {iavf_pattern_eth_ipv6_udp, IAVF_INSET_NONE, &phint_eth_ipv6_udp},
+ {iavf_pattern_eth_ipv6_tcp, IAVF_INSET_NONE, &phint_eth_ipv6_tcp},
+ {iavf_pattern_eth_ipv6_sctp, IAVF_INSET_NONE, &phint_eth_ipv6_sctp},
+ {iavf_pattern_eth_ipv6_esp, IAVF_INSET_NONE, &phint_eth_ipv6_esp},
+ {iavf_pattern_eth_ipv6_udp_esp, IAVF_INSET_NONE,
+ &phint_eth_ipv6_udp_esp},
+ {iavf_pattern_eth_ipv6_ah, IAVF_INSET_NONE, &phint_eth_ipv6_ah},
+ {iavf_pattern_eth_ipv6_l2tpv3, IAVF_INSET_NONE,
+ &phint_eth_ipv6_l2tpv3},
+ {iavf_pattern_eth_ipv6_pfcp, IAVF_INSET_NONE, &phint_eth_ipv6_pfcp},
+ {iavf_pattern_eth_vlan_ipv6, IAVF_INSET_NONE, &phint_eth_vlan_ipv6},
+ {iavf_pattern_empty, IAVF_INSET_NONE, &phint_empty},
+};
+
+#define TUNNEL_LEVEL_OUTER 0
+#define TUNNEL_LEVEL_FIRST_INNER 1
+
+#define PROTO_COUNT_ONE 1
+#define PROTO_COUNT_TWO 2
+#define PROTO_COUNT_THREE 3
+
+#define BUFF_NOUSED 0
+#define FIELD_FOR_PROTO_ONLY 0
+
+#define FIELD_SELECTOR(proto_hdr_field) \
+ (1UL << ((proto_hdr_field) & PROTO_HDR_FIELD_MASK))
+
+#define proto_hint_eth_src { \
+ VIRTCHNL_PROTO_HDR_ETH, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_SRC), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_eth_dst { \
+ VIRTCHNL_PROTO_HDR_ETH, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_DST), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_eth_only { \
+ VIRTCHNL_PROTO_HDR_ETH, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_eth { \
+ VIRTCHNL_PROTO_HDR_ETH, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_SRC) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_DST), {BUFF_NOUSED } }
+
+#define proto_hint_svlan { \
+ VIRTCHNL_PROTO_HDR_S_VLAN, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_S_VLAN_ID), {BUFF_NOUSED } }
+
+#define proto_hint_cvlan { \
+ VIRTCHNL_PROTO_HDR_C_VLAN, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_C_VLAN_ID), {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_src { \
+ VIRTCHNL_PROTO_HDR_IPV4, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_dst { \
+ VIRTCHNL_PROTO_HDR_IPV4, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_only { \
+ VIRTCHNL_PROTO_HDR_IPV4, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_ipv4 { \
+ VIRTCHNL_PROTO_HDR_IPV4, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST), {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_src_prot { \
+ VIRTCHNL_PROTO_HDR_IPV4, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_dst_prot { \
+ VIRTCHNL_PROTO_HDR_IPV4, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_only_prot { \
+ VIRTCHNL_PROTO_HDR_IPV4, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_prot { \
+ VIRTCHNL_PROTO_HDR_IPV4, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), {BUFF_NOUSED } }
+
+#define proto_hint_udp_src_port { \
+ VIRTCHNL_PROTO_HDR_UDP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_SRC_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_udp_dst_port { \
+ VIRTCHNL_PROTO_HDR_UDP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_DST_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_udp_only { \
+ VIRTCHNL_PROTO_HDR_UDP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_udp { \
+ VIRTCHNL_PROTO_HDR_UDP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_SRC_PORT) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_DST_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_tcp_src_port { \
+ VIRTCHNL_PROTO_HDR_TCP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_SRC_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_tcp_dst_port { \
+ VIRTCHNL_PROTO_HDR_TCP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_DST_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_tcp_only { \
+ VIRTCHNL_PROTO_HDR_TCP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_tcp { \
+ VIRTCHNL_PROTO_HDR_TCP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_SRC_PORT) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_DST_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_sctp_src_port { \
+ VIRTCHNL_PROTO_HDR_SCTP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_sctp_dst_port { \
+ VIRTCHNL_PROTO_HDR_SCTP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_DST_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_sctp_only { \
+ VIRTCHNL_PROTO_HDR_SCTP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_sctp { \
+ VIRTCHNL_PROTO_HDR_SCTP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_DST_PORT), {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_src { \
+ VIRTCHNL_PROTO_HDR_IPV6, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_dst { \
+ VIRTCHNL_PROTO_HDR_IPV6, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_only { \
+ VIRTCHNL_PROTO_HDR_IPV6, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_ipv6 { \
+ VIRTCHNL_PROTO_HDR_IPV6, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_src_prot { \
+ VIRTCHNL_PROTO_HDR_IPV6, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_dst_prot { \
+ VIRTCHNL_PROTO_HDR_IPV6, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), \
+ {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_only_prot { \
+ VIRTCHNL_PROTO_HDR_IPV6, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_prot { \
+ VIRTCHNL_PROTO_HDR_IPV6, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST) | \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), {BUFF_NOUSED } }
+
+#define proto_hint_gtpu_ip_teid { \
+ VIRTCHNL_PROTO_HDR_GTPU_IP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_GTPU_IP_TEID), {BUFF_NOUSED } }
+
+#define proto_hint_gtpu_eh_only { \
+ VIRTCHNL_PROTO_HDR_GTPU_EH, \
+ FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_gtpu_ip_only { \
+ VIRTCHNL_PROTO_HDR_GTPU_IP, \
+ FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_gtpu_up_only { \
+ VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_UP, \
+ FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_gtpu_dwn_only { \
+ VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_DWN, \
+ FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_esp { \
+ VIRTCHNL_PROTO_HDR_ESP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ESP_SPI), {BUFF_NOUSED } }
+
+#define proto_hint_ah { \
+ VIRTCHNL_PROTO_HDR_AH, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_AH_SPI), {BUFF_NOUSED } }
+
+#define proto_hint_l2tpv3 { \
+ VIRTCHNL_PROTO_HDR_L2TPV3, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_L2TPV3_SESS_ID), {BUFF_NOUSED } }
+
+#define proto_hint_pfcp { \
+ VIRTCHNL_PROTO_HDR_PFCP, \
+ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED } }
+
+/* ETH */
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_svlan }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_cvlan = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_cvlan }
+};
+
+/* IPV4 */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4 = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
+ proto_hint_udp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
+ proto_hint_udp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
+ proto_hint_udp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
+ proto_hint_udp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only_prot,
+ proto_hint_udp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only_prot,
+ proto_hint_udp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot,
+ proto_hint_udp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
+ proto_hint_tcp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
+ proto_hint_tcp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
+ proto_hint_tcp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
+ proto_hint_tcp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only_prot,
+ proto_hint_tcp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only_prot,
+ proto_hint_tcp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot,
+ proto_hint_tcp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_sctp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src,
+ proto_hint_sctp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_sctp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src,
+ proto_hint_sctp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_sctp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst,
+ proto_hint_sctp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_sctp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst,
+ proto_hint_sctp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_sctp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+ proto_hint_sctp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_sctp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+ proto_hint_sctp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_sctp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4,
+ proto_hint_sctp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_esp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+ proto_hint_esp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_ah = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+ proto_hint_ah }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_l2tpv3 = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+ proto_hint_l2tpv3 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_pfcp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+ proto_hint_pfcp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_esp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_ipv4_only,
+ proto_hint_udp_only, proto_hint_esp }
+};
+
+/* 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 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_ip = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+ proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_ip = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+ proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_teid_gtpu_ip = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_teid}
+};
+
+/* 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,
+ proto_hint_ipv4_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+ proto_hint_ipv4, proto_hint_tcp}
+};
+
+/* 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,
+ proto_hint_ipv4_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+ proto_hint_ipv4, proto_hint_tcp}
+};
+
+/* 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,
+ proto_hint_ipv4_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv4, proto_hint_tcp}
+};
+
+/* IPV6 */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6 = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
+ proto_hint_udp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
+ proto_hint_udp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
+ proto_hint_udp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
+ proto_hint_udp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only_prot,
+ proto_hint_udp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only_prot,
+ proto_hint_udp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot,
+ proto_hint_udp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
+ proto_hint_tcp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
+ proto_hint_tcp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
+ proto_hint_tcp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
+ proto_hint_tcp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only_prot,
+ proto_hint_tcp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only_prot,
+ proto_hint_tcp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot,
+ proto_hint_tcp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_sctp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src,
+ proto_hint_sctp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_sctp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src,
+ proto_hint_sctp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_sctp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst,
+ proto_hint_sctp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_sctp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst,
+ proto_hint_sctp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp_src_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+ proto_hint_sctp_src_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp_dst_port = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+ proto_hint_sctp_dst_port }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6,
+ proto_hint_sctp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_esp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+ proto_hint_esp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_ah = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+ proto_hint_ah }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_l2tpv3 = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+ proto_hint_l2tpv3 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_pfcp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+ proto_hint_pfcp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_esp = {
+ TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_ipv6_only,
+ proto_hint_udp_only, proto_hint_esp }
+};
+
+struct iavf_hash_match_type iavf_hash_map_list[] = {
+ /* IPV4 */
+ {ETH_RSS_L2_SRC_ONLY,
+ &hdrs_hint_eth_src, IAVF_PHINT_IPV4},
+ {ETH_RSS_L2_DST_ONLY,
+ &hdrs_hint_eth_dst, IAVF_PHINT_IPV4},
+ {ETH_RSS_ETH,
+ &hdrs_hint_eth, IAVF_PHINT_IPV4},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv4, IAVF_PHINT_IPV4},
+ {ETH_RSS_ESP,
+ &hdrs_hint_ipv4_esp, IAVF_PHINT_IPV4},
+ {ETH_RSS_AH,
+ &hdrs_hint_ipv4_ah, IAVF_PHINT_IPV4},
+ {ETH_RSS_L2TPV3,
+ &hdrs_hint_ipv4_l2tpv3, IAVF_PHINT_IPV4},
+ /* IPV4 UDP */
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_udp_src_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst, 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_port, 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_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP |
+ ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,
+ 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_port, 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_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP |
+ ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,
+ IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_PFCP,
+ &hdrs_hint_ipv4_pfcp, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_ESP,
+ &hdrs_hint_ipv4_udp_esp, IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv4_udp, IAVF_PHINT_IPV4_UDP},
+ /* IPV4 TCP */
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst, 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_port, 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_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP |
+ ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,
+ 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_port, 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_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP |
+ ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,
+ IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv4_tcp, IAVF_PHINT_IPV4_TCP},
+ /* IPV4 SCTP */
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP |
+ ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP |
+ ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP |
+ ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,
+ IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP |
+ ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP |
+ ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP |
+ ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,
+ IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+ {ETH_RSS_NONFRAG_IPV4_SCTP,
+ &hdrs_hint_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},
+ /* IPV6 */
+ {ETH_RSS_L2_SRC_ONLY,
+ &hdrs_hint_eth_src, IAVF_PHINT_IPV6},
+ {ETH_RSS_L2_DST_ONLY,
+ &hdrs_hint_eth_dst, IAVF_PHINT_IPV6},
+ {ETH_RSS_ETH,
+ &hdrs_hint_eth, IAVF_PHINT_IPV6},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv6, IAVF_PHINT_IPV6},
+ {ETH_RSS_ESP,
+ &hdrs_hint_ipv6_esp, IAVF_PHINT_IPV6},
+ {ETH_RSS_AH,
+ &hdrs_hint_ipv6_ah, IAVF_PHINT_IPV6},
+ {ETH_RSS_L2TPV3,
+ &hdrs_hint_ipv6_l2tpv3, IAVF_PHINT_IPV6},
+ /* IPV6 UDP */
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_udp_src_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,
+ IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_udp_src_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,
+ IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_PFCP,
+ &hdrs_hint_ipv4_pfcp, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_ESP,
+ &hdrs_hint_ipv6_udp_esp, IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP,
+ &hdrs_hint_ipv4_udp, IAVF_PHINT_IPV6_UDP},
+ /* IPV6 TCP */
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,
+ IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,
+ IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP,
+ &hdrs_hint_ipv4_tcp, IAVF_PHINT_IPV6_TCP},
+ /* IPV6 SCTP */
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP |
+ ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP |
+ ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP |
+ ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,
+ IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP |
+ ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP |
+ ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP |
+ ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,
+ IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+ {ETH_RSS_NONFRAG_IPV6_SCTP,
+ &hdrs_hint_ipv4_sctp, IAVF_PHINT_IPV6_SCTP},
+ /* VLAN */
+ {ETH_RSS_S_VLAN,
+ &hdrs_hint_svlan, IAVF_PHINT_S_VLAN},
+ {ETH_RSS_C_VLAN,
+ &hdrs_hint_cvlan, IAVF_PHINT_C_VLAN},
+};
+
+struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
+ /* GTPU */
+ /* GTPU IP */
+ /* GTPU IPV4*/
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv4_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+ {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},
+ {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},
+ /* Inner 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},
+ /* Inner 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},
+ /* 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 |
+ 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 */
+ {ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_udp_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_udp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_udp_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_udp_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_udp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | 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_up,
+ IAVF_PHINT_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv4_udp_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ /* Inner IPV4->TCP */
+ {ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_tcp_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_tcp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_tcp_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | 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_up,
+ IAVF_PHINT_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv4_tcp_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ /* GTPU EH DWN */
+ /* Inner IPV4 */
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv4_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ /* Inner IPV4->UDP */
+ {ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_udp_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_udp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_udp_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_udp_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | 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_dwn,
+ IAVF_PHINT_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv4_udp_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ /* Inner IPV4->TCP */
+ {ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_tcp_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | 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_dwn,
+ IAVF_PHINT_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_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_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv4_udp_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+};
+
+struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
+ &hdrs_hint_ipv4,
+ &hdrs_hint_ipv4_udp,
+ &hdrs_hint_ipv4_tcp,
+ &hdrs_hint_ipv4_sctp,
+ &hdrs_hint_ipv6,
+ &hdrs_hint_ipv6_udp,
+ &hdrs_hint_ipv6_tcp,
+ &hdrs_hint_ipv6_sctp,
+};
+
+static struct iavf_flow_engine iavf_hash_engine = {
+ .init = iavf_hash_init,
+ .create = iavf_hash_create,
+ .destroy = iavf_hash_destroy,
+ .uninit = iavf_hash_uninit,
+ .free = iavf_hash_free,
+ .type = IAVF_FLOW_ENGINE_HASH,
+};
+
+/* Register parser for comms package. */
+static struct iavf_flow_parser iavf_hash_parser = {
+ .engine = &iavf_hash_engine,
+ .array = iavf_hash_pattern_list,
+ .array_len = RTE_DIM(iavf_hash_pattern_list),
+ .parse_pattern_action = iavf_hash_parse_pattern_action,
+ .stage = IAVF_FLOW_STAGE_RSS,
+};
+
+static int
+iavf_hash_default_set(struct iavf_adapter *ad, bool add)
+{
+ struct virtchnl_rss_cfg *rss_cfg;
+ uint16_t i;
+ int ret;
+
+ rss_cfg = rte_zmalloc("iavf rss rule",
+ sizeof(struct virtchnl_rss_cfg), 0);
+ if (!rss_cfg)
+ return -ENOMEM;
+
+ for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
+ rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
+ rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+
+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, add);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to %s RSS configure",
+ add ? "add" : "delete");
+ rte_free(rss_cfg);
+ return ret;
+ }
+ }
+
+ return ret;
+}
+
+RTE_INIT(iavf_hash_engine_init)
+{
+ struct iavf_flow_engine *engine = &iavf_hash_engine;
+
+ iavf_register_flow_engine(engine);
+}
+
+static int
+iavf_hash_init(struct iavf_adapter *ad)
+{
+ struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
+ struct iavf_flow_parser *parser;
+ int ret;
+
+ if (!vf->vf_res)
+ return -EINVAL;
+
+ if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF))
+ return -ENOTSUP;
+
+ parser = &iavf_hash_parser;
+
+ ret = iavf_register_parser(parser, ad);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to register hash parser");
+ return ret;
+ }
+
+ ret = iavf_hash_default_set(ad, true);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to set default RSS");
+ iavf_unregister_parser(parser, ad);
+ }
+
+ return ret;
+}
+
+static int
+iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item,
+ const struct rte_flow_item pattern[], uint64_t *phint,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_item *item = pattern;
+ const struct rte_flow_item_gtp_psc *psc;
+
+ for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
+ if (item->last) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM, item,
+ "Not support range");
+ return -rte_errno;
+ }
+
+ switch (item->type) {
+ case RTE_FLOW_ITEM_TYPE_GTPU:
+ *phint |= IAVF_PHINT_IPV4_GTPU_IP;
+ break;
+ case RTE_FLOW_ITEM_TYPE_GTP_PSC:
+ psc = item->spec;
+ *phint &= ~IAVF_PHINT_IPV4_GTPU_IP;
+ if (!psc)
+ *phint |= IAVF_PHINT_IPV4_GTPU_EH;
+ else if (psc->pdu_type == IAVF_GTPU_EH_UPLINK)
+ *phint |= IAVF_PHINT_IPV4_GTPU_EH_UPLINK;
+ else if (psc->pdu_type == IAVF_GTPU_EH_DWNLINK)
+ *phint |= IAVF_PHINT_IPV4_GTPU_EH_DWNLINK;
+ break;
+ default:
+ break;
+ }
+ }
+
+ /* update and restore pattern hint */
+ *phint |= ((struct iavf_pattern_match_type *)
+ (pattern_match_item->meta))->pattern_hint;
+
+ return 0;
+}
+
+static int
+iavf_hash_parse_action(const struct rte_flow_action actions[],
+ uint64_t pattern_hint, void **meta,
+ struct rte_flow_error *error)
+{
+ struct iavf_rss_meta *rss_meta = (struct iavf_rss_meta *)*meta;
+ struct iavf_hash_match_type *hash_map_list;
+ enum rte_flow_action_type action_type;
+ const struct rte_flow_action_rss *rss;
+ const struct rte_flow_action *action;
+ uint32_t mlist_len;
+ bool item_found = false;
+ uint64_t rss_type;
+ uint16_t i;
+
+ /* Supported action is RSS. */
+ for (action = actions; action->type !=
+ RTE_FLOW_ACTION_TYPE_END; action++) {
+ action_type = action->type;
+ switch (action_type) {
+ case RTE_FLOW_ACTION_TYPE_RSS:
+ rss = action->conf;
+ rss_type = rss->types;
+
+ if (rss->func ==
+ RTE_ETH_HASH_FUNCTION_SIMPLE_XOR){
+ rss_meta->rss_algorithm =
+ VIRTCHNL_RSS_ALG_XOR_ASYMMETRIC;
+ } else if (rss->func ==
+ RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
+ rss_meta->rss_algorithm =
+ VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;
+ } else {
+ rss_meta->rss_algorithm =
+ VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+ }
+
+ if (rss->level)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "a nonzero RSS encapsulation level is not supported");
+
+ if (rss->key_len)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "a nonzero RSS key_len is not supported");
+
+ if (rss->queue_num)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "a non-NULL RSS queue is not supported");
+
+ /**
+ * Check simultaneous use of SRC_ONLY and DST_ONLY
+ * of the same level.
+ */
+ rss_type = rte_eth_rss_hf_refine(rss_type);
+
+ 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)) {
+ hash_map_list = iavf_gtpu_hash_map_list;
+ mlist_len = RTE_DIM(iavf_gtpu_hash_map_list);
+ } else {
+ hash_map_list = iavf_hash_map_list;
+ mlist_len = RTE_DIM(iavf_hash_map_list);
+ }
+
+ /* Find matched proto hdrs according to hash type. */
+ for (i = 0; i < mlist_len; i++) {
+ struct iavf_hash_match_type *ht_map =
+ &hash_map_list[i];
+ if (rss_type == ht_map->hash_type &&
+ pattern_hint == ht_map->pattern_hint) {
+ rss_meta->proto_hdrs =
+ ht_map->proto_hdrs;
+ item_found = true;
+ break;
+ }
+ }
+
+ if (!item_found)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "Not supported flow");
+ break;
+
+ case RTE_FLOW_ACTION_TYPE_END:
+ break;
+
+ default:
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "Invalid action.");
+ return -rte_errno;
+ }
+ }
+
+ return 0;
+}
+
+static int
+iavf_hash_parse_pattern_action(__rte_unused struct iavf_adapter *ad,
+ struct iavf_pattern_match_item *array,
+ uint32_t array_len,
+ const struct rte_flow_item pattern[],
+ const struct rte_flow_action actions[],
+ void **meta,
+ struct rte_flow_error *error)
+{
+ struct iavf_pattern_match_item *pattern_match_item;
+ struct iavf_rss_meta *rss_meta_ptr;
+ uint64_t phint = IAVF_PHINT_NONE;
+ int ret = 0;
+
+ rss_meta_ptr = rte_zmalloc(NULL, sizeof(*rss_meta_ptr), 0);
+ if (!rss_meta_ptr) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "No memory for rss_meta_ptr");
+ return -ENOMEM;
+ }
+
+ /* Check rss supported pattern and find matched pattern. */
+ pattern_match_item =
+ iavf_search_pattern_match_item(pattern, array, array_len,
+ error);
+ if (!pattern_match_item) {
+ ret = -rte_errno;
+ goto error;
+ }
+
+ ret = iavf_hash_parse_pattern(pattern_match_item, pattern, &phint,
+ error);
+ if (ret)
+ goto error;
+
+ ret = iavf_hash_parse_action(actions, phint,
+ (void **)&rss_meta_ptr, error);
+
+error:
+ if (!ret && meta)
+ *meta = rss_meta_ptr;
+ else
+ rte_free(rss_meta_ptr);
+
+ rte_free(pattern_match_item);
+
+ return ret;
+}
+
+static int
+iavf_hash_create(__rte_unused struct iavf_adapter *ad,
+ __rte_unused struct rte_flow *flow, void *meta,
+ __rte_unused struct rte_flow_error *error)
+{
+ struct iavf_rss_meta *rss_meta = (struct iavf_rss_meta *)meta;
+ struct virtchnl_rss_cfg *rss_cfg;
+ int ret = 0;
+
+ rss_cfg = rte_zmalloc("iavf rss rule",
+ sizeof(struct virtchnl_rss_cfg), 0);
+ if (!rss_cfg) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "No memory for rss rule");
+ return -ENOMEM;
+ }
+
+ rss_cfg->proto_hdrs = *rss_meta->proto_hdrs;
+ rss_cfg->rss_algorithm = rss_meta->rss_algorithm;
+
+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
+ if (!ret) {
+ flow->rule = rss_cfg;
+ } else {
+ PMD_DRV_LOG(ERR, "fail to add RSS configure");
+ rte_flow_error_set(error, -ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to add rss rule.");
+ rte_free(rss_cfg);
+ return -rte_errno;
+ }
+
+ rte_free(meta);
+
+ return ret;
+}
+
+static int
+iavf_hash_destroy(__rte_unused struct iavf_adapter *ad,
+ struct rte_flow *flow,
+ __rte_unused struct rte_flow_error *error)
+{
+ struct virtchnl_rss_cfg *rss_cfg;
+ int ret = 0;
+
+ rss_cfg = (struct virtchnl_rss_cfg *)flow->rule;
+
+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, false);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to del RSS configure");
+ rte_flow_error_set(error, -ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to delete rss rule.");
+ return -rte_errno;
+ }
+ return ret;
+}
+
+static void
+iavf_hash_uninit(struct iavf_adapter *ad)
+{
+ if (iavf_hash_default_set(ad, false))
+ PMD_DRV_LOG(ERR, "fail to delete default RSS");
+
+ iavf_unregister_parser(&iavf_hash_parser, ad);
+}
+
+static void
+iavf_hash_free(struct rte_flow *flow)
+{
+ rte_free(flow->rule);
+}
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v4 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 2/2] net/iavf: " Junfeng Guo
@ 2020-06-18 5:43 ` Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
` (2 more replies)
2 siblings, 3 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-18 5:43 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
RSS for GTP with outer & inner ipv4 & ipv6 combination are supported
in this patchset, 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)
[PATCH v4 1/2] add RSS support for ipv4 ipv6 mix of GTP on PF.
[PATCH v4 2/2] add RSS support for ipv4 ipv6 mix of GTP on VF.
v4:
* Code rebase.
v3:
* Code rebase.
v2:
* Code rebase.
Junfeng Guo (2):
net/ice: add RSS support for ipv4 ipv6 mix of GTP
net/iavf: add RSS support for ipv4 ipv6 mix of GTP
drivers/net/iavf/iavf_generic_flow.c | 365 ++++++++
drivers/net/iavf/iavf_generic_flow.h | 47 +
drivers/net/iavf/iavf_hash.c | 1286 ++++++++++++++++++++++++--
drivers/net/ice/ice_generic_flow.c | 368 ++++++++
drivers/net/ice/ice_generic_flow.h | 47 +
drivers/net/ice/ice_hash.c | 100 ++
6 files changed, 2161 insertions(+), 52 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v4 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
@ 2020-06-18 5:43 ` Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 2/2] net/iavf: " Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-18 5:43 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/ice/ice_generic_flow.c | 368 +++++++++++++++++++++++++++++
drivers/net/ice/ice_generic_flow.h | 47 ++++
drivers/net/ice/ice_hash.c | 100 ++++++++
3 files changed, 515 insertions(+)
diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index 9f83a428d..3b588b4ee 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -1079,6 +1079,196 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+enum rte_flow_item_type 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 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 pattern_eth_ipv4_gtpu_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv4_gtpu_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_ETH,
@@ -1089,6 +1279,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_IPV4,
RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1099,6 +1290,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = {
RTE_FLOW_ITEM_TYPE_UDP,
RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1108,8 +1300,19 @@ enum rte_flow_item_type 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 pattern_eth_ipv4_gtpu_eh_ipv4_sctp[] = {
+ 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_IPV4,
+ RTE_FLOW_ITEM_TYPE_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1121,6 +1324,171 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+/*IPv4 GTPU EH IPv6 */
+enum rte_flow_item_type 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 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 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 pattern_eth_ipv4_gtpu_eh_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_eh_ipv4_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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 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 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 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 pattern_eth_ipv6_gtpu_eh_ipv6_sctp[] = {
+ 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_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type 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,
+};
+
/* PPPoE */
enum rte_flow_item_type pattern_eth_pppoed[] = {
RTE_FLOW_ITEM_TYPE_ETH,
diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
index 3ce9a1f27..2054d814e 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -371,13 +371,60 @@ extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh[];
/* IPv4 GTPU IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[];
+
+/* IPv4 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_icmp[];
+
+/* IPv6 GTPU IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_icmp[];
+
+/* IPv6 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_icmp[];
/* IPv4 GTPU EH IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_sctp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[];
+/* IPv4 GTPU EH IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_icmp[];
+
+/* IPv6 GTPU EH IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_icmp[];
+
+/* IPv6 GTPU EH IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_sctp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_icmp[];
+
/* PPPoE */
extern enum rte_flow_item_type pattern_eth_pppoed[];
extern enum rte_flow_item_type pattern_eth_vlan_pppoed[];
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 628d3e184..c976285dd 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -99,6 +99,39 @@ struct rss_type_match_hdr hint_eth_ipv4_sctp = {
struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = {
ICE_FLOW_SEG_HDR_GTPU_IP,
ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {
ICE_FLOW_SEG_HDR_GTPU_EH,
ETH_RSS_GTPU | ETH_RSS_IPV4};
@@ -108,6 +141,33 @@ struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = {
struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = {
ICE_FLOW_SEG_HDR_GTPU_EH,
ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
struct rss_type_match_hdr hint_eth_pppoes_ipv4 = {
ICE_FLOW_SEG_HDR_PPPOE,
ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4};
@@ -226,12 +286,52 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
&hint_eth_ipv4_sctp},
{pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_ipv4},
+ {pattern_eth_ipv4_gtpu_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv4_udp},
+ {pattern_eth_ipv4_gtpu_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv4_tcp},
+ {pattern_eth_ipv4_gtpu_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6},
+ {pattern_eth_ipv4_gtpu_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6_udp},
+ {pattern_eth_ipv4_gtpu_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6_tcp},
+ {pattern_eth_ipv6_gtpu_ipv4, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4},
+ {pattern_eth_ipv6_gtpu_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4_udp},
+ {pattern_eth_ipv6_gtpu_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4_tcp},
+ {pattern_eth_ipv6_gtpu_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6},
+ {pattern_eth_ipv6_gtpu_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6_udp},
+ {pattern_eth_ipv6_gtpu_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6_tcp},
{pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4},
{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4_udp},
{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4_tcp},
+ {pattern_eth_ipv4_gtpu_eh_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6_udp},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6_tcp},
+ {pattern_eth_ipv6_gtpu_eh_ipv4, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4_udp},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4_tcp},
+ {pattern_eth_ipv6_gtpu_eh_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6_udp},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6_tcp},
{pattern_eth_pppoes_ipv4, ICE_INSET_NONE,
&hint_eth_pppoes_ipv4},
{pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE,
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v4 2/2] net/iavf: add RSS support for ipv4 ipv6 mix of GTP
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
@ 2020-06-18 5:43 ` Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-06-18 5:43 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/iavf/iavf_generic_flow.c | 365 ++++++++
drivers/net/iavf/iavf_generic_flow.h | 47 +
drivers/net/iavf/iavf_hash.c | 1286 ++++++++++++++++++++++++--
3 files changed, 1646 insertions(+), 52 deletions(-)
diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c
index c6d48f081..286d046dd 100644
--- a/drivers/net/iavf/iavf_generic_flow.c
+++ b/drivers/net/iavf/iavf_generic_flow.c
@@ -361,6 +361,196 @@ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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 +582,17 @@ 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_sctp[] = {
+ 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_IPV4,
+ RTE_FLOW_ITEM_TYPE_SCTP,
+ RTE_FLOW_ITEM_TYPE_END,
};
enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
@@ -406,6 +606,171 @@ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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_sctp[] = {
+ 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_SCTP,
+ 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 8a6687542..9e640fb43 100644
--- a/drivers/net/iavf/iavf_generic_flow.h
+++ b/drivers/net/iavf/iavf_generic_flow.h
@@ -192,13 +192,60 @@ 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_sctp[];
+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_sctp[];
+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_sctp[];
+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_sctp[];
+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[];
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_sctp[];
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_sctp[];
+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_sctp[];
+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_sctp[];
+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 f8ff82d32..2749dfa6b 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -39,6 +39,10 @@ enum iavf_pattern_hint_type {
IAVF_PHINT_IPV4_GTPU_EH = 0x00000800,
IAVF_PHINT_IPV4_GTPU_EH_DWNLINK = 0x00001000,
IAVF_PHINT_IPV4_GTPU_EH_UPLINK = 0x00002000,
+ IAVF_PHINT_IPV6_GTPU_IP = 0x00004000,
+ IAVF_PHINT_IPV6_GTPU_EH = 0x00008000,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK = 0x00010000,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK = 0x00020000,
};
#define IAVF_GTPU_EH_DWNLINK 0
@@ -97,12 +101,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 = {
@@ -149,12 +193,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},
@@ -541,7 +625,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 }
@@ -561,7 +646,24 @@ 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 }
+};
+
+/* 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,
@@ -648,7 +750,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = {
proto_hint_ipv4, 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, 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, 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,
@@ -735,7 +924,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = {
proto_hint_ipv4, 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, 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, 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,
@@ -822,6 +1098,93 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = {
proto_hint_ipv4, proto_hint_tcp}
};
+/* IPv6 GTPU DWN */
+
+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_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_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_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_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_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_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_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_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_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_ipv6_gtpu_dwn = {
+ TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+ proto_hint_ipv6 }
+};
+
+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_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, 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, proto_hint_tcp}
+};
+
/* IPV6 */
struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = {
@@ -1277,7 +1640,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 IPv4*/
{ETH_RSS_L3_SRC_ONLY,
&hdrs_hint_ipv4_src_gtpu_ip,
IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
@@ -1298,8 +1661,53 @@ 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},
+ /* IPv4 GTPU IPv6*/
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_ip,
+ IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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 IPv4*/
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src_gtpu_ip,
+ IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_ip,
+ IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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 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},
/* GTPU EH */
- /* Inner IPV4 */
+ /* IPv4 GTPU EH IPv4 */
{ETH_RSS_L3_SRC_ONLY,
&hdrs_hint_ipv4_src_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
@@ -1317,7 +1725,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{ETH_RSS_IPV4,
&hdrs_hint_ipv4_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
- /* Inner IPV4->UDP */
+ /* IPv4 GTPU EH IPv6 */
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+ /* IPv6 GTPU EH IPv4 */
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1381,40 +1825,148 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{ETH_RSS_NONFRAG_IPV4_UDP,
&hdrs_hint_ipv4_udp_gtpu_eh,
IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
- /* Inner 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 |
+ /* IPv4 GTPU EH IPv6 UDP */
+ {ETH_RSS_NONFRAG_IPV6_UDP |
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 |
+ &hdrs_hint_ipv4_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_ipv4_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_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_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_ipv4_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_ipv4_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_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_udp_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv6_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_ipv6_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_ipv6_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_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv6_udp_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv6_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},
@@ -1445,8 +1997,116 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{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_ipv4_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_ipv4_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_ipv4_src_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_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_ipv4_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_ipv4_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_ipv4_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
+ IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_src_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv6_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_ipv6_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_ipv6_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_ipv6_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv6_tcp_dst_gtpu_eh,
+ IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv6_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 */
- /* Inner IPV4 */
+ /* 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},
@@ -1464,7 +2124,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{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_ipv4_src_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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_ipv6_src_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1528,7 +2224,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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_udp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_udp_dst_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv6_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,
@@ -1592,8 +2396,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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_tcp_dst_gtpu_up,
+ IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_tcp_dst_gtpu_up,
+ IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv6_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},
@@ -1611,7 +2523,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_ipv4_src_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+ {ETH_RSS_IPV6,
+ &hdrs_hint_ipv4_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_ipv6_src_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4 |
+ ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+ {ETH_RSS_IPV4,
+ &hdrs_hint_ipv6_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,
@@ -1675,7 +2623,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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_udp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+ {ETH_RSS_NONFRAG_IPV6_UDP,
+ &hdrs_hint_ipv4_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_udp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+ {ETH_RSS_NONFRAG_IPV4_UDP,
+ &hdrs_hint_ipv6_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,
@@ -1739,6 +2795,114 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
{ETH_RSS_NONFRAG_IPV4_TCP,
&hdrs_hint_ipv4_udp_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_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_ipv4_tcp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+ {ETH_RSS_NONFRAG_IPV6_TCP,
+ &hdrs_hint_ipv4_udp_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_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_ipv6_tcp_dst_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+ {ETH_RSS_NONFRAG_IPV4_TCP,
+ &hdrs_hint_ipv6_udp_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_udp_gtpu_dwn,
+ IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
};
struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
@@ -1842,6 +3006,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) {
@@ -1852,18 +3017,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;
@@ -1938,7 +3116,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 {
--
2.17.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 2/2] net/iavf: " Junfeng Guo
@ 2020-07-08 3:27 ` Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
` (2 more replies)
2 siblings, 3 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-07-08 3:27 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
RSS for GTP with outer & inner ipv4 & ipv6 combination are supported
in this patchset, 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)
[PATCH v5 1/2] add RSS support for ipv4 ipv6 mix of GTP on PF.
[PATCH v5 2/2] add RSS support for ipv4 ipv6 mix of GTP on VF.
v5:
* Code rebase.
v4:
* Code rebase.
v3:
* Code rebase.
v2:
* Code rebase.
Junfeng Guo (2):
net/ice: add RSS support for ipv4 ipv6 mix of GTP
net/iavf: add RSS support for ipv4 ipv6 mix of GTP
drivers/net/iavf/iavf_generic_flow.c | 283 +++-
drivers/net/iavf/iavf_generic_flow.h | 39 +
drivers/net/iavf/iavf_hash.c | 1976 ++++++++++++++++++++++++--
drivers/net/ice/ice_generic_flow.c | 286 +++-
drivers/net/ice/ice_generic_flow.h | 39 +
drivers/net/ice/ice_hash.c | 120 ++
6 files changed, 2586 insertions(+), 157 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v5 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
@ 2020-07-08 3:27 ` Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 2/2] net/iavf: " Junfeng Guo
2020-07-08 8:46 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Zhang, Qi Z
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-07-08 3:27 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/ice/ice_generic_flow.c | 286 ++++++++++++++++++++++++++++-
drivers/net/ice/ice_generic_flow.h | 39 ++++
drivers/net/ice/ice_hash.c | 120 ++++++++++++
3 files changed, 444 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index 9f83a428d..83f929838 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -1079,6 +1079,156 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+enum rte_flow_item_type 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_ETH,
@@ -1089,6 +1239,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = {
RTE_FLOW_ITEM_TYPE_IPV4,
RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1099,6 +1250,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = {
RTE_FLOW_ITEM_TYPE_UDP,
RTE_FLOW_ITEM_TYPE_END,
};
+
enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1108,8 +1260,8 @@ enum rte_flow_item_type 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 pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_ETH,
RTE_FLOW_ITEM_TYPE_IPV4,
@@ -1121,6 +1273,138 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+/*IPv4 GTPU EH IPv6 */
+enum rte_flow_item_type 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 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 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 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 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 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 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 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 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 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 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 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,
+};
+
/* PPPoE */
enum rte_flow_item_type pattern_eth_pppoed[] = {
RTE_FLOW_ITEM_TYPE_ETH,
diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
index 3ce9a1f27..434d2f425 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -371,6 +371,27 @@ extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh[];
/* IPv4 GTPU IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[];
+
+/* IPv4 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_icmp[];
+
+/* IPv6 GTPU IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_icmp[];
+
+/* IPv6 GTPU IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_icmp[];
/* IPv4 GTPU EH IPv4 */
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[];
@@ -378,6 +399,24 @@ extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];
extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[];
+/* IPv4 GTPU EH IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_icmp[];
+
+/* IPv6 GTPU EH IPv4 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_icmp[];
+
+/* IPv6 GTPU EH IPv6 */
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_udp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_tcp[];
+extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_icmp[];
+
/* PPPoE */
extern enum rte_flow_item_type pattern_eth_pppoed[];
extern enum rte_flow_item_type pattern_eth_vlan_pppoed[];
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 62317182b..90ae6371f 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -100,6 +100,50 @@ struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = {
ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
ICE_FLOW_SEG_HDR_IPV_OTHER,
ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER,
+ ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {
ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
ICE_FLOW_SEG_HDR_IPV_OTHER,
@@ -112,6 +156,42 @@ struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = {
ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER,
+ ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6 = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER,
+ ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_udp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_tcp = {
+ ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+ ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
struct rss_type_match_hdr hint_eth_pppoes_ipv4 = {
ICE_FLOW_SEG_HDR_PPPOE,
ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4};
@@ -260,12 +340,52 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
&hint_eth_ipv4_sctp},
{pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_ipv4},
+ {pattern_eth_ipv4_gtpu_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv4_udp},
+ {pattern_eth_ipv4_gtpu_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv4_tcp},
+ {pattern_eth_ipv4_gtpu_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6},
+ {pattern_eth_ipv4_gtpu_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6_udp},
+ {pattern_eth_ipv4_gtpu_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_ipv6_tcp},
+ {pattern_eth_ipv6_gtpu_ipv4, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4},
+ {pattern_eth_ipv6_gtpu_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4_udp},
+ {pattern_eth_ipv6_gtpu_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv4_tcp},
+ {pattern_eth_ipv6_gtpu_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6},
+ {pattern_eth_ipv6_gtpu_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6_udp},
+ {pattern_eth_ipv6_gtpu_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_ipv6_tcp},
{pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4},
{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4_udp},
{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
&hint_eth_ipv4_gtpu_eh_ipv4_tcp},
+ {pattern_eth_ipv4_gtpu_eh_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6_udp},
+ {pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv4_gtpu_eh_ipv6_tcp},
+ {pattern_eth_ipv6_gtpu_eh_ipv4, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4_udp},
+ {pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv4_tcp},
+ {pattern_eth_ipv6_gtpu_eh_ipv6, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6_udp},
+ {pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+ &hint_eth_ipv6_gtpu_eh_ipv6_tcp},
{pattern_eth_pppoes_ipv4, ICE_INSET_NONE,
&hint_eth_pppoes_ipv4},
{pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE,
--
2.25.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-dev] [PATCH v5 2/2] net/iavf: add RSS support for ipv4 ipv6 mix of GTP
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
@ 2020-07-08 3:27 ` Junfeng Guo
2020-07-08 8:46 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Zhang, Qi Z
2 siblings, 0 replies; 16+ messages in thread
From: Junfeng Guo @ 2020-07-08 3:27 UTC (permalink / raw)
To: qi.z.zhang, xiaolong.ye, beilei.xing; +Cc: dev, jia.guo, junfeng.guo, simei.su
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>
---
drivers/net/iavf/iavf_generic_flow.c | 283 +++-
drivers/net/iavf/iavf_generic_flow.h | 39 +
drivers/net/iavf/iavf_hash.c | 1976 ++++++++++++++++++++++++--
3 files changed, 2142 insertions(+), 156 deletions(-)
diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c
index c6d48f081..321a4dca9 100644
--- 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 8a6687542..f365cc322 100644
--- 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 1394519e7..967e6b64b 100644
--- 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 {
--
2.25.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 2/2] net/iavf: " Junfeng Guo
@ 2020-07-08 8:46 ` Zhang, Qi Z
2 siblings, 0 replies; 16+ messages in thread
From: Zhang, Qi Z @ 2020-07-08 8:46 UTC (permalink / raw)
To: Guo, Junfeng, Ye, Xiaolong, Xing, Beilei; +Cc: dev, Guo, Jia, Su, Simei
> -----Original Message-----
> From: Guo, Junfeng <junfeng.guo@intel.com>
> Sent: Wednesday, July 8, 2020 11:28 AM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Ye, Xiaolong
> <xiaolong.ye@intel.com>; Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Guo, Jia <jia.guo@intel.com>; Guo, Junfeng
> <junfeng.guo@intel.com>; Su, Simei <simei.su@intel.com>
> Subject: [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and
> VF
>
> RSS for GTP with outer & inner ipv4 & ipv6 combination are supported in
> this patchset, 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)
>
> [PATCH v5 1/2] add RSS support for ipv4 ipv6 mix of GTP on PF.
> [PATCH v5 2/2] add RSS support for ipv4 ipv6 mix of GTP on VF.
>
> v5:
> * Code rebase.
>
> v4:
> * Code rebase.
>
> v3:
> * Code rebase.
>
> v2:
> * Code rebase.
>
>
> Junfeng Guo (2):
> net/ice: add RSS support for ipv4 ipv6 mix of GTP
> net/iavf: add RSS support for ipv4 ipv6 mix of GTP
>
> drivers/net/iavf/iavf_generic_flow.c | 283 +++-
> drivers/net/iavf/iavf_generic_flow.h | 39 +
> drivers/net/iavf/iavf_hash.c | 1976
> ++++++++++++++++++++++++--
> drivers/net/ice/ice_generic_flow.c | 286 +++-
> drivers/net/ice/ice_generic_flow.h | 39 +
> drivers/net/ice/ice_hash.c | 120 ++
> 6 files changed, 2586 insertions(+), 157 deletions(-)
>
> --
> 2.25.1
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2020-07-08 8:46 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-12 8:10 [dpdk-dev] [PATCH 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
2020-06-12 8:10 ` [dpdk-dev] [PATCH 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-06-12 8:10 ` [dpdk-dev] [PATCH 2/2] net/iavf: " Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-06-17 7:36 ` [dpdk-dev] [PATCH v2 2/2] net/iavf: " Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-06-18 4:48 ` [dpdk-dev] [PATCH v3 2/2] net/iavf: " Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 0/2] add RSS support for ipv4 ipv6 mix of GTP on VF and PF Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-06-18 5:43 ` [dpdk-dev] [PATCH v4 2/2] net/iavf: " Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP Junfeng Guo
2020-07-08 3:27 ` [dpdk-dev] [PATCH v5 2/2] net/iavf: " Junfeng Guo
2020-07-08 8:46 ` [dpdk-dev] [PATCH v5 0/2] add RSS support for ipv4 ipv6 mix of GTP on PF and VF Zhang, Qi Z
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).