Skip to contentSkip to conversation

ethdev: add new ext hdr for gtp psc

PATCH Superseded Raslan Darawsheh 5 participants 16 messages Jun 17, 2021 – Sep 28, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH v6 1/1 ethdev: add new ext hdr for gtp psc

Define new rte header for gtp PDU session container based on RFC 38415-g30

---
v6 : fixed typos
fixed indentation of comments for fields

---
 lib/net/rte_gtp.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
lib/net/rte_gtp.h +78 -0
index 6a6f9b238d..9f6deb9c7e 100644
@@ -61,6 +61,84 @@ struct rte_gtp_hdr_ext_word {
 	uint8_t next_ext;     /**< Next Extension Header Type. */
 }  __rte_packed;
 
+/**
+ * Optional extension for GTP with next_ext set to 0x85
+ * defined based on RFC 38415-g30.
+ */
+__extension__
+struct rte_gtp_psc_generic_hdr {
+	uint8_t ext_hdr_len;	/**< PDU ext hdr len in multiples of 4 bytes */
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+	uint8_t type:4;		/**< PDU type */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t pad:3;		/**< type specific pad bits */
+	uint8_t spare:2;	/**< type specific spare bits */
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+#else
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+	uint8_t spare:2;	/**< type specific spare bits */
+	uint8_t pad:3;		/**< type specific pad bits */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t type:4;		/**< PDU type */
+#endif
+	uint8_t data[0];	/**< variable length data fields */
+} __rte_packed;
+
+/**
+ * Optional extension for GTP with next_ext set to 0x85
+ * type0 defined based on RFC 38415-g30
+ */
+__extension__
+struct rte_gtp_psc_type0_hdr {
+	uint8_t ext_hdr_len;	/**< PDU ext hdr len in multiples of 4 bytes */
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+	uint8_t type:4;		/**< PDU type */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t snp:1;		/**< Sequence number presence */
+	uint8_t spare_dl1:2;	/**< spare down link bits */
+	uint8_t ppp:1;		/**< Paging policy presence */
+	uint8_t rqi:1;		/**< Reflective Qos Indicator */
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+#else
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+	uint8_t rqi:1;		/**< Reflective Qos Indicator */
+	uint8_t ppp:1;		/**< Paging policy presence */
+	uint8_t spare_dl1:2;	/**< spare down link bits */
+	uint8_t snp:1;		/**< Sequence number presence */
+	uint8_t type:4;		/**< PDU type */
+#endif
+	uint8_t data[0];	/**< variable length data fields */
+} __rte_packed;
+
+/**
+ * Optional extension for GTP with next_ext set to 0x85
+ * type1 defined based on RFC 38415-g30
+ */
+__extension__
+struct rte_gtp_psc_type1_hdr {
+	uint8_t ext_hdr_len;	/**< PDU ext hdr len in multiples of 4 bytes */
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+	uint8_t type:4;		/**< PDU type */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t dl_delay_ind:1;	/**< dl delay result presence */
+	uint8_t ul_delay_ind:1;	/**< ul delay result presence */
+	uint8_t snp:1;		/**< Sequence number presence ul */
+	uint8_t n_delay_ind:1;	/**< N3/N9 delay result presence */
+	uint8_t spare_ul2:1;	/**< spare up link bits */
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+#else
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+	uint8_t spare_ul2:1;	/**< spare up link bits */
+	uint8_t n_delay_ind:1;	/**< N3/N9 delay result presence */
+	uint8_t snp:1;		/**< Sequence number presence ul */
+	uint8_t ul_delay_ind:1;	/**< ul delay result presence */
+	uint8_t dl_delay_ind:1;	/**< dl delay result presence */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t type:4;		/**< PDU type */
+#endif
+	uint8_t data[0];	/**< variable length data fields */
+} __rte_packed;
+
 /** GTP header length */
 #define RTE_ETHER_GTP_HLEN \
 	(sizeof(struct rte_udp_hdr) + sizeof(struct rte_gtp_hdr))
Signature · 1 line
2.25.1
#3 lore raw

Hi Guys,

Sorry for missing this mail, for some reason it was missed in my inbox, This is the link to this rfc:
https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip

Kindest regards,
Raslan Darawsheh

Quoted 21 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Andrew Rybchenko
Sent: Thursday, July 1, 2021 5:06 PM
To: Singh, Aman Deep <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

could you reply, please.

Andrew.

Quoted 8 lines · Aman Deep

Hi Raslan,

Can you please provide link to this RFC 38415-g30 I just had some doubt on byte-order conversion as per RFC 1700
<https://tools.ietf.org/html/rfc1700>

Regards
Aman

#4 lore raw

Hi Raslan,

Quoted 5 lines · Raslan Darawsheh

Hi Guys,

Sorry for missing this mail, for some reason it was missed in my inbox, This is the link to this rfc:
https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip

Thanks for the link. The patch LGTM, but I have only one question left. Where is it used? Are you going to upstream corresponding code in the release cycle?

Andrew.

Quoted 24 lines

Kindest regards,
Raslan Darawsheh

Quoted 21 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Andrew Rybchenko
Sent: Thursday, July 1, 2021 5:06 PM
To: Singh, Aman Deep <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

could you reply, please.

Andrew.

Quoted 8 lines · Aman Deep

Hi Raslan,

Can you please provide link to this RFC 38415-g30 I just had some doubt on byte-order conversion as per RFC 1700
<https://tools.ietf.org/html/rfc1700>

Regards
Aman

#5 lore raw

Thank you for the review,

Basically it's not used yet since it will break the abi
The main usage was in rte_flow item of gtp_psc
To replace the current structure with the header definition. And since this will break the abi I'm adding the header definition now but will be used later in rte_flow.

Kindest regards,
Raslan Darawsheh

________________________________
From: Andrew Rybchenko <[email protected]>
Sent: Thursday, July 8, 2021, 12:23 PM
To: Raslan Darawsheh; Singh, Aman Deep; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

Quoted 5 lines · Raslan Darawsheh

Hi Guys,

Sorry for missing this mail, for some reason it was missed in my inbox, This is the link to this rfc:
https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip

Thanks for the link. The patch LGTM, but I have only one question left. Where is it used? Are you going to upstream corresponding code in the release cycle?

Andrew.

Quoted 24 lines

Kindest regards,
Raslan Darawsheh

Quoted 21 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Andrew Rybchenko
Sent: Thursday, July 1, 2021 5:06 PM
To: Singh, Aman Deep <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

could you reply, please.

Andrew.

Quoted 8 lines · Aman Deep

Hi Raslan,

Can you please provide link to this RFC 38415-g30 I just had some doubt on byte-order conversion as per RFC 1700
<https://tools.ietf.org/html/rfc1700>

Regards
Aman

#6 lore raw
Quoted 7 lines · Raslan Darawsheh

Thank you for the review,

Basically it's not used yet since it will break the abi
The main usage was in rte_flow item of gtp_psc
To replace the current structure with the header definition. And since this will break the abi I'm adding the header definition now but will be used later in rte_flow.

@Thomas If so, should we accept it in the current release cycle or should it simply wait for the code which uses it?

Quoted 51 lines

Kindest regards,
Raslan Darawsheh

------------------------------------------------------------------------
*From:* Andrew Rybchenko <[email protected]> *Sent:* Thursday, July 8, 2021, 12:23 PM
*To:* Raslan Darawsheh; Singh, Aman Deep; [email protected] *Subject:* Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

Quoted 5 lines · Raslan Darawsheh

Hi Guys,

Sorry for missing this mail, for some reason it was missed in my inbox, This is the link to this rfc:
https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip

<https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip>

Thanks for the link. The patch LGTM, but I have only one question left. Where is it used? Are you going to upstream corresponding code in the release cycle?

