Skip to contentSkip to conversation

common/iavf: add GTPC support

PATCH Superseded [email protected] 3 participants 17 messages Sep 8, 2020 – Sep 15, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/3 common/iavf: add GTPC support

From: Alvin Zhang <[email protected]>

Add GTPC header and its field selector.

---
 drivers/common/iavf/virtchnl.h | 4 ++++
 1 file changed, 4 insertions(+)
drivers/common/iavf/virtchnl.h +4 -0
index 79515ee..0042cc0 100644
@@ -852,6 +852,7 @@ enum virtchnl_proto_hdr_type {
 	VIRTCHNL_PROTO_HDR_ESP,
 	VIRTCHNL_PROTO_HDR_AH,
 	VIRTCHNL_PROTO_HDR_PFCP,
+	VIRTCHNL_PROTO_HDR_GTPC,
 };
 
 /* Protocol header field within a protocol header. */
@@ -916,6 +917,9 @@ enum virtchnl_proto_hdr_field {
 	VIRTCHNL_PROTO_HDR_PFCP_S_FIELD =
 		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_PFCP),
 	VIRTCHNL_PROTO_HDR_PFCP_SEID,
+	/* GTPC */
+	VIRTCHNL_PROTO_HDR_GTPC_TEID =
+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPC),
 };
 
 struct virtchnl_proto_hdr {
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH v3 2/3 net/iavf: support outer IP hash for GTPC

From: Alvin Zhang <[email protected]>

Add patterns and headers for GTPC, now outer IP hash can be configured as input sets for GTPC packet.

---
 drivers/net/iavf/iavf_generic_flow.c | 18 ++++++++++++++++++
 drivers/net/iavf/iavf_generic_flow.h |  6 ++++++
 drivers/net/iavf/iavf_hash.c         | 15 +++++++++++++++
 3 files changed, 39 insertions(+)
drivers/net/iavf/iavf_generic_flow.c +18 -0
index 321a4dc..00e7f15 100644
@@ -315,6 +315,15 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv4 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[] = {
+	RTE_FLOW_ITEM_TYPE_ETH,
+	RTE_FLOW_ITEM_TYPE_IPV4,
+	RTE_FLOW_ITEM_TYPE_UDP,
+	RTE_FLOW_ITEM_TYPE_GTPC,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV4 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = {
 	RTE_FLOW_ITEM_TYPE_ETH,
@@ -333,6 +342,15 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv6 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[] = {
+	RTE_FLOW_ITEM_TYPE_ETH,
+	RTE_FLOW_ITEM_TYPE_IPV6,
+	RTE_FLOW_ITEM_TYPE_UDP,
+	RTE_FLOW_ITEM_TYPE_GTPC,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV6 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[] = {
 	RTE_FLOW_ITEM_TYPE_ETH,
drivers/net/iavf/iavf_generic_flow.h +6 -0
index f365cc3..dbc7294 100644
@@ -182,10 +182,16 @@
 extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];
 extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[];
+
 /* 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_eh[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[];
+
 /* IPv6 GTPU (EH) */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[];
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[];
drivers/net/iavf/iavf_hash.c +15 -0
index aab8b14..ddea3dd 100644
@@ -132,6 +132,9 @@ struct iavf_hash_flow_cfg {
 	VIRTCHNL_PROTO_HDR_PFCP, \
 	FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED} }
 
+#define proto_hdr_gtpc { \
+	VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER		0
 #define TUNNEL_LEVEL_INNER		1
 
@@ -256,6 +259,14 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	TUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_pfcp}
 };
 
+struct virtchnl_proto_hdrs ipv4_udp_gtpc_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpc}
+};
+
+struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}
+};
+
 /* rss type super set */
 
 /* IPv4 outer */
@@ -365,6 +376,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_ipv4_ah,			IAVF_RSS_TYPE_IPV4_AH,		&ipv4_ah_tmplt},
 	{iavf_pattern_eth_ipv4_l2tpv3,			IAVF_RSS_TYPE_IPV4_L2TPV3,	&ipv4_l2tpv3_tmplt},
 	{iavf_pattern_eth_ipv4_pfcp,			IAVF_RSS_TYPE_IPV4_PFCP,	&ipv4_pfcp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpc,			ETH_RSS_IPV4,			&ipv4_udp_gtpc_tmplt},
 	/* IPv6 */
 	{iavf_pattern_eth_ipv6,				IAVF_RSS_TYPE_OUTER_IPV6,	&outer_ipv6_tmplt},
 	{iavf_pattern_eth_ipv6_udp,			IAVF_RSS_TYPE_OUTER_IPV6_UDP,	&outer_ipv6_udp_tmplt},
@@ -391,6 +403,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_ipv6_ah,			IAVF_RSS_TYPE_IPV6_AH,		&ipv6_ah_tmplt},
 	{iavf_pattern_eth_ipv6_l2tpv3,			IAVF_RSS_TYPE_IPV6_L2TPV3,	&ipv6_l2tpv3_tmplt},
 	{iavf_pattern_eth_ipv6_pfcp,			IAVF_RSS_TYPE_IPV6_PFCP,	&ipv6_pfcp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpc,			ETH_RSS_IPV6,			&ipv6_udp_gtpc_tmplt},
 };
 
 struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
@@ -592,6 +605,8 @@ struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
 				else if (rss_type & ETH_RSS_L4_DST_ONLY)
 					VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
 						VIRTCHNL_PROTO_HDR_UDP_SRC_PORT);
+			} else {
+				hdr->field_selector = 0;
 			}
 			break;
 		case VIRTCHNL_PROTO_HDR_TCP:
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH v3 3/3 net/iavf: support outer IP hash for GTPU

In reply to [email protected]

From: Alvin Zhang <[email protected]>

Add headers for GTPU, now outer IP hash can be configured as input sets for GTPU packet.

---
 drivers/net/iavf/iavf_hash.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/net/iavf/iavf_hash.c +13 -0
index ddea3dd..8aeb3f83 100644
@@ -135,6 +135,9 @@ struct iavf_hash_flow_cfg {
 #define proto_hdr_gtpc { \
 	VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
 
+#define proto_hdr_gtpu { \
+	VIRTCHNL_PROTO_HDR_GTPU_IP, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER		0
 #define TUNNEL_LEVEL_INNER		1
 
@@ -267,6 +270,14 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
 	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}
 };
 
+struct virtchnl_proto_hdrs outer_ipv4_udp_gtpu_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpu}
+};
+
+struct virtchnl_proto_hdrs outer_ipv6_udp_gtpu_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpu}
+};
+
 /* rss type super set */
 
 /* IPv4 outer */
@@ -359,6 +370,7 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
 	{iavf_pattern_eth_vlan_ipv4_udp,		IAVF_RSS_TYPE_VLAN_IPV4_UDP,	&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_tcp,		IAVF_RSS_TYPE_VLAN_IPV4_TCP,	&outer_ipv4_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_sctp,		IAVF_RSS_TYPE_VLAN_IPV4_SCTP,	&outer_ipv4_sctp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpu,			ETH_RSS_IPV4,			&outer_ipv4_udp_gtpu_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4,		IAVF_RSS_TYPE_GTPU_IPV4,	&inner_ipv4_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,		IAVF_RSS_TYPE_GTPU_IPV4_UDP,	&inner_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,		IAVF_RSS_TYPE_GTPU_IPV4_TCP,	&inner_ipv4_tcp_tmplt},
@@ -386,6 +398,7 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
 	{iavf_pattern_eth_vlan_ipv6_udp,		IAVF_RSS_TYPE_VLAN_IPV6_UDP,	&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_tcp,		IAVF_RSS_TYPE_VLAN_IPV6_TCP,	&outer_ipv6_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_sctp,		IAVF_RSS_TYPE_VLAN_IPV6_SCTP,	&outer_ipv6_sctp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpu,			ETH_RSS_IPV6,			&outer_ipv6_udp_gtpu_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6,		IAVF_RSS_TYPE_GTPU_IPV6,	&inner_ipv6_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,		IAVF_RSS_TYPE_GTPU_IPV6_UDP,	&inner_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,		IAVF_RSS_TYPE_GTPU_IPV6_TCP,	&inner_ipv6_tcp_tmplt},
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH v4 1/1 net/iavf: support outer IP hash for GTPU

