patch 'net/iavf: fix GTP-U extension flow' has been queued to stable release 21.11.2

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 21.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 07/14/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/9e7d93ae2f99123324b90aae18dd5eb152c3a9b8

Thanks.

Luca Boccassi

---
>From 9e7d93ae2f99123324b90aae18dd5eb152c3a9b8 Mon Sep 17 00:00:00 2001
From: Wenxuan Wu <wenxuanx.wu at intel.com>
Date: Wed, 6 Jul 2022 10:56:26 +0800
Subject: [PATCH] net/iavf: fix GTP-U extension flow

[ upstream commit 755fd7b22da9115fc6682c2cf9e9268bb26bfb38 ]

Due to the change of struct rte_gtp_psc_generic_hdr, kernel driver can
not handle gtp_psc properly, we introduce a new structure to fix this
gap between kernel driver and struct rte_gtp_psc_generic_hdr.

Fixes: d5eb3e600d9e ("net/iavf: support flow director basic rule")

Signed-off-by: Wenxuan Wu <wenxuanx.wu at intel.com>
Tested-by: Zhimin Huang <zhiminx.huang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/iavf/iavf_fdir.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c
index b63aaca91d..6b847894d8 100644
--- a/drivers/net/iavf/iavf_fdir.c
+++ b/drivers/net/iavf/iavf_fdir.c
@@ -1185,8 +1185,22 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 										 GTPU_DWN, QFI);
 				}
 
-				rte_memcpy(hdr->buffer, gtp_psc_spec,
-					sizeof(*gtp_psc_spec));
+				/*
+				 * New structure to fix gap between kernel driver and
+				 * rte_gtp_psc_generic_hdr.
+				 */
+				struct iavf_gtp_psc_spec_hdr {
+					uint8_t len;
+					uint8_t qfi:6;
+					uint8_t type:4;
+					uint8_t next;
+				} psc;
+				psc.len = gtp_psc_spec->hdr.ext_hdr_len;
+				psc.qfi = gtp_psc_spec->hdr.qfi;
+				psc.type = gtp_psc_spec->hdr.type;
+				psc.next = 0;
+				rte_memcpy(hdr->buffer, &psc,
+					sizeof(struct iavf_gtp_psc_spec_hdr));
 			}
 
 			hdrs->count = ++layer;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-12 20:22:33.883126609 +0100
+++ 0005-net-iavf-fix-GTP-U-extension-flow.patch	2022-07-12 20:22:33.713247244 +0100
@@ -1 +1 @@
-From 755fd7b22da9115fc6682c2cf9e9268bb26bfb38 Mon Sep 17 00:00:00 2001
+From 9e7d93ae2f99123324b90aae18dd5eb152c3a9b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 755fd7b22da9115fc6682c2cf9e9268bb26bfb38 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index f236260502..4789d46ab2 100644
+index b63aaca91d..6b847894d8 100644
@@ -24 +25 @@
-@@ -1300,8 +1300,22 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
+@@ -1185,8 +1185,22 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,