Andrew.

Quoted 24 lines

Kindest regards,
Raslan Darawsheh

Quoted 21 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Andrew Rybchenko
Sent: Thursday, July 1, 2021 5:06 PM
To: Singh, Aman Deep <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

could you reply, please.

Andrew.

Quoted 8 lines · Aman Deep

Hi Raslan,

Can you please provide link to this RFC 38415-g30 I just had some doubt on byte-order conversion as per RFC 1700
<https://tools.ietf.org/html/rfc1700 <https://tools.ietf.org/html/rfc1700>>

Regards
Aman

#7 lore raw

08/07/2021 11:39, Andrew Rybchenko:

Quoted 11 lines · Raslan Darawsheh
Quoted 7 lines

Thank you for the review,

Basically it's not used yet since it will break the abi
The main usage was in rte_flow item of gtp_psc
To replace the current structure with the header definition. And since this will break the abi I'm adding the header definition now but will be used later in rte_flow.

@Thomas If so, should we accept it in the current release cycle or should it simply wait for the code which uses it?

If no need, we can wait next release.

Quoted 46 lines
Quoted 46 lines

------------------------------------------------------------------------
*From:* Andrew Rybchenko <[email protected]> *Sent:* Thursday, July 8, 2021, 12:23 PM
*To:* Raslan Darawsheh; Singh, Aman Deep; [email protected] *Subject:* Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

Quoted 5 lines · Raslan Darawsheh

Hi Guys,

Sorry for missing this mail, for some reason it was missed in my inbox, This is the link to this rfc:
https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip

<https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip>

Thanks for the link. The patch LGTM, but I have only one question left. Where is it used? Are you going to upstream corresponding code in the release cycle?

Andrew.

Quoted 24 lines

Kindest regards,
Raslan Darawsheh

Quoted 21 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Andrew Rybchenko
Sent: Thursday, July 1, 2021 5:06 PM
To: Singh, Aman Deep <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

could you reply, please.

Andrew.

Quoted 8 lines · Aman Deep

Hi Raslan,

Can you please provide link to this RFC 38415-g30 I just had some doubt on byte-order conversion as per RFC 1700
<https://tools.ietf.org/html/rfc1700 <https://tools.ietf.org/html/rfc1700>>

Regards
Aman

#8 lore raw
In reply to Raslan Darawsheh

Thanks Raslan for the rfc link.The structure order for RTE_BIG_ENDIAN seems ok. I doubt for RTE_LITTLE_ENDIAN case, if there is a need to reverse the order of fields, as we are using uint8_t only. If you have already tested on x86 then it should be fine ? Regards Aman

Quoted 31 lines · Raslan Darawsheh

Hi Guys,

Sorry for missing this mail, for some reason it was missed in my inbox, This is the link to this rfc:
https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip

Kindest regards,
Raslan Darawsheh

Quoted 21 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Andrew Rybchenko
Sent: Thursday, July 1, 2021 5:06 PM
To: Singh, Aman Deep <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] ethdev: add new ext hdr for gtp psc

Hi Raslan,

could you reply, please.

Andrew.

Quoted 8 lines · Aman Deep

Hi Raslan,

Can you please provide link to this RFC 38415-g30 I just had some doubt on byte-order conversion as per RFC 1700
<https://tools.ietf.org/html/rfc1700>

Regards
Aman

Reviewed-by on v6 1/1
#9 lore raw
In reply to Raslan Darawsheh
Quoted 4 lines · Raslan Darawsheh

Define new rte header for gtp PDU session container based on RFC 38415-g30

As I understand prefix should be "net: ", not "ethdev: ".

Quoted 6 lines

---
v6 : fixed typos
fixed indentation of comments for fields

---
 lib/net/rte_gtp.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

[snip]

#10 lore raw

v7 cover update gtp psc to use net hdr

In reply to Raslan Darawsheh

This series add header definition for gtp_psc in the net library, and update the relevant rte_flow_item gtp_psc to use this new header definition.

Raslan Darawsheh (2):
net: add new ext hdr for gtp psc
ethdev: use ext hdr for gtp psc item

 app/test-pmd/cmdline_flow.c                 | 23 +++---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  2 +-
 drivers/net/iavf/iavf_fdir.c                |  9 +--
 drivers/net/iavf/iavf_hash.c                |  4 +-
 drivers/net/ice/ice_fdir_filter.c           |  4 +-
 drivers/net/ice/ice_hash.c                  |  4 +-
 drivers/net/ice/ice_switch_filter.c         |  8 +--
 drivers/net/mlx5/mlx5_flow.h                |  3 -
 drivers/net/mlx5/mlx5_flow_dv.c             | 20 ++----
 lib/ethdev/rte_flow.h                       |  6 +-
 lib/net/rte_gtp.h                           | 78 +++++++++++++++++++++
 11 files changed, 112 insertions(+), 49 deletions(-)
Signature · 1 line
2.25.1
#11 lore raw

PATCH v7 1/2 net: add new ext hdr for gtp psc

Define new rte header for gtp PDU session container based on RFC 38415-g30

---
 lib/net/rte_gtp.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
lib/net/rte_gtp.h +78 -0
index 6a6f9b238d..9f6deb9c7e 100644
@@ -61,6 +61,84 @@ struct rte_gtp_hdr_ext_word {
 	uint8_t next_ext;     /**< Next Extension Header Type. */
 }  __rte_packed;
 
+/**
+ * Optional extension for GTP with next_ext set to 0x85
+ * defined based on RFC 38415-g30.
+ */
+__extension__
+struct rte_gtp_psc_generic_hdr {
+	uint8_t ext_hdr_len;	/**< PDU ext hdr len in multiples of 4 bytes */
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+	uint8_t type:4;		/**< PDU type */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t pad:3;		/**< type specific pad bits */
+	uint8_t spare:2;	/**< type specific spare bits */
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+#else
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+	uint8_t spare:2;	/**< type specific spare bits */
+	uint8_t pad:3;		/**< type specific pad bits */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t type:4;		/**< PDU type */
+#endif
+	uint8_t data[0];	/**< variable length data fields */
+} __rte_packed;
+
+/**
+ * Optional extension for GTP with next_ext set to 0x85
+ * type0 defined based on RFC 38415-g30
+ */
+__extension__
+struct rte_gtp_psc_type0_hdr {
+	uint8_t ext_hdr_len;	/**< PDU ext hdr len in multiples of 4 bytes */
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+	uint8_t type:4;		/**< PDU type */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t snp:1;		/**< Sequence number presence */
+	uint8_t spare_dl1:2;	/**< spare down link bits */
+	uint8_t ppp:1;		/**< Paging policy presence */
+	uint8_t rqi:1;		/**< Reflective Qos Indicator */
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+#else
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+	uint8_t rqi:1;		/**< Reflective Qos Indicator */
+	uint8_t ppp:1;		/**< Paging policy presence */
+	uint8_t spare_dl1:2;	/**< spare down link bits */
+	uint8_t snp:1;		/**< Sequence number presence */
+	uint8_t type:4;		/**< PDU type */
+#endif
+	uint8_t data[0];	/**< variable length data fields */
+} __rte_packed;
+
+/**
+ * Optional extension for GTP with next_ext set to 0x85
+ * type1 defined based on RFC 38415-g30
+ */
+__extension__
+struct rte_gtp_psc_type1_hdr {
+	uint8_t ext_hdr_len;	/**< PDU ext hdr len in multiples of 4 bytes */
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+	uint8_t type:4;		/**< PDU type */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t dl_delay_ind:1;	/**< dl delay result presence */
+	uint8_t ul_delay_ind:1;	/**< ul delay result presence */
+	uint8_t snp:1;		/**< Sequence number presence ul */
+	uint8_t n_delay_ind:1;	/**< N3/N9 delay result presence */
+	uint8_t spare_ul2:1;	/**< spare up link bits */
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+#else
+	uint8_t qfi:6;		/**< Qos Flow Identifier */
+	uint8_t spare_ul2:1;	/**< spare up link bits */
+	uint8_t n_delay_ind:1;	/**< N3/N9 delay result presence */
+	uint8_t snp:1;		/**< Sequence number presence ul */
+	uint8_t ul_delay_ind:1;	/**< ul delay result presence */
+	uint8_t dl_delay_ind:1;	/**< dl delay result presence */
+	uint8_t qmp:1;		/**< Qos Monitoring Packet */
+	uint8_t type:4;		/**< PDU type */
+#endif
+	uint8_t data[0];	/**< variable length data fields */
+} __rte_packed;
+
 /** GTP header length */
 #define RTE_ETHER_GTP_HLEN \
 	(sizeof(struct rte_udp_hdr) + sizeof(struct rte_gtp_hdr))