From: Alvin Zhang <[email protected]>

Add headers for GTPU, now outer IP hash can be configured as input sets for GTPU packet.

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.

 drivers/net/iavf/iavf_hash.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/net/iavf/iavf_hash.c +13 -0
index aab8b14..3ec32d9 100644
@@ -132,6 +132,9 @@ struct iavf_hash_flow_cfg {
 	VIRTCHNL_PROTO_HDR_PFCP, \
 	FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED} }
 
+#define proto_hdr_gtpu { \
+	VIRTCHNL_PROTO_HDR_GTPU_IP, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER		0
 #define TUNNEL_LEVEL_INNER		1
 
@@ -256,6 +259,14 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	TUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_pfcp}
 };
 
+struct virtchnl_proto_hdrs outer_ipv4_udp_gtpu_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpu}
+};
+
+struct virtchnl_proto_hdrs outer_ipv6_udp_gtpu_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpu}
+};
+
 /* rss type super set */
 
 /* IPv4 outer */
@@ -348,6 +359,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_vlan_ipv4_udp,		IAVF_RSS_TYPE_VLAN_IPV4_UDP,	&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_tcp,		IAVF_RSS_TYPE_VLAN_IPV4_TCP,	&outer_ipv4_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_sctp,		IAVF_RSS_TYPE_VLAN_IPV4_SCTP,	&outer_ipv4_sctp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpu,			ETH_RSS_IPV4,			&outer_ipv4_udp_gtpu_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4,		IAVF_RSS_TYPE_GTPU_IPV4,	&inner_ipv4_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,		IAVF_RSS_TYPE_GTPU_IPV4_UDP,	&inner_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,		IAVF_RSS_TYPE_GTPU_IPV4_TCP,	&inner_ipv4_tcp_tmplt},
@@ -374,6 +386,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_vlan_ipv6_udp,		IAVF_RSS_TYPE_VLAN_IPV6_UDP,	&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_tcp,		IAVF_RSS_TYPE_VLAN_IPV6_TCP,	&outer_ipv6_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_sctp,		IAVF_RSS_TYPE_VLAN_IPV6_SCTP,	&outer_ipv6_sctp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpu,			ETH_RSS_IPV6,			&outer_ipv6_udp_gtpu_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6,		IAVF_RSS_TYPE_GTPU_IPV6,	&inner_ipv6_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,		IAVF_RSS_TYPE_GTPU_IPV6_UDP,	&inner_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,		IAVF_RSS_TYPE_GTPU_IPV6_TCP,	&inner_ipv6_tcp_tmplt},
Signature · 1 line
1.8.3.1
#4 lore raw

Re: [dpdk-dev] [PATCH v4] net/iavf: support outer IP hash for GTPU

Quoted 8 lines

-----Original Message-----
From: Zhang, AlvinX <[email protected]>
Sent: Thursday, September 10, 2020 11:26 AM
To: Guo, Jia <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, AlvinX <[email protected]>
Subject: [PATCH v4] net/iavf: support outer IP hash for GTPU

Quoted 5 lines

From: Alvin Zhang <[email protected]>

Add headers for GTPU, now outer IP hash can be configured as input sets for GTPU packet.

I think this patch will not cover outer IP hash for any GTPU case, only none-inner GTPU case, right?

Quoted 15 lines

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.

 drivers/net/iavf/iavf_hash.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/net/iavf/iavf_hash.c index renamed from drivers/net/iavf/iavf_hash.c +0 -0

aab8b14..3ec32d9 100644

drivers/net/iavf/iavf_hash.c struct iavf_hash_flow_cfg { · line 138

Quoted 7 lines
drivers/net/iavf/iavf_hash.c +3 -0
@@ -132,6 +132,9 @@ struct iavf_hash_flow_cfg {
 	VIRTCHNL_PROTO_HDR_PFCP, \
 	FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID),
 {BUFF_NOUSED} }
 
+#define proto_hdr_gtpu { \
+	VIRTCHNL_PROTO_HDR_GTPU_IP, 0, {BUFF_NOUSED} }
+

I still not funs of set field to zero here since it should be general use for other case, it could specific refine to 0 when parsing pattern if need.

Quoted 27 lines
drivers/net/iavf/iavf_hash.c +8 -0
 #define TUNNEL_LEVEL_OUTER		0
 #define TUNNEL_LEVEL_INNER		1
@@ -256,6 +259,14 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	TUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_pfcp}  };
 
+struct virtchnl_proto_hdrs outer_ipv4_udp_gtpu_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp,
 proto_hdr_gtpu}
+};
+
+struct virtchnl_proto_hdrs outer_ipv6_udp_gtpu_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp,
 proto_hdr_gtpu}
+};
+
 /* rss type super set */
 

/* IPv4 outer */

drivers/net/iavf/iavf_hash.c +1 -0
@@ -348,6 +359,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_vlan_ipv4_udp,
 	IAVF_RSS_TYPE_VLAN_IPV4_UDP,	&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_tcp,
 	IAVF_RSS_TYPE_VLAN_IPV4_TCP,	&outer_ipv4_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_sctp,
 	IAVF_RSS_TYPE_VLAN_IPV4_SCTP,	&outer_ipv4_sctp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpu,			ETH_RSS_IPV4,
Quoted 1 line
		&outer_ipv4_udp_gtpu_tmplt},

There is also a question the same as the other mail loop of GTPC, should it be supper set here?

Quoted 23 lines

{iavf_pattern_eth_ipv4_gtpu_ipv4,

	IAVF_RSS_TYPE_GTPU_IPV4,	&inner_ipv4_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,
	IAVF_RSS_TYPE_GTPU_IPV4_UDP,	&inner_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,
	IAVF_RSS_TYPE_GTPU_IPV4_TCP,	&inner_ipv4_tcp_tmplt},
drivers/net/iavf/iavf_hash.c +1 -0
@@ -374,6 +386,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_vlan_ipv6_udp,
 	IAVF_RSS_TYPE_VLAN_IPV6_UDP,	&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_tcp,
 	IAVF_RSS_TYPE_VLAN_IPV6_TCP,	&outer_ipv6_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_sctp,
 	IAVF_RSS_TYPE_VLAN_IPV6_SCTP,	&outer_ipv6_sctp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpu,			ETH_RSS_IPV6,
		&outer_ipv6_udp_gtpu_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6,
	IAVF_RSS_TYPE_GTPU_IPV6,	&inner_ipv6_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,
	IAVF_RSS_TYPE_GTPU_IPV6_UDP,	&inner_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,
	IAVF_RSS_TYPE_GTPU_IPV6_TCP,	&inner_ipv6_tcp_tmplt},

--
1.8.3.1

#5 lore raw

Re: [dpdk-dev] [PATCH v4] net/iavf: support outer IP hash for GTPU

Thanks Guojia,

Quoted 45 lines

-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Thursday, September 10, 2020 1:25 PM
To: Zhang, AlvinX <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH v4] net/iavf: support outer IP hash for GTPU

Quoted 7 lines

-----Original Message-----
From: Zhang, AlvinX <[email protected]>
Sent: Thursday, September 10, 2020 11:26 AM
To: Guo, Jia <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, AlvinX <[email protected]>
Subject: [PATCH v4] net/iavf: support outer IP hash for GTPU

Quoted 5 lines

From: Alvin Zhang <[email protected]>

Add headers for GTPU, now outer IP hash can be configured as input sets for GTPU packet.

I think this patch will not cover outer IP hash for any GTPU case, only none-inner GTPU case, right?

Quoted 20 lines

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.

 drivers/net/iavf/iavf_hash.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
(quoted diff) +0 -0

b/drivers/net/iavf/iavf_hash.c index
aab8b14..3ec32d9 100644

drivers/net/iavf/iavf_hash.c +0 -0
@@ -132,6 +132,9 @@ struct iavf_hash_flow_cfg {
 VIRTCHNL_PROTO_HDR_PFCP, \
 FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID),
 {BUFF_NOUSED} }
 
