patch 'ethdev: fix indirect action conversion' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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/25/23. 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/c11ee881c2f6e0fa282e0814d999c82da99cad23

Thanks.

Kevin

---
>From c11ee881c2f6e0fa282e0814d999c82da99cad23 Mon Sep 17 00:00:00 2001
From: Suanming Mou <suanmingm at nvidia.com>
Date: Fri, 26 May 2023 06:18:00 +0300
Subject: [PATCH] ethdev: fix indirect action conversion

[ upstream commit fb131e295ea838f062278fa63f21c89a4f080d21 ]

As indirect action conf fills the indirect action handler, while
converting indirect action, the action conf(action handler) should
be copied from original indirect action conf instead of duplicating
the action handler memory.

Fixes: 4b61b8774be9 ("ethdev: introduce indirect flow action")

Signed-off-by: Suanming Mou <suanmingm at nvidia.com>
Acked-by: Ori Kam <orika at nvidia.com>
---
 lib/ethdev/rte_flow.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c
index a93f68abbc..b311dd2a00 100644
--- a/lib/ethdev/rte_flow.c
+++ b/lib/ethdev/rte_flow.c
@@ -858,5 +858,13 @@ rte_flow_conv_actions(struct rte_flow_action *dst,
 	dst -= num;
 	do {
-		if (src->conf) {
+		if (src->type == RTE_FLOW_ACTION_TYPE_INDIRECT) {
+			/*
+			 * Indirect action conf fills the indirect action
+			 * handler. Copy the action handle directly instead
+			 * of duplicating the pointer memory.
+			 */
+			if (size)
+				dst->conf = src->conf;
+		} else if (src->conf) {
 			off = RTE_ALIGN_CEIL(off, sizeof(double));
 			ret = rte_flow_conv_action_conf
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:17:59.173538880 +0100
+++ 0034-ethdev-fix-indirect-action-conversion.patch	2023-07-20 16:17:54.585750197 +0100
@@ -1 +1 @@
-From fb131e295ea838f062278fa63f21c89a4f080d21 Mon Sep 17 00:00:00 2001
+From c11ee881c2f6e0fa282e0814d999c82da99cad23 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fb131e295ea838f062278fa63f21c89a4f080d21 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index bcc1982224..494c82932d 100644
+index a93f68abbc..b311dd2a00 100644
@@ -24 +25 @@
-@@ -920,5 +920,13 @@ rte_flow_conv_actions(struct rte_flow_action *dst,
+@@ -858,5 +858,13 @@ rte_flow_conv_actions(struct rte_flow_action *dst,