Signature · 1 line
2.25.1
Acked-by on v7 1/2
#12 lore raw

Re: [dpdk-dev] [PATCH v7 1/2] net: add new ext hdr for gtp psc

Quoted 4 lines · Raslan Darawsheh

Define new rte header for gtp PDU session container based on RFC 38415-g30

Patch title can be updated to have abbreviations uppercase, but it can be done while merging I guess.

@Olivier,

If you OK with the patch I can proceed with it in and merge to next-net because of the dependency of next patch.

#13 lore raw

PATCH v7 2/2 ethdev: use ext hdr for gtp psc item

In reply to Raslan Darawsheh

This updates the gtp_psc item to use the net hdr definition of the gtp_psc to be based on RFC 38415-g30

---
 app/test-pmd/cmdline_flow.c                 | 23 +++++++--------------
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  2 +-
 drivers/net/iavf/iavf_fdir.c                |  9 ++++----
 drivers/net/iavf/iavf_hash.c                |  4 ++--
 drivers/net/ice/ice_fdir_filter.c           |  4 ++--
 drivers/net/ice/ice_hash.c                  |  4 ++--
 drivers/net/ice/ice_switch_filter.c         |  8 +++----
 drivers/net/mlx5/mlx5_flow.h                |  3 ---
 drivers/net/mlx5/mlx5_flow_dv.c             | 20 +++++++-----------
 lib/ethdev/rte_flow.h                       |  6 +++---
 10 files changed, 34 insertions(+), 49 deletions(-)
app/test-pmd/cmdline_flow.c +8 -15
index 6cd99bf37f..bb22294dd3 100644
@@ -3315,16 +3315,16 @@ static const struct token token_list[] = {
 		.help = "QoS flow identifier",
 		.next = NEXT(item_gtp_psc, NEXT_ENTRY(COMMON_UNSIGNED),
 			     item_param),
-		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gtp_psc,
-					qfi)),
+		.args = ARGS(ARGS_ENTRY_BF(struct rte_flow_item_gtp_psc,
+					hdr.qfi, 6)),
 	},
 	[ITEM_GTP_PSC_PDU_T] = {
 		.name = "pdu_t",
 		.help = "PDU type",
 		.next = NEXT(item_gtp_psc, NEXT_ENTRY(COMMON_UNSIGNED),
 			     item_param),
-		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gtp_psc,
-					pdu_type)),
+		.args = ARGS(ARGS_ENTRY_BF(struct rte_flow_item_gtp_psc,
+					hdr.type, 4)),
 	},
 	[ITEM_PPPOES] = {
 		.name = "pppoes",
@@ -8600,20 +8600,13 @@ cmd_set_raw_parsed(const struct buffer *in)
 					*opt = item->spec;
 				struct {
 					uint8_t len;
-					uint8_t pdu_type;
-					uint8_t qfi;
+					uint8_t pdu_type:4;
+					uint8_t qfi:6;
 					uint8_t next;
 				} psc;
-
-				if (opt->pdu_type & 0x0F) {
-					/* Support the minimal option only. */
-					fprintf(stderr,
-						"Error - GTP PSC option with extra fields not supported\n");
-					goto error;
-				}
 				psc.len = sizeof(psc);
-				psc.pdu_type = opt->pdu_type;
-				psc.qfi = opt->qfi;
+				psc.pdu_type = opt->hdr.type;
+				psc.qfi = opt->hdr.qfi;
 				psc.next = 0;
 				*total_size += sizeof(psc);
 				rte_memcpy(data_tail - (*total_size),
doc/guides/testpmd_app_ug/testpmd_funcs.rst +1 -1
index 4f8751be1c..bbef706374 100644
@@ -3788,7 +3788,7 @@ This section lists supported pattern items and their attributes, if any.
 
   - ``pdu_type {unsigned}``: PDU type.
 
-  - ``qfi {unsigned}``: PPP, RQI and QoS flow identifier.
+  - ``qfi {unsigned}``: QoS flow identifier.
 
 - ``pppoes``, ``pppoed``: match PPPoE header.
 
drivers/net/iavf/iavf_fdir.c +5 -4
index da3eec8b59..8f56342762 100644
@@ -1160,15 +1160,16 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 
 			if (!gtp_psc_spec)
 				VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH);
-			else if ((gtp_psc_mask->qfi) && !(gtp_psc_mask->pdu_type))
+			else if ((gtp_psc_mask->hdr.qfi) &&
+				!(gtp_psc_mask->hdr.type))
 				VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH);
-			else if (gtp_psc_spec->pdu_type == IAVF_GTPU_EH_UPLINK)
+			else if (gtp_psc_spec->hdr.type == IAVF_GTPU_EH_UPLINK)
 				VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH_PDU_UP);