Quoted 6 lines

drivers/net/iavf/iavf_hash.c struct iavf_hash_flow_cfg { · line 137

Quoted 3 lines
drivers/net/iavf/iavf_hash.c +3 -0
+#define proto_hdr_gtpu { \
+VIRTCHNL_PROTO_HDR_GTPU_IP, 0, {BUFF_NOUSED} }
+

I still not funs of set field to zero here since it should be general use for other case, it could specific refine to 0 when parsing pattern if need.

In V1 patch I have put TEID field as input set, but the kernel driver did not supported this field and returned success. That's mean the rule has been created succeed, but it did not work.

Quoted 19 lines
Quoted 19 lines
drivers/net/iavf/iavf_hash.c +8 -0
 #define TUNNEL_LEVEL_OUTER0
 #define TUNNEL_LEVEL_INNER1
@@ -256,6 +259,14 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 TUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_pfcp}  };
 
+struct virtchnl_proto_hdrs outer_ipv4_udp_gtpu_tmplt = {
+TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp,
 proto_hdr_gtpu}
+};
+
+struct virtchnl_proto_hdrs outer_ipv6_udp_gtpu_tmplt = {
+TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp,
 proto_hdr_gtpu}
+};
+
 /* rss type super set */
 
Quoted 13 lines
Quoted 10 lines

/* IPv4 outer */

drivers/net/iavf/iavf_hash.c +1 -0
@@ -348,6 +359,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 {iavf_pattern_eth_vlan_ipv4_udp,
 IAVF_RSS_TYPE_VLAN_IPV4_UDP,&outer_ipv4_udp_tmplt},
 {iavf_pattern_eth_vlan_ipv4_tcp,
 IAVF_RSS_TYPE_VLAN_IPV4_TCP,&outer_ipv4_tcp_tmplt},
 {iavf_pattern_eth_vlan_ipv4_sctp,
 IAVF_RSS_TYPE_VLAN_IPV4_SCTP,&outer_ipv4_sctp_tmplt},
+{iavf_pattern_eth_ipv4_gtpu,ETH_RSS_IPV4,

&outer_ipv4_udp_gtpu_tmplt},

There is also a question the same as the other mail loop of GTPC, should it be supper set here?

As above, if user really set ETH_RSS_GTPU as input set, the rule will be created succeed, but it don't work.

Quoted 25 lines
Quoted 24 lines

{iavf_pattern_eth_ipv4_gtpu_ipv4,
IAVF_RSS_TYPE_GTPU_IPV4,&inner_ipv4_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,
IAVF_RSS_TYPE_GTPU_IPV4_UDP,&inner_ipv4_udp_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,
IAVF_RSS_TYPE_GTPU_IPV4_TCP,&inner_ipv4_tcp_tmplt},

drivers/net/iavf/iavf_hash.c +1 -0
@@ -374,6 +386,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 {iavf_pattern_eth_vlan_ipv6_udp,
 IAVF_RSS_TYPE_VLAN_IPV6_UDP,&outer_ipv6_udp_tmplt},
 {iavf_pattern_eth_vlan_ipv6_tcp,
 IAVF_RSS_TYPE_VLAN_IPV6_TCP,&outer_ipv6_tcp_tmplt},
 {iavf_pattern_eth_vlan_ipv6_sctp,
 IAVF_RSS_TYPE_VLAN_IPV6_SCTP,&outer_ipv6_sctp_tmplt},
+{iavf_pattern_eth_ipv6_gtpu,ETH_RSS_IPV6,

&outer_ipv6_udp_gtpu_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6,
IAVF_RSS_TYPE_GTPU_IPV6,&inner_ipv6_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,
IAVF_RSS_TYPE_GTPU_IPV6_UDP,&inner_ipv6_udp_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,
IAVF_RSS_TYPE_GTPU_IPV6_TCP,&inner_ipv6_tcp_tmplt}, --
1.8.3.1

#6 lore raw

PATCH v5 1/1 net/iavf: support outer IP hash for no inner GTPU

In reply to [email protected]

From: Alvin Zhang <[email protected]>

Outer IP hash can be configured as input sets for no inner GTPU packets.

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.
V5: Modify codes according to comments.

 drivers/net/iavf/iavf_hash.c | 48 ++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 20 deletions(-)
drivers/net/iavf/iavf_hash.c +28 -20
index ff77d71..d0a6396 100644
@@ -348,6 +348,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_vlan_ipv4_udp,		IAVF_RSS_TYPE_VLAN_IPV4_UDP,	&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_tcp,		IAVF_RSS_TYPE_VLAN_IPV4_TCP,	&outer_ipv4_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_sctp,		IAVF_RSS_TYPE_VLAN_IPV4_SCTP,	&outer_ipv4_sctp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpu,			ETH_RSS_IPV4,			&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4,		IAVF_RSS_TYPE_GTPU_IPV4,	&inner_ipv4_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,		IAVF_RSS_TYPE_GTPU_IPV4_UDP,	&inner_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,		IAVF_RSS_TYPE_GTPU_IPV4_TCP,	&inner_ipv4_tcp_tmplt},
@@ -374,6 +375,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_vlan_ipv6_udp,		IAVF_RSS_TYPE_VLAN_IPV6_UDP,	&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_tcp,		IAVF_RSS_TYPE_VLAN_IPV6_TCP,	&outer_ipv6_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_sctp,		IAVF_RSS_TYPE_VLAN_IPV6_SCTP,	&outer_ipv6_sctp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpu,			ETH_RSS_IPV6,			&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6,		IAVF_RSS_TYPE_GTPU_IPV6,	&inner_ipv6_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,		IAVF_RSS_TYPE_GTPU_IPV6_UDP,	&inner_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,		IAVF_RSS_TYPE_GTPU_IPV6_TCP,	&inner_ipv6_tcp_tmplt},
@@ -698,31 +700,37 @@ struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
 	struct virtchnl_proto_hdr *hdr2;
 	int i;
 
-	if (!(phint & IAVF_PHINT_GTPU_MSK) ||
-	    proto_hdrs->tunnel_level == 0)
+	if (!(phint & IAVF_PHINT_GTPU_MSK))
 		return;
 
-	/* shift headers 1 layer */
-	for (i = proto_hdrs->count; i > 0; i--) {
-		hdr1 = &proto_hdrs->proto_hdr[i];
-		hdr2 = &proto_hdrs->proto_hdr[i - 1];
+	if (proto_hdrs->tunnel_level == TUNNEL_LEVEL_INNER) {
+		/* shift headers 1 layer */
+		for (i = proto_hdrs->count; i > 0; i--) {
+			hdr1 = &proto_hdrs->proto_hdr[i];
+			hdr2 = &proto_hdrs->proto_hdr[i - 1];
 
-		*hdr1 = *hdr2;
-	}
+			*hdr1 = *hdr2;
+		}
 
-	/* adding gtpu header at layer 0 */
-	proto_hdrs->count++;
-	hdr1 = &proto_hdrs->proto_hdr[0];
-	hdr1->field_selector = 0;
-
-	if (phint & IAVF_PHINT_GTPU_EH_DWN)
-		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN);
-	else if (phint & IAVF_PHINT_GTPU_EH_UP)
-		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_UP);
-	else if (phint & IAVF_PHINT_GTPU_EH)
-		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH);
-	else if (phint & IAVF_PHINT_GTPU)
+		/* adding gtpu header at layer 0 */
+		proto_hdrs->count++;
+		hdr1 = &proto_hdrs->proto_hdr[0];
+		hdr1->field_selector = 0;
+
+		if (phint & IAVF_PHINT_GTPU_EH_DWN)
+			VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN);
+		else if (phint & IAVF_PHINT_GTPU_EH_UP)
+			VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_UP);
+		else if (phint & IAVF_PHINT_GTPU_EH)
+			VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH);
+		else if (phint & IAVF_PHINT_GTPU)
+			VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);
+	} else {
+		hdr1 = &proto_hdrs->proto_hdr[proto_hdrs->count];
+		hdr1->field_selector = 0;
+		proto_hdrs->count++;
 		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);
+	}
 }
 
 static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs,
Signature · 1 line
1.8.3.1
#7 lore raw

Re: [dpdk-dev] [PATCH v5] net/iavf: support outer IP hash for no inner GTPU

Quoted 103 lines

-----Original Message-----
From: Zhang, AlvinX <[email protected]>
Sent: Monday, September 14, 2020 5:03 PM
To: Guo, Jia <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, AlvinX <[email protected]>
Subject: [PATCH v5] net/iavf: support outer IP hash for no inner GTPU

From: Alvin Zhang <[email protected]>

Outer IP hash can be configured as input sets for no inner GTPU packets.

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.
V5: Modify codes according to comments.

 drivers/net/iavf/iavf_hash.c | 48 ++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 20 deletions(-)
drivers/net/iavf/iavf_hash.c index renamed from drivers/net/iavf/iavf_hash.c +0 -0

ff77d71..d0a6396 100644

drivers/net/iavf/iavf_hash.c +1 -0
@@ -348,6 +348,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_vlan_ipv4_udp,		IAVF_RSS_TYPE_VLAN_IPV4_UDP,
 	&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_tcp,		IAVF_RSS_TYPE_VLAN_IPV4_TCP,
 	&outer_ipv4_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_sctp,		IAVF_RSS_TYPE_VLAN_IPV4_SCTP,
 	&outer_ipv4_sctp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpu,			ETH_RSS_IPV4,
	&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4,		IAVF_RSS_TYPE_GTPU_IPV4,
	&inner_ipv4_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,
	IAVF_RSS_TYPE_GTPU_IPV4_UDP,	&inner_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,
	IAVF_RSS_TYPE_GTPU_IPV4_TCP,	&inner_ipv4_tcp_tmplt},
drivers/net/iavf/iavf_hash.c +1 -0
@@ -374,6 +375,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_vlan_ipv6_udp,		IAVF_RSS_TYPE_VLAN_IPV6_UDP,
 	&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_tcp,		IAVF_RSS_TYPE_VLAN_IPV6_TCP,
 	&outer_ipv6_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_sctp,		IAVF_RSS_TYPE_VLAN_IPV6_SCTP,
 	&outer_ipv6_sctp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpu,			ETH_RSS_IPV6,
	&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6,		IAVF_RSS_TYPE_GTPU_IPV6,
	&inner_ipv6_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,
	IAVF_RSS_TYPE_GTPU_IPV6_UDP,	&inner_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,
	IAVF_RSS_TYPE_GTPU_IPV6_TCP,	&inner_ipv6_tcp_tmplt},
drivers/net/iavf/iavf_hash.c +16 -20
@@ -698,31 +700,37 @@ struct virtchnl_proto_hdrs
 *iavf_hash_default_hdrs[] = {
 	struct virtchnl_proto_hdr *hdr2;
 	int i;
 
-	if (!(phint & IAVF_PHINT_GTPU_MSK) ||
-	    proto_hdrs->tunnel_level == 0)
+	if (!(phint & IAVF_PHINT_GTPU_MSK))
 		return;
 
-	/* shift headers 1 layer */
-	for (i = proto_hdrs->count; i > 0; i--) {
-		hdr1 = &proto_hdrs->proto_hdr[i];
-		hdr2 = &proto_hdrs->proto_hdr[i - 1];
+	if (proto_hdrs->tunnel_level == TUNNEL_LEVEL_INNER) {
+		/* shift headers 1 layer */
+		for (i = proto_hdrs->count; i > 0; i--) {
+			hdr1 = &proto_hdrs->proto_hdr[i];
+			hdr2 = &proto_hdrs->proto_hdr[i - 1];
 
-		*hdr1 = *hdr2;
-	}
+			*hdr1 = *hdr2;
+		}
 
-	/* adding gtpu header at layer 0 */
-	proto_hdrs->count++;
-	hdr1 = &proto_hdrs->proto_hdr[0];
-	hdr1->field_selector = 0;
-
-	if (phint & IAVF_PHINT_GTPU_EH_DWN)
-		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN);
-	else if (phint & IAVF_PHINT_GTPU_EH_UP)
-		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_UP);
-	else if (phint & IAVF_PHINT_GTPU_EH)
-		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH);
-	else if (phint & IAVF_PHINT_GTPU)
+		/* adding gtpu header at layer 0 */
+		proto_hdrs->count++;
+		hdr1 = &proto_hdrs->proto_hdr[0];
+		hdr1->field_selector = 0;
+
+		if (phint & IAVF_PHINT_GTPU_EH_DWN)
+			VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN);
+		else if (phint & IAVF_PHINT_GTPU_EH_UP)

drivers/net/iavf/iavf_hash.c struct virtchnl_proto_hdrs · line 733

Quoted 10 lines
drivers/net/iavf/iavf_hash.c +9 -0
+			VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_UP);
+		else if (phint & IAVF_PHINT_GTPU_EH)
+			VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH);
+		else if (phint & IAVF_PHINT_GTPU)
+			VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);
+	} else {
+		hdr1 = &proto_hdrs->proto_hdr[proto_hdrs->count];
+		hdr1->field_selector = 0;
+		proto_hdrs->count++;
 		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);

Its better to also check phint for outer case, could be implemented as below

If (inner) {
	Shift 
	Hdr = hdrs[0]
}

else {
Hdr = hdrs[count]
}

hdr-count++

if (phint & IAVF_PHINT_GTPU_EH_DWN)

	VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN);
else if (phint & IAVF_PHINT_GTPU_EH_UP)
	VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_UP);
else if (phint & IAVF_PHINT_GTPU_EH)			
	VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH);
else if (phint & IAVF_PHINT_GTPU)
	VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);
Quoted 6 lines
drivers/net/iavf/iavf_hash.c +1 -0
+	}
 }
 

static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs,
--
1.8.3.1

#8 lore raw

Re: [dpdk-dev] [PATCH v5] net/iavf: support outer IP hash for no inner GTPU

Thanks Zhangqi.

Quoted 149 lines

-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Monday, September 14, 2020 6:33 PM
To: Zhang, AlvinX <[email protected]>; Guo, Jia <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH v5] net/iavf: support outer IP hash for no inner GTPU

Quoted 79 lines

-----Original Message-----
From: Zhang, AlvinX <[email protected]>
Sent: Monday, September 14, 2020 5:03 PM
To: Guo, Jia <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, AlvinX <[email protected]>
Subject: [PATCH v5] net/iavf: support outer IP hash for no inner GTPU

From: Alvin Zhang <[email protected]>

Outer IP hash can be configured as input sets for no inner GTPU packets.

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.
V5: Modify codes according to comments.

 drivers/net/iavf/iavf_hash.c | 48
++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 20 deletions(-)
(quoted diff) +0 -0

b/drivers/net/iavf/iavf_hash.c index
ff77d71..d0a6396 100644

drivers/net/iavf/iavf_hash.c +1 -0
@@ -348,6 +348,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 {iavf_pattern_eth_vlan_ipv4_udp,IAVF_RSS_TYPE_VLAN_IPV4_UDP,
 &outer_ipv4_udp_tmplt},
 {iavf_pattern_eth_vlan_ipv4_tcp,IAVF_RSS_TYPE_VLAN_IPV4_TCP,
 &outer_ipv4_tcp_tmplt},
 {iavf_pattern_eth_vlan_ipv4_sctp,IAVF_RSS_TYPE_VLAN_IPV4_SCTP,
 &outer_ipv4_sctp_tmplt},
+{iavf_pattern_eth_ipv4_gtpu,ETH_RSS_IPV4,

&outer_ipv4_udp_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv4,IAVF_RSS_TYPE_GTPU_IPV4,
&inner_ipv4_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,
IAVF_RSS_TYPE_GTPU_IPV4_UDP,&inner_ipv4_udp_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,
IAVF_RSS_TYPE_GTPU_IPV4_TCP,&inner_ipv4_tcp_tmplt},

