patch 'app/testpmd: fix aged flow destroy' has been queued to stable release 23.11.3
Xueming Li
xuemingl at nvidia.com
Sat Dec 7 09:00:41 CET 2024
Hi,
FYI, your patch has been queued to stable release 23.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 12/10/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=44ba5aae390e412a09968b2aca2f80cd2c4ec06b
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 44ba5aae390e412a09968b2aca2f80cd2c4ec06b Mon Sep 17 00:00:00 2001
From: Danylo Vodopianov <dvo-plv at napatech.com>
Date: Mon, 18 Nov 2024 19:03:23 +0100
Subject: [PATCH] app/testpmd: fix aged flow destroy
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 098f949f8a70f7618f5390f9c1e9edfb9e5469c4 ]
port_flow_destroy() function never assumed that rule array can be freed
when it's executing, and port_flow_aged() just violated that assumption.
In case of flow async create failure, it tries to do a cleanup, but it
wrongly removes a 1st flow (with id 0). pf->id is not set at this
moment and it always is 0, thus 1st flow is removed. A local copy of
flow->id must be used to call of port_flow_destroy() to avoid access
and processing of flow->id after the flow is removed.
Fixes: de956d5ecf08 ("app/testpmd: support age shared action context")
Signed-off-by: Danylo Vodopianov <dvo-plv at napatech.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
app/test-pmd/config.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 40e4e83fb8..ff2e9da324 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3913,8 +3913,10 @@ port_flow_aged(portid_t port_id, uint8_t destroy)
}
type = (enum age_action_context_type *)contexts[idx];
switch (*type) {
- case ACTION_AGE_CONTEXT_TYPE_FLOW:
+ case ACTION_AGE_CONTEXT_TYPE_FLOW: {
+ uint64_t flow_id;
ctx.pf = container_of(type, struct port_flow, age_type);
+ flow_id = ctx.pf->id;
printf("%-20s\t%" PRIu64 "\t%" PRIu32 "\t%" PRIu32
"\t%c%c%c\t\n",
"Flow",
@@ -3925,9 +3927,10 @@ port_flow_aged(portid_t port_id, uint8_t destroy)
ctx.pf->rule.attr->egress ? 'e' : '-',
ctx.pf->rule.attr->transfer ? 't' : '-');
if (destroy && !port_flow_destroy(port_id, 1,
- &ctx.pf->id, false))
+ &flow_id, false))
total++;
break;
+ }
case ACTION_AGE_CONTEXT_TYPE_INDIRECT_ACTION:
ctx.pia = container_of(type,
struct port_indirect_action, age_type);
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-12-06 23:26:46.863741505 +0800
+++ 0083-app-testpmd-fix-aged-flow-destroy.patch 2024-12-06 23:26:44.093044826 +0800
@@ -1 +1 @@
-From 098f949f8a70f7618f5390f9c1e9edfb9e5469c4 Mon Sep 17 00:00:00 2001
+From 44ba5aae390e412a09968b2aca2f80cd2c4ec06b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 098f949f8a70f7618f5390f9c1e9edfb9e5469c4 ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -25 +27 @@
-index c831166431..28d45568ac 100644
+index 40e4e83fb8..ff2e9da324 100644
@@ -28 +30 @@
-@@ -4160,8 +4160,10 @@ port_flow_aged(portid_t port_id, uint8_t destroy)
+@@ -3913,8 +3913,10 @@ port_flow_aged(portid_t port_id, uint8_t destroy)
@@ -40 +42 @@
-@@ -4172,9 +4174,10 @@ port_flow_aged(portid_t port_id, uint8_t destroy)
+@@ -3925,9 +3927,10 @@ port_flow_aged(portid_t port_id, uint8_t destroy)
More information about the stable
mailing list