-			else if (gtp_psc_spec->pdu_type == IAVF_GTPU_EH_DWLINK)
+			else if (gtp_psc_spec->hdr.type == IAVF_GTPU_EH_DWLINK)
 				VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH_PDU_DWN);
 
 			if (gtp_psc_spec && gtp_psc_mask) {
-				if (gtp_psc_mask->qfi == UINT8_MAX) {
+				if (gtp_psc_mask->hdr.qfi == 0x3F) {
 					input_set |= IAVF_INSET_GTPU_QFI;
 					VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, GTPU_EH, QFI);
 				}
drivers/net/iavf/iavf_hash.c +2 -2
index 2b03dad858..144f4277d0 100644
@@ -731,9 +731,9 @@ iavf_hash_parse_pattern(const struct rte_flow_item pattern[], uint64_t *phint,
 			psc = item->spec;
 			if (!psc)
 				break;
-			else if (psc->pdu_type == IAVF_GTPU_EH_UPLINK)
+			else if (psc->hdr.type == IAVF_GTPU_EH_UPLINK)
 				*phint |= IAVF_PHINT_GTPU_EH_UP;
-			else if (psc->pdu_type == IAVF_GTPU_EH_DWNLINK)
+			else if (psc->hdr.type == IAVF_GTPU_EH_DWNLINK)
 				*phint |= IAVF_PHINT_GTPU_EH_DWN;
 			break;
 		case RTE_FLOW_ITEM_TYPE_ECPRI:
drivers/net/ice/ice_fdir_filter.c +2 -2
index 82adb1fc8b..3a7ef270af 100644
@@ -2104,11 +2104,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
 			if (!(gtp_psc_spec && gtp_psc_mask))
 				break;
 
-			if (gtp_psc_mask->qfi == UINT8_MAX)
+			if (gtp_psc_mask->hdr.qfi == 0x3F)
 				input_set_o |= ICE_INSET_GTPU_QFI;
 
 			filter->input.gtpu_data.qfi =
-				gtp_psc_spec->qfi;
+				gtp_psc_spec->hdr.qfi;
 			break;
 		case RTE_FLOW_ITEM_TYPE_ESP:
 			if (l3 == RTE_FLOW_ITEM_TYPE_IPV4 &&
drivers/net/ice/ice_hash.c +2 -2
index 54d14dfcdd..caf1bfa40f 100644
@@ -619,9 +619,9 @@ ice_hash_parse_pattern(const struct rte_flow_item pattern[], uint64_t *phint,
 			psc = item->spec;
 			if (!psc)
 				break;
-			else if (psc->pdu_type == ICE_GTPU_EH_UPLINK)
+			else if (psc->hdr.type == ICE_GTPU_EH_UPLINK)
 				*phint |= ICE_PHINT_GTPU_EH_UP;
-			else if (psc->pdu_type == ICE_GTPU_EH_DWNLINK)
+			else if (psc->hdr.type == ICE_GTPU_EH_DWNLINK)
 				*phint |= ICE_PHINT_GTPU_EH_DWN;
 			break;
 		default:
drivers/net/ice/ice_switch_filter.c +4 -4
index eeed386c63..e44c50ff3d 100644
@@ -1350,7 +1350,7 @@ ice_switch_parse_pattern(const struct rte_flow_item pattern[],
 				return false;
 			}
 			if (gtp_psc_spec && gtp_psc_mask) {
-				if (gtp_psc_mask->pdu_type) {
+				if (gtp_psc_mask->hdr.type) {
 					rte_flow_error_set(error, EINVAL,
 						RTE_FLOW_ERROR_TYPE_ITEM,
 						item,
@@ -1358,13 +1358,13 @@ ice_switch_parse_pattern(const struct rte_flow_item pattern[],
 					return false;
 				}
 				input = &outer_input_set;
-				if (gtp_psc_mask->qfi)
+				if (gtp_psc_mask->hdr.qfi)
 					*input |= ICE_INSET_GTPU_QFI;
 				list[t].type = ICE_GTP;
 				list[t].h_u.gtp_hdr.qfi =
-					gtp_psc_spec->qfi;
+					gtp_psc_spec->hdr.qfi;
 				list[t].m_u.gtp_hdr.qfi =
-					gtp_psc_mask->qfi;
+					gtp_psc_mask->hdr.qfi;
 				input_set_byte += 1;
 				t++;
 			}
drivers/net/mlx5/mlx5_flow.h +0 -3
index 76ad53f2a1..5c68d4f7d7 100644
@@ -397,9 +397,6 @@ enum mlx5_feature_name {
 /* GTP extension header flag. */
 #define MLX5_GTP_EXT_HEADER_FLAG 4
 
-/* GTP extension header max PDU type value. */
-#define MLX5_GTP_EXT_MAX_PDU_TYPE 15
-
 /* GTP extension header PDU type shift. */
 #define MLX5_GTP_PDU_TYPE_SHIFT(a) ((a) << 4)
 
drivers/net/mlx5/mlx5_flow_dv.c +7 -13
index 31d857030f..a54defa45f 100644
@@ -2412,11 +2412,10 @@ flow_dv_validate_item_gtp_psc(const struct rte_flow_item *item,
 {
 	const struct rte_flow_item_gtp *gtp_spec;
 	const struct rte_flow_item_gtp *gtp_mask;
-	const struct rte_flow_item_gtp_psc *spec;
 	const struct rte_flow_item_gtp_psc *mask;
 	const struct rte_flow_item_gtp_psc nic_mask = {
-		.pdu_type = 0xFF,
-		.qfi = 0xFF,
+		.hdr.type = 0xF,
+		.hdr.qfi = 0x3F,
 	};
 
 	if (!gtp_item || !(last_item & MLX5_FLOW_LAYER_GTP))
@@ -2440,12 +2439,7 @@ flow_dv_validate_item_gtp_psc(const struct rte_flow_item *item,
 	/* GTP spec is here and E flag is requested to match zero. */
 	if (!item->spec)
 		return 0;
-	spec = item->spec;
 	mask = item->mask ? item->mask : &rte_flow_item_gtp_psc_mask;
-	if (spec->pdu_type > MLX5_GTP_EXT_MAX_PDU_TYPE)
-		return rte_flow_error_set
-			(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item,
-			 "PDU type should be smaller than 16");
 	return mlx5_flow_item_acceptable(item, (const uint8_t *)mask,
 					 (const uint8_t *)&nic_mask,
 					 sizeof(struct rte_flow_item_gtp_psc),
@@ -9951,14 +9945,14 @@ flow_dv_translate_item_gtp_psc(void *matcher, void *key,
 		if (!gtp_psc_m)
 			gtp_psc_m = &rte_flow_item_gtp_psc_mask;
 		dw_0.w32 = 0;
-		dw_0.type_flags = MLX5_GTP_PDU_TYPE_SHIFT(gtp_psc_m->pdu_type);
-		dw_0.qfi = gtp_psc_m->qfi;
+		dw_0.type_flags = MLX5_GTP_PDU_TYPE_SHIFT(gtp_psc_m->hdr.type);
+		dw_0.qfi = gtp_psc_m->hdr.qfi;
 		MLX5_SET(fte_match_set_misc3, misc3_m, gtpu_first_ext_dw_0,
 			 rte_cpu_to_be_32(dw_0.w32));
 		dw_0.w32 = 0;
-		dw_0.type_flags = MLX5_GTP_PDU_TYPE_SHIFT(gtp_psc_v->pdu_type &
-							gtp_psc_m->pdu_type);
-		dw_0.qfi = gtp_psc_v->qfi & gtp_psc_m->qfi;
+		dw_0.type_flags = MLX5_GTP_PDU_TYPE_SHIFT(gtp_psc_v->hdr.type &
+							gtp_psc_m->hdr.type);
+		dw_0.qfi = gtp_psc_v->hdr.qfi & gtp_psc_m->hdr.qfi;
 		MLX5_SET(fte_match_set_misc3, misc3_v, gtpu_first_ext_dw_0,
 			 rte_cpu_to_be_32(dw_0.w32));
 	}
lib/ethdev/rte_flow.h +3 -3
index 70f455d47d..7b1ed7f110 100644
@@ -34,6 +34,7 @@
 #include <rte_mbuf.h>
 #include <rte_mbuf_dyn.h>
 #include <rte_meter.h>
+#include <rte_gtp.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -1444,15 +1445,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = {
  * Matches a GTP PDU extension header with type 0x85.
  */
 struct rte_flow_item_gtp_psc {
-	uint8_t pdu_type; /**< PDU type. */
-	uint8_t qfi; /**< PPP, RQI, QoS flow identifier. */
+	struct rte_gtp_psc_generic_hdr hdr; /**< gtp psc generic hdr. */
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_GTP_PSC. */
 #ifndef __cplusplus
 static const struct rte_flow_item_gtp_psc
 rte_flow_item_gtp_psc_mask = {
-	.qfi = 0xff,
+	.hdr.qfi = 0x3f,
 };
 #endif
 
Signature · 1 line
2.25.1
#15 lore raw

Re: [dpdk-dev] [PATCH v7 0/2] update gtp psc to use net hdr

In reply to Raslan Darawsheh
Quoted 8 lines · Raslan Darawsheh

This series add header definition for gtp_psc in the net library, and update the relevant rte_flow_item gtp_psc to use this new header definition.

Raslan Darawsheh (2):
net: add new ext hdr for gtp psc
ethdev: use ext hdr for gtp psc item

Rebased on top latest next-net, need to update 'iavf_fdir.c'.

Series applied to dpdk-next-net/main, thanks.