drivers/net/iavf/iavf_hash.c +1 -0
@@ -374,6 +375,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 {iavf_pattern_eth_vlan_ipv6_udp,IAVF_RSS_TYPE_VLAN_IPV6_UDP,
 &outer_ipv6_udp_tmplt},
 {iavf_pattern_eth_vlan_ipv6_tcp,IAVF_RSS_TYPE_VLAN_IPV6_TCP,
 &outer_ipv6_tcp_tmplt},
 {iavf_pattern_eth_vlan_ipv6_sctp,IAVF_RSS_TYPE_VLAN_IPV6_SCTP,
 &outer_ipv6_sctp_tmplt},
+{iavf_pattern_eth_ipv6_gtpu,ETH_RSS_IPV6,

&outer_ipv6_udp_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6,IAVF_RSS_TYPE_GTPU_IPV6,
&inner_ipv6_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,
IAVF_RSS_TYPE_GTPU_IPV6_UDP,&inner_ipv6_udp_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,
IAVF_RSS_TYPE_GTPU_IPV6_TCP,&inner_ipv6_tcp_tmplt},

drivers/net/iavf/iavf_hash.c +6 -8
@@ -698,31 +700,37 @@ struct virtchnl_proto_hdrs
 *iavf_hash_default_hdrs[] = {  struct virtchnl_proto_hdr *hdr2;  int
 i;
 
-if (!(phint & IAVF_PHINT_GTPU_MSK) ||
-    proto_hdrs->tunnel_level == 0)
+if (!(phint & IAVF_PHINT_GTPU_MSK))
 return;
 
-/* shift headers 1 layer */
-for (i = proto_hdrs->count; i > 0; i--) {
-hdr1 = &proto_hdrs->proto_hdr[i];
-hdr2 = &proto_hdrs->proto_hdr[i - 1];
+if (proto_hdrs->tunnel_level == TUNNEL_LEVEL_INNER) {
+/* shift headers 1 layer */
+for (i = proto_hdrs->count; i > 0; i--) {
+hdr1 = &proto_hdrs->proto_hdr[i];
+hdr2 = &proto_hdrs->proto_hdr[i - 1];
 
-*hdr1 = *hdr2;
-}

drivers/net/iavf/iavf_hash.c struct virtchnl_proto_hdrs · line 719

Quoted 10 lines
drivers/net/iavf/iavf_hash.c +2 -7
+*hdr1 = *hdr2;
+}
 
-/* adding gtpu header at layer 0 */
-proto_hdrs->count++;
-hdr1 = &proto_hdrs->proto_hdr[0];
-hdr1->field_selector = 0;
-
-if (phint & IAVF_PHINT_GTPU_EH_DWN)
-VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN); -else if

(phint &

drivers/net/iavf/iavf_hash.c struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {

Quoted 11 lines
drivers/net/iavf/iavf_hash.c +7 -1
 IAVF_PHINT_GTPU_EH_UP) -VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1,
 GTPU_EH_PDU_UP); -else if (phint & IAVF_PHINT_GTPU_EH)
-VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH); -else if (phint &
 IAVF_PHINT_GTPU)
+/* adding gtpu header at layer 0 */
+proto_hdrs->count++;
+hdr1 = &proto_hdrs->proto_hdr[0];
+hdr1->field_selector = 0;
+
+if (phint & IAVF_PHINT_GTPU_EH_DWN)
+VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN); else if

(phint &

drivers/net/iavf/iavf_hash.c struct virtchnl_proto_hdrs · line 728

Quoted 4 lines
drivers/net/iavf/iavf_hash.c +4 -0
+IAVF_PHINT_GTPU_EH_UP) VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1,
+GTPU_EH_PDU_UP); else if (phint & IAVF_PHINT_GTPU_EH)
+VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH); else if (phint &
+IAVF_PHINT_GTPU) VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP); }

else {

drivers/net/iavf/iavf_hash.c struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = { · line 732

Quoted 4 lines
drivers/net/iavf/iavf_hash.c +3 -0
+hdr1 = &proto_hdrs->proto_hdr[proto_hdrs->count];
+hdr1->field_selector = 0;
+proto_hdrs->count++;
 VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);

Its better to also check phint for outer case, could be implemented as below

If (inner) {
Shift
Hdr = hdrs[0]
}
else {
Hdr = hdrs[count]
}

hdr-count++

if (phint & IAVF_PHINT_GTPU_EH_DWN) VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN); else if (phint & IAVF_PHINT_GTPU_EH_UP) VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_UP); else if (phint & IAVF_PHINT_GTPU_EH) VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH); else if (phint & IAVF_PHINT_GTPU) VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);

Quoted 7 lines
drivers/net/iavf/iavf_hash.c +1 -0
+}
 }
 
 static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs

*proto_hdrs,
--
1.8.3.1

#9 lore raw

PATCH v6 1/1 net/iavf: support outer IP hash for no inner GTPU

In reply to [email protected]

From: Alvin Zhang <[email protected]>

Outer IP hash can be configured as input sets for no inner GTPU packets.

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.
V5, V6: Modify codes according to comments.

---
 drivers/net/iavf/iavf_hash.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/net/iavf/iavf_hash.c +16 -10
index 780ec27..3152218 100644
@@ -359,6 +359,7 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
 	{iavf_pattern_eth_vlan_ipv4_udp,		IAVF_RSS_TYPE_VLAN_IPV4_UDP,	&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_tcp,		IAVF_RSS_TYPE_VLAN_IPV4_TCP,	&outer_ipv4_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv4_sctp,		IAVF_RSS_TYPE_VLAN_IPV4_SCTP,	&outer_ipv4_sctp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpu,			ETH_RSS_IPV4,			&outer_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4,		IAVF_RSS_TYPE_GTPU_IPV4,	&inner_ipv4_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,		IAVF_RSS_TYPE_GTPU_IPV4_UDP,	&inner_ipv4_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,		IAVF_RSS_TYPE_GTPU_IPV4_TCP,	&inner_ipv4_tcp_tmplt},
@@ -386,6 +387,7 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
 	{iavf_pattern_eth_vlan_ipv6_udp,		IAVF_RSS_TYPE_VLAN_IPV6_UDP,	&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_tcp,		IAVF_RSS_TYPE_VLAN_IPV6_TCP,	&outer_ipv6_tcp_tmplt},
 	{iavf_pattern_eth_vlan_ipv6_sctp,		IAVF_RSS_TYPE_VLAN_IPV6_SCTP,	&outer_ipv6_sctp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpu,			ETH_RSS_IPV6,			&outer_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6,		IAVF_RSS_TYPE_GTPU_IPV6,	&inner_ipv6_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,		IAVF_RSS_TYPE_GTPU_IPV6_UDP,	&inner_ipv6_udp_tmplt},
 	{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,		IAVF_RSS_TYPE_GTPU_IPV6_TCP,	&inner_ipv6_tcp_tmplt},
@@ -714,22 +716,26 @@ struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
 	struct virtchnl_proto_hdr *hdr2;
 	int i;
 
-	if (!(phint & IAVF_PHINT_GTPU_MSK) ||
-	    proto_hdrs->tunnel_level == 0)
+	if (!(phint & IAVF_PHINT_GTPU_MSK))
 		return;
 
-	/* shift headers 1 layer */
-	for (i = proto_hdrs->count; i > 0; i--) {
-		hdr1 = &proto_hdrs->proto_hdr[i];
-		hdr2 = &proto_hdrs->proto_hdr[i - 1];
+	if (proto_hdrs->tunnel_level == TUNNEL_LEVEL_INNER) {
+		/* shift headers 1 layer */
+		for (i = proto_hdrs->count; i > 0; i--) {
+			hdr1 = &proto_hdrs->proto_hdr[i];
+			hdr2 = &proto_hdrs->proto_hdr[i - 1];
 
-		*hdr1 = *hdr2;
+			*hdr1 = *hdr2;
+		}
+
+		/* adding gtpu header at layer 0 */
+		hdr1 = &proto_hdrs->proto_hdr[0];
+	} else {
+		hdr1 = &proto_hdrs->proto_hdr[proto_hdrs->count];
 	}
 
-	/* adding gtpu header at layer 0 */
-	proto_hdrs->count++;
-	hdr1 = &proto_hdrs->proto_hdr[0];
 	hdr1->field_selector = 0;
+	proto_hdrs->count++;
 
 	if (phint & IAVF_PHINT_GTPU_EH_DWN)
 		VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN);
