[dpdk-stable] patch 'ethdev: update flow item GTP QFI definition' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/12/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/5ecc163bf94f95ca73365d5d6b940dad3c425761

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 5ecc163bf94f95ca73365d5d6b940dad3c425761 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland at nvidia.com>
Date: Tue, 23 Mar 2021 14:11:34 +0200
Subject: [PATCH] ethdev: update flow item GTP QFI definition
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 7d96f5717a693546933aff4f6623c94976150c5b ]

'qfi' field is 8 bits which represent single bit for
PPP (paging Policy Presence) single bit for RQI
(Reflective QoS Indicator) and 6 bits for QFI
(QoS Flow Identifier)
This is based on RFC 38415-g30
https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip

Updated the doxygen comment and the mask for 'qfi'
to properly identify the full 8 bits of the field.

note: changing the default mask would cause different
patterns generated by testpmd.

Fixes: 346553db5bd1 ("ethdev: add GTP extension header to flow API")

Signed-off-by: Raslan Darawsheh <rasland at nvidia.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 3 ++-
 lib/librte_ethdev/rte_flow.h                | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 6a00245fc8..3187756892 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3729,7 +3729,8 @@ This section lists supported pattern items and their attributes, if any.
 - ``gtp_psc``: match GTP PDU extension header with type 0x85.
 
   - ``pdu_type {unsigned}``: PDU type.
-  - ``qfi {unsigned}``: QoS flow identifier.
+
+  - ``qfi {unsigned}``: PPP, RQI and QoS flow identifier.
 
 - ``pppoes``, ``pppoed``: match PPPoE header.
 
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index 0977a78270..3ecf65e3ee 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -1385,14 +1385,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = {
  */
 struct rte_flow_item_gtp_psc {
 	uint8_t pdu_type; /**< PDU type. */
-	uint8_t qfi; /**< QoS flow identifier. */
+	uint8_t qfi; /**< PPP, RQI, QoS flow identifier. */
 };
 
 /** 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 = 0x3f,
+	.qfi = 0xff,
 };
 #endif
 
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:31.504402300 +0800
+++ 0191-ethdev-update-flow-item-GTP-QFI-definition.patch	2021-05-10 23:59:26.650000000 +0800
@@ -1 +1 @@
-From 7d96f5717a693546933aff4f6623c94976150c5b Mon Sep 17 00:00:00 2001
+From 5ecc163bf94f95ca73365d5d6b940dad3c425761 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 7d96f5717a693546933aff4f6623c94976150c5b ]
@@ -20 +22,0 @@
-Cc: stable at dpdk.org
@@ -30 +32 @@
-index 72667dedb1..711683fa11 100644
+index 6a00245fc8..3187756892 100644
@@ -33 +35 @@
-@@ -3767,7 +3767,8 @@ This section lists supported pattern items and their attributes, if any.
+@@ -3729,7 +3729,8 @@ This section lists supported pattern items and their attributes, if any.
@@ -44 +46 @@
-index 5eba79d26f..203c4cde9a 100644
+index 0977a78270..3ecf65e3ee 100644
@@ -47 +49 @@
-@@ -1423,14 +1423,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = {
+@@ -1385,14 +1385,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = {