patch 'ethdev: fix GENEVE option item conversion' has been queued to stable release 21.11.8

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.8

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/24. 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/bff85ec3d12bd3e8afa238d1eb21867019f8ef04

Thanks.

Kevin

---
>From bff85ec3d12bd3e8afa238d1eb21867019f8ef04 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Mon, 15 Jul 2024 15:13:16 +0300
Subject: [PATCH] ethdev: fix GENEVE option item conversion

[ upstream commit 841a0445442de154441ac2b4700658a9eb83c986 ]

The "rte_flow_conv()" function, enables, among other things, to copy
item list.

For GENEVE option item, the function copies it without considering deep
copy. It copies the "data" pointer without copying the pointed values.

This patch adds deep copy for after regular copy.

Fixes: 2b4c72b4d10d ("ethdev: introduce GENEVE header TLV option item")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 lib/ethdev/rte_flow.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c
index 2df4418aa9..a82dc48264 100644
--- a/lib/ethdev/rte_flow.c
+++ b/lib/ethdev/rte_flow.c
@@ -550,4 +550,5 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
 		union {
 			const struct rte_flow_item_raw *raw;
+			const struct rte_flow_item_geneve_opt *geneve_opt;
 		} spec;
 		union {
@@ -559,8 +560,11 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
 		union {
 			const struct rte_flow_item_raw *raw;
+			const struct rte_flow_item_geneve_opt *geneve_opt;
 		} src;
 		union {
 			struct rte_flow_item_raw *raw;
+			struct rte_flow_item_geneve_opt *geneve_opt;
 		} dst;
+		void *deep_src;
 		size_t tmp;
 
@@ -591,11 +595,28 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
 		if (tmp) {
 			off = RTE_ALIGN_CEIL(off, sizeof(*dst.raw->pattern));
-			if (size >= off + tmp)
-				dst.raw->pattern = rte_memcpy
-					((void *)((uintptr_t)dst.raw + off),
-					 src.raw->pattern, tmp);
+			if (size >= off + tmp) {
+				deep_src = (void *)((uintptr_t)dst.raw + off);
+				dst.raw->pattern = rte_memcpy(deep_src,
+							      src.raw->pattern,
+							      tmp);
+			}
 			off += tmp;
 		}
 		break;
+	case RTE_FLOW_ITEM_TYPE_GENEVE_OPT:
+		off = rte_flow_conv_copy(buf, data, size,
+					 rte_flow_desc_item, item->type);
+		spec.geneve_opt = item->spec;
+		src.geneve_opt = data;
+		dst.geneve_opt = buf;
+		tmp = spec.geneve_opt->option_len << 2;
+		if (size > 0 && src.geneve_opt->data) {
+			deep_src = (void *)((uintptr_t)(dst.geneve_opt + 1));
+			dst.geneve_opt->data = rte_memcpy(deep_src,
+							  src.geneve_opt->data,
+							  tmp);
+		}
+		off += tmp;
+		break;
 	default:
 		off = rte_flow_conv_copy(buf, data, size,
-- 
2.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:13.438141703 +0100
+++ 0124-ethdev-fix-GENEVE-option-item-conversion.patch	2024-08-23 17:18:09.886430685 +0100
@@ -1 +1 @@
-From 841a0445442de154441ac2b4700658a9eb83c986 Mon Sep 17 00:00:00 2001
+From bff85ec3d12bd3e8afa238d1eb21867019f8ef04 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 841a0445442de154441ac2b4700658a9eb83c986 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index ca2f85c3fa..4076ae4ee1 100644
+index 2df4418aa9..a82dc48264 100644
@@ -27 +28 @@
-@@ -624,4 +624,5 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
+@@ -550,4 +550,5 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
@@ -33 +34 @@
-@@ -633,8 +634,11 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
+@@ -559,8 +560,11 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
@@ -45 +46 @@
-@@ -665,11 +669,28 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
+@@ -591,11 +595,28 @@ rte_flow_conv_item_spec(void *buf, const size_t size,