Signature · 1 line
1.8.3.1
Acked-by on v6 1/1 Applied
#10 lore raw

Re: [dpdk-dev] [PATCH v6] net/iavf: support outer IP hash for no inner GTPU

Quoted 9 lines

-----Original Message-----
From: Zhang, AlvinX <[email protected]>
Sent: Tuesday, September 15, 2020 10:44 AM
To: Guo, Jia <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, AlvinX <[email protected]>
Subject: [PATCH v6] net/iavf: support outer IP hash for no inner GTPU

Quoted 5 lines

From: Alvin Zhang <[email protected]>

Outer IP hash can be configured as input sets for no inner GTPU packets.

Applied to dpdk-next-net-intel.

Thanks
Qi

#11 lore raw

PATCH v4 1/2 common/iavf: add GTPC support

In reply to [email protected]

From: Alvin Zhang <[email protected]>

Add GTPC header and its field selector.

---
 drivers/common/iavf/virtchnl.h | 4 ++++
 1 file changed, 4 insertions(+)
drivers/common/iavf/virtchnl.h +4 -0
index 79515ee..0042cc0 100644
@@ -852,6 +852,7 @@ enum virtchnl_proto_hdr_type {
 	VIRTCHNL_PROTO_HDR_ESP,
 	VIRTCHNL_PROTO_HDR_AH,
 	VIRTCHNL_PROTO_HDR_PFCP,
+	VIRTCHNL_PROTO_HDR_GTPC,
 };
 
 /* Protocol header field within a protocol header. */
@@ -916,6 +917,9 @@ enum virtchnl_proto_hdr_field {
 	VIRTCHNL_PROTO_HDR_PFCP_S_FIELD =
 		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_PFCP),
 	VIRTCHNL_PROTO_HDR_PFCP_SEID,
+	/* GTPC */
+	VIRTCHNL_PROTO_HDR_GTPC_TEID =
+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPC),
 };
 
 struct virtchnl_proto_hdr {
Signature · 1 line
1.8.3.1
#12 lore raw

PATCH v4 2/2 net/iavf: support outer IP hash for GTPC

From: Alvin Zhang <[email protected]>

Add patterns and headers for GTPC, now outer IP hash can be configured as input sets for GTPC packet.

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.

 drivers/net/iavf/iavf_generic_flow.c | 18 ++++++++++++++++++
 drivers/net/iavf/iavf_generic_flow.h |  6 ++++++
 drivers/net/iavf/iavf_hash.c         | 13 +++++++++++++
 3 files changed, 37 insertions(+)
drivers/net/iavf/iavf_generic_flow.c +18 -0
index 321a4dc..00e7f15 100644
@@ -315,6 +315,15 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv4 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[] = {
+	RTE_FLOW_ITEM_TYPE_ETH,
+	RTE_FLOW_ITEM_TYPE_IPV4,
+	RTE_FLOW_ITEM_TYPE_UDP,
+	RTE_FLOW_ITEM_TYPE_GTPC,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV4 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = {
 	RTE_FLOW_ITEM_TYPE_ETH,
@@ -333,6 +342,15 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv6 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[] = {
+	RTE_FLOW_ITEM_TYPE_ETH,
+	RTE_FLOW_ITEM_TYPE_IPV6,
+	RTE_FLOW_ITEM_TYPE_UDP,
+	RTE_FLOW_ITEM_TYPE_GTPC,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV6 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[] = {
 	RTE_FLOW_ITEM_TYPE_ETH,
drivers/net/iavf/iavf_generic_flow.h +6 -0
index f365cc3..dbc7294 100644
@@ -182,10 +182,16 @@
 extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];
 extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[];
+
 /* 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_eh[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[];
+
 /* IPv6 GTPU (EH) */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[];
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[];
drivers/net/iavf/iavf_hash.c +13 -0
index d0f0057..4e8ee5c 100644
@@ -135,6 +135,9 @@ struct iavf_hash_flow_cfg {
 #define proto_hdr_gtpu { \
 	VIRTCHNL_PROTO_HDR_GTPU_IP, 0, {BUFF_NOUSED} }
 
+#define proto_hdr_gtpc { \
+	VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER		0
 #define TUNNEL_LEVEL_INNER		1
 
@@ -267,6 +270,14 @@ struct virtchnl_proto_hdrs outer_ipv6_udp_gtpu_tmplt = {
 	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpu}
 };
 
+struct virtchnl_proto_hdrs ipv4_udp_gtpc_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpc}
+};
+
+struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}
+};
+
 /* rss type super set */
 
 /* IPv4 outer */
