patch 'common/cnxk: fix double free of flow aging resources' has been queued to stable release 23.11.3
Xueming Li
xuemingl at nvidia.com
Sat Dec 7 08:59:25 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=53018798593ac88d8b364b32f5b85ad3ce42f8a8
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 53018798593ac88d8b364b32f5b85ad3ce42f8a8 Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra at marvell.com>
Date: Wed, 23 Oct 2024 20:31:37 +0530
Subject: [PATCH] common/cnxk: fix double free of flow aging resources
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit d1066ea60bcb5cbd3cdcc06d21afc232d8c08407 ]
As part of NPC tear down sequence flow aging resources are
cleaned up while they were already cleaned up when last flow
with aging action was removed. This leads to double free of
some resources.
Fixes: 85e9542d4700 ("common/cnxk: fix flow aging cleanup")
Signed-off-by: Harman Kalra <hkalra at marvell.com>
---
drivers/common/cnxk/roc_npc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
index fcede1d0b7..9ea96a524c 100644
--- a/drivers/common/cnxk/roc_npc.c
+++ b/drivers/common/cnxk/roc_npc.c
@@ -351,7 +351,8 @@ roc_npc_fini(struct roc_npc *roc_npc)
struct npc *npc = roc_npc_to_npc_priv(roc_npc);
int rc;
- npc_aging_ctrl_thread_destroy(roc_npc);
+ if (!roc_npc->flow_age.aged_flows_get_thread_exit)
+ npc_aging_ctrl_thread_destroy(roc_npc);
rc = npc_flow_free_all_resources(npc);
if (rc) {
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-12-06 23:26:44.374040223 +0800
+++ 0007-common-cnxk-fix-double-free-of-flow-aging-resources.patch 2024-12-06 23:26:43.853044829 +0800
@@ -1 +1 @@
-From d1066ea60bcb5cbd3cdcc06d21afc232d8c08407 Mon Sep 17 00:00:00 2001
+From 53018798593ac88d8b364b32f5b85ad3ce42f8a8 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit d1066ea60bcb5cbd3cdcc06d21afc232d8c08407 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 8a951b6360..2b3c90683c 100644
+index fcede1d0b7..9ea96a524c 100644
@@ -23 +25 @@
-@@ -389,7 +389,8 @@ roc_npc_fini(struct roc_npc *roc_npc)
+@@ -351,7 +351,8 @@ roc_npc_fini(struct roc_npc *roc_npc)
More information about the stable
mailing list