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

Xueming Li xuemingl at nvidia.com
Sun Jun 25 08:34:21 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/27/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=a678d7da2bb89250de2ac578ad110522906bf7d0

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From a678d7da2bb89250de2ac578ad110522906bf7d0 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 7d0c24366c..1a67a987f5 100644
--- a/lib/ethdev/rte_flow.c
+++ b/lib/ethdev/rte_flow.c
@@ -855,7 +855,15 @@ rte_flow_conv_actions(struct rte_flow_action *dst,
 	src -= num;
 	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
 				((void *)(data + off),
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-06-25 14:31:59.676166800 +0800
+++ 0043-ethdev-fix-indirect-action-conversion.patch	2023-06-25 14:31:58.355773900 +0800
@@ -1 +1 @@
-From fb131e295ea838f062278fa63f21c89a4f080d21 Mon Sep 17 00:00:00 2001
+From a678d7da2bb89250de2ac578ad110522906bf7d0 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit fb131e295ea838f062278fa63f21c89a4f080d21 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index bcc1982224..494c82932d 100644
+index 7d0c24366c..1a67a987f5 100644
@@ -24 +26 @@
-@@ -919,7 +919,15 @@ rte_flow_conv_actions(struct rte_flow_action *dst,
+@@ -855,7 +855,15 @@ rte_flow_conv_actions(struct rte_flow_action *dst,


More information about the stable mailing list