@@ -377,6 +388,7 @@ struct virtchnl_proto_hdrs outer_ipv6_udp_gtpu_tmplt = {
 	{iavf_pattern_eth_ipv4_ah,			IAVF_RSS_TYPE_IPV4_AH,		&ipv4_ah_tmplt},
 	{iavf_pattern_eth_ipv4_l2tpv3,			IAVF_RSS_TYPE_IPV4_L2TPV3,	&ipv4_l2tpv3_tmplt},
 	{iavf_pattern_eth_ipv4_pfcp,			IAVF_RSS_TYPE_IPV4_PFCP,	&ipv4_pfcp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpc,			ETH_RSS_IPV4,			&ipv4_udp_gtpc_tmplt},
 	/* IPv6 */
 	{iavf_pattern_eth_ipv6,				IAVF_RSS_TYPE_OUTER_IPV6,	&outer_ipv6_tmplt},
 	{iavf_pattern_eth_ipv6_udp,			IAVF_RSS_TYPE_OUTER_IPV6_UDP,	&outer_ipv6_udp_tmplt},
@@ -404,6 +416,7 @@ struct virtchnl_proto_hdrs outer_ipv6_udp_gtpu_tmplt = {
 	{iavf_pattern_eth_ipv6_ah,			IAVF_RSS_TYPE_IPV6_AH,		&ipv6_ah_tmplt},
 	{iavf_pattern_eth_ipv6_l2tpv3,			IAVF_RSS_TYPE_IPV6_L2TPV3,	&ipv6_l2tpv3_tmplt},
 	{iavf_pattern_eth_ipv6_pfcp,			IAVF_RSS_TYPE_IPV6_PFCP,	&ipv6_pfcp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpc,			ETH_RSS_IPV6,			&ipv6_udp_gtpc_tmplt},
 };
 
 struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
Signature · 1 line
1.8.3.1
#13 lore raw

Re: [dpdk-dev] [PATCH v4 2/2] net/iavf: support outer IP hash for GTPC

Hi, Alvin

Quoted 70 lines

-----Original Message-----
From: Zhang, AlvinX <[email protected]>
Sent: Thursday, September 10, 2020 11:37 AM
To: Guo, Jia <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, AlvinX <[email protected]>
Subject: [PATCH v4 2/2] net/iavf: support outer IP hash for GTPC

From: Alvin Zhang <[email protected]>

Add patterns and headers for GTPC, now outer IP hash can be configured as input sets for GTPC packet.

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.

 drivers/net/iavf/iavf_generic_flow.c | 18 ++++++++++++++++++
drivers/net/iavf/iavf_generic_flow.h |  6 ++++++
 drivers/net/iavf/iavf_hash.c         | 13 +++++++++++++
 3 files changed, 37 insertions(+)
drivers/net/iavf/iavf_generic_flow.c +9 -0
index 321a4dc..00e7f15 100644
@@ -315,6 +315,15 @@ enum rte_flow_item_type
 iavf_pattern_eth_qinq_ipv6_icmp6[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv4 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[] = {
+	RTE_FLOW_ITEM_TYPE_ETH,
+	RTE_FLOW_ITEM_TYPE_IPV4,
+	RTE_FLOW_ITEM_TYPE_UDP,
+	RTE_FLOW_ITEM_TYPE_GTPC,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV4 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = {
drivers/net/iavf/iavf_generic_flow.c +9 -0
 	RTE_FLOW_ITEM_TYPE_ETH,
@@ -333,6 +342,15 @@ enum rte_flow_item_type
 iavf_pattern_eth_ipv4_gtpu_eh[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv6 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[] = {
+	RTE_FLOW_ITEM_TYPE_ETH,
+	RTE_FLOW_ITEM_TYPE_IPV6,
+	RTE_FLOW_ITEM_TYPE_UDP,
+	RTE_FLOW_ITEM_TYPE_GTPC,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV6 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[] = {
drivers/net/iavf/iavf_generic_flow.c +0 -0
 	RTE_FLOW_ITEM_TYPE_ETH,
drivers/net/iavf/iavf_generic_flow.h +0 -0
index f365cc3..dbc7294 100644
@@ -182,10 +182,16 @@
 extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];

drivers/net/iavf/iavf_generic_flow.h line 192

Quoted 10 lines
drivers/net/iavf/iavf_generic_flow.h +4 -0
 extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[];
+
 /* 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_eh[];
 
+/* IPv4 GTPC */

/* IPv6 GTPC */

Quoted 45 lines
drivers/net/iavf/iavf_generic_flow.h +2 -0
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[];
+
 /* IPv6 GTPU (EH) */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[];  extern

enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[]; diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index d0f0057..4e8ee5c 100644

drivers/net/iavf/iavf_hash.c +11 -0
@@ -135,6 +135,9 @@ struct iavf_hash_flow_cfg {  #define proto_hdr_gtpu
 { \
 	VIRTCHNL_PROTO_HDR_GTPU_IP, 0, {BUFF_NOUSED} }
 
+#define proto_hdr_gtpc { \
+	VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER		0
 #define TUNNEL_LEVEL_INNER		1
 
@@ -267,6 +270,14 @@ struct virtchnl_proto_hdrs
 outer_ipv6_udp_gtpu_tmplt = {
 	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp,
 proto_hdr_gtpu}  };
 
+struct virtchnl_proto_hdrs ipv4_udp_gtpc_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp,
 proto_hdr_gtpc}
+};
+
+struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp,
 proto_hdr_gtpc}
+};
+

/* rss type super set */

/* IPv4 outer */

drivers/net/iavf/iavf_hash.c +0 -0
@@ -377,6 +388,7 @@ struct virtchnl_proto_hdrs
 outer_ipv6_udp_gtpu_tmplt = {
 	{iavf_pattern_eth_ipv4_ah,
 	IAVF_RSS_TYPE_IPV4_AH,		&ipv4_ah_tmplt},
 	{iavf_pattern_eth_ipv4_l2tpv3,
 	IAVF_RSS_TYPE_IPV4_L2TPV3,	&ipv4_l2tpv3_tmplt},
 	{iavf_pattern_eth_ipv4_pfcp,
	IAVF_RSS_TYPE_IPV4_PFCP,	&ipv4_pfcp_tmplt},

drivers/net/iavf/iavf_hash.c

Quoted 1 line
drivers/net/iavf/iavf_hash.c +1 -0
+	{iavf_pattern_eth_ipv4_gtpc,			ETH_RSS_IPV4,

Since the input set hint is the supper set, so I suppose you use the supper set "ETH_RSS_IPV4 | ETH_RSS_GTPC" here, and considerate if we need to enable GTPC hash at this patch, if not it could be process when parsing pattern. Want to know other's opinion.

Quoted 21 lines
		&ipv4_udp_gtpc_tmplt},
drivers/net/iavf/iavf_hash.c +0 -0
 	/* IPv6 */
 	{iavf_pattern_eth_ipv6,
	IAVF_RSS_TYPE_OUTER_IPV6,	&outer_ipv6_tmplt},
 	{iavf_pattern_eth_ipv6_udp,
	IAVF_RSS_TYPE_OUTER_IPV6_UDP,	&outer_ipv6_udp_tmplt},
drivers/net/iavf/iavf_hash.c +0 -0
@@ -404,6 +416,7 @@ struct virtchnl_proto_hdrs
 outer_ipv6_udp_gtpu_tmplt = {
 	{iavf_pattern_eth_ipv6_ah,
 	IAVF_RSS_TYPE_IPV6_AH,		&ipv6_ah_tmplt},
 	{iavf_pattern_eth_ipv6_l2tpv3,
 	IAVF_RSS_TYPE_IPV6_L2TPV3,	&ipv6_l2tpv3_tmplt},
 	{iavf_pattern_eth_ipv6_pfcp,
	IAVF_RSS_TYPE_IPV6_PFCP,	&ipv6_pfcp_tmplt},
drivers/net/iavf/iavf_hash.c +1 -0
+	{iavf_pattern_eth_ipv6_gtpc,			ETH_RSS_IPV6,
		&ipv6_udp_gtpc_tmplt},

};

struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
--
1.8.3.1

#14 lore raw

Re: [dpdk-dev] [PATCH v4 2/2] net/iavf: support outer IP hash for GTPC

Thanks Guojia,

Quoted 117 lines

-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Thursday, September 10, 2020 1:14 PM
To: Zhang, AlvinX <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH v4 2/2] net/iavf: support outer IP hash for GTPC

Hi, Alvin

Quoted 40 lines

-----Original Message-----
From: Zhang, AlvinX <[email protected]>
Sent: Thursday, September 10, 2020 11:37 AM
To: Guo, Jia <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, AlvinX <[email protected]>
Subject: [PATCH v4 2/2] net/iavf: support outer IP hash for GTPC

From: Alvin Zhang <[email protected]>

Add patterns and headers for GTPC, now outer IP hash can be configured as input sets for GTPC packet.

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4: Fix compatibility issues.

 drivers/net/iavf/iavf_generic_flow.c | 18 ++++++++++++++++++
drivers/net/iavf/iavf_generic_flow.h |  6 ++++++
 drivers/net/iavf/iavf_hash.c         | 13 +++++++++++++
 3 files changed, 37 insertions(+)
drivers/net/iavf/iavf_generic_flow.c +6 -0
index 321a4dc..00e7f15 100644
@@ -315,6 +315,15 @@ enum rte_flow_item_type
 iavf_pattern_eth_qinq_ipv6_icmp6[] = {  RTE_FLOW_ITEM_TYPE_END,  };
 
+/* IPv4 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[] = {
+RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV4,
+RTE_FLOW_ITEM_TYPE_UDP, RTE_FLOW_ITEM_TYPE_GTPC,
+RTE_FLOW_ITEM_TYPE_END, };
+
 /* IPV4 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = {
Quoted 1 line

RTE_FLOW_ITEM_TYPE_ETH, @@ -333,6 +342,15 @@ enum

rte_flow_item_type

Quoted 18 lines

iavf_pattern_eth_ipv4_gtpu_eh[] = { RTE_FLOW_ITEM_TYPE_END, };

drivers/net/iavf/iavf_generic_flow.c +6 -0
+/* IPv6 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[] = {
+RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV6,
+RTE_FLOW_ITEM_TYPE_UDP, RTE_FLOW_ITEM_TYPE_GTPC,
+RTE_FLOW_ITEM_TYPE_END, };
+
 /* IPV6 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[] = {

RTE_FLOW_ITEM_TYPE_ETH, diff --git
a/drivers/net/iavf/iavf_generic_flow.h
b/drivers/net/iavf/iavf_generic_flow.h
index f365cc3..dbc7294 100644

drivers/net/iavf/iavf_generic_flow.h +0 -0
@@ -182,10 +182,16 @@
 extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];

drivers/net/iavf/iavf_generic_flow.h line 192

Quoted 10 lines
drivers/net/iavf/iavf_generic_flow.h +4 -0
 extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[];
+
 /* 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_eh[];
 
+/* IPv4 GTPC */

/* IPv6 GTPC */

Quoted 34 lines
drivers/net/iavf/iavf_generic_flow.h +2 -0
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[];
+
 /* IPv6 GTPU (EH) */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[];  extern

enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[]; diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index d0f0057..4e8ee5c 100644

drivers/net/iavf/iavf_hash.c +11 -0
@@ -135,6 +135,9 @@ struct iavf_hash_flow_cfg {  #define
 proto_hdr_gtpu { \  VIRTCHNL_PROTO_HDR_GTPU_IP, 0, {BUFF_NOUSED} }
 
+#define proto_hdr_gtpc { \
+VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER0
 #define TUNNEL_LEVEL_INNER1
 
@@ -267,6 +270,14 @@ struct virtchnl_proto_hdrs
 outer_ipv6_udp_gtpu_tmplt = {  TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6,
 proto_hdr_udp, proto_hdr_gtpu}  };
 
+struct virtchnl_proto_hdrs ipv4_udp_gtpc_tmplt = {
+TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp,
 proto_hdr_gtpc}
+};
+
+struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
+TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp,
 proto_hdr_gtpc}
+};
+
 /* rss type super set */
Quoted 14 lines

drivers/net/iavf/iavf_hash.c struct virtchnl_proto_hdrs · line 394

Quoted 9 lines

/* IPv4 outer */

drivers/net/iavf/iavf_hash.c +1 -0
@@ -377,6 +388,7 @@ struct virtchnl_proto_hdrs
 outer_ipv6_udp_gtpu_tmplt = {  {iavf_pattern_eth_ipv4_ah,
 IAVF_RSS_TYPE_IPV4_AH,&ipv4_ah_tmplt},
 {iavf_pattern_eth_ipv4_l2tpv3,
 IAVF_RSS_TYPE_IPV4_L2TPV3,&ipv4_l2tpv3_tmplt},
 {iavf_pattern_eth_ipv4_pfcp,
 IAVF_RSS_TYPE_IPV4_PFCP,&ipv4_pfcp_tmplt},
+{iavf_pattern_eth_ipv4_gtpc,ETH_RSS_IPV4,

Since the input set hint is the supper set, so I suppose you use the supper set "ETH_RSS_IPV4 | ETH_RSS_GTPC" here, and considerate if we need to enable GTPC hash at this patch, if not it could be process when parsing pattern. Want to know other's opinion.

In V1 patch I have put TEID field as input set, but the kernel driver did not supported this field and returned success. That's mean if user really set ETH_RSS_GTPC as input set, the rule will be created succeed, but it don't work

Quoted 22 lines
Quoted 21 lines

&ipv4_udp_gtpc_tmplt},
/* IPv6 */
{iavf_pattern_eth_ipv6,
IAVF_RSS_TYPE_OUTER_IPV6,&outer_ipv6_tmplt},
{iavf_pattern_eth_ipv6_udp,
IAVF_RSS_TYPE_OUTER_IPV6_UDP,&outer_ipv6_udp_tmplt},

drivers/net/iavf/iavf_hash.c +1 -0
@@ -404,6 +416,7 @@ struct virtchnl_proto_hdrs
 outer_ipv6_udp_gtpu_tmplt = {  {iavf_pattern_eth_ipv6_ah,
 IAVF_RSS_TYPE_IPV6_AH,&ipv6_ah_tmplt},
 {iavf_pattern_eth_ipv6_l2tpv3,
 IAVF_RSS_TYPE_IPV6_L2TPV3,&ipv6_l2tpv3_tmplt},
 {iavf_pattern_eth_ipv6_pfcp,
 IAVF_RSS_TYPE_IPV6_PFCP,&ipv6_pfcp_tmplt},
+{iavf_pattern_eth_ipv6_gtpc,ETH_RSS_IPV6,

&ipv6_udp_gtpc_tmplt},
};

struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
--
1.8.3.1

#15 lore raw

PATCH v5 1/1 net/iavf: support outer IP hash for GTPC

In reply to [email protected]

From: Alvin Zhang <[email protected]>

Add patterns and headers for GTPC, now outer IP hash can be configured as input sets for GTPC packets.

---

V2: Modify codes according to comments.
V3: Refact all codes.
V4, V5: Fix compatibility issues.

 drivers/net/iavf/iavf_generic_flow.c | 18 ++++++++++++++++++
 drivers/net/iavf/iavf_generic_flow.h |  6 ++++++
 drivers/net/iavf/iavf_hash.c         | 13 +++++++++++++
 3 files changed, 37 insertions(+)
drivers/net/iavf/iavf_generic_flow.c +18 -0
index 321a4dc..00e7f15 100644
@@ -315,6 +315,15 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv4 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[] = {
+	RTE_FLOW_ITEM_TYPE_ETH,
+	RTE_FLOW_ITEM_TYPE_IPV4,
+	RTE_FLOW_ITEM_TYPE_UDP,
+	RTE_FLOW_ITEM_TYPE_GTPC,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV4 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = {
 	RTE_FLOW_ITEM_TYPE_ETH,
@@ -333,6 +342,15 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv6 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[] = {
+	RTE_FLOW_ITEM_TYPE_ETH,
+	RTE_FLOW_ITEM_TYPE_IPV6,
+	RTE_FLOW_ITEM_TYPE_UDP,
+	RTE_FLOW_ITEM_TYPE_GTPC,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV6 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[] = {
 	RTE_FLOW_ITEM_TYPE_ETH,
drivers/net/iavf/iavf_generic_flow.h +6 -0
index f365cc3..efc7f22 100644
@@ -182,10 +182,16 @@
 extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];
 extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[];
+
 /* 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_eh[];
 
+/* IPv6 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[];
+
 /* IPv6 GTPU (EH) */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[];
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[];
drivers/net/iavf/iavf_hash.c +13 -0
index d0a6396..2193360 100644
@@ -132,6 +132,9 @@ struct iavf_hash_flow_cfg {
 	VIRTCHNL_PROTO_HDR_PFCP, \
 	FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED} }
 
+#define proto_hdr_gtpc { \
+	VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER		0
 #define TUNNEL_LEVEL_INNER		1
 
@@ -256,6 +259,14 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	TUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_pfcp}
 };
 
+struct virtchnl_proto_hdrs ipv4_udp_gtpc_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpc}
+};
+
+struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
+	TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}
+};
+
 /* rss type super set */
 
 /* IPv4 outer */
@@ -366,6 +377,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_ipv4_ah,			IAVF_RSS_TYPE_IPV4_AH,		&ipv4_ah_tmplt},
 	{iavf_pattern_eth_ipv4_l2tpv3,			IAVF_RSS_TYPE_IPV4_L2TPV3,	&ipv4_l2tpv3_tmplt},
 	{iavf_pattern_eth_ipv4_pfcp,			IAVF_RSS_TYPE_IPV4_PFCP,	&ipv4_pfcp_tmplt},
+	{iavf_pattern_eth_ipv4_gtpc,			ETH_RSS_IPV4,			&ipv4_udp_gtpc_tmplt},
 	/* IPv6 */
 	{iavf_pattern_eth_ipv6,				IAVF_RSS_TYPE_OUTER_IPV6,	&outer_ipv6_tmplt},
 	{iavf_pattern_eth_ipv6_udp,			IAVF_RSS_TYPE_OUTER_IPV6_UDP,	&outer_ipv6_udp_tmplt},
@@ -393,6 +405,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
 	{iavf_pattern_eth_ipv6_ah,			IAVF_RSS_TYPE_IPV6_AH,		&ipv6_ah_tmplt},
 	{iavf_pattern_eth_ipv6_l2tpv3,			IAVF_RSS_TYPE_IPV6_L2TPV3,	&ipv6_l2tpv3_tmplt},
 	{iavf_pattern_eth_ipv6_pfcp,			IAVF_RSS_TYPE_IPV6_PFCP,	&ipv6_pfcp_tmplt},
+	{iavf_pattern_eth_ipv6_gtpc,			ETH_RSS_IPV6,			&ipv6_udp_gtpc_tmplt},
 };
 
 struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
Signature · 1 line
1.8.3.1
Acked-by on v5 1/1 Applied
#16 lore raw

Re: [dpdk-dev] [PATCH v5] net/iavf: support outer IP hash for GTPC

Quoted 9 lines

-----Original Message-----
From: Zhang, AlvinX <[email protected]>
Sent: Monday, September 14, 2020 5:12 PM
To: Guo, Jia <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, AlvinX <[email protected]>
Subject: [PATCH v5] net/iavf: support outer IP hash for GTPC

Quoted 6 lines

From: Alvin Zhang <[email protected]>

Add patterns and headers for GTPC, now outer IP hash can be configured as input sets for GTPC packets.

Applied to dpdk-next-net-intel.

Thanks
Qi