patch 'net/nfp: fix resource leak for PF initialization' has been queued to stable release 23.11.1
Xueming Li
xuemingl at nvidia.com
Tue Mar 5 10:46:56 CET 2024
Hi,
FYI, your patch has been queued to stable release 23.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/31/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=02916557c12578a78bef1e837aa2b4bb923bca80
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 02916557c12578a78bef1e837aa2b4bb923bca80 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Mon, 4 Dec 2023 09:57:14 +0800
Subject: [PATCH] net/nfp: fix resource leak for PF initialization
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 ]
Fix the resource leak problem in the abnormal logic of PF initialize
function.
Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file")
Fixes: 8ba461d1eecc ("net/nfp: introduce keepalive mechanism for multiple PF")
Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
---
drivers/net/nfp/nfp_ethdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 38ee1c399a..bb0ddf3d54 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -1326,12 +1326,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
return 0;
hwqueues_cleanup:
- nfp_cpp_area_free(pf_dev->qc_area);
+ nfp_cpp_area_release_free(pf_dev->qc_area);
sym_tbl_cleanup:
free(sym_tbl);
fw_cleanup:
nfp_fw_unload(cpp);
nfp_net_keepalive_stop(&pf_dev->multi_pf);
+ nfp_net_keepalive_uninit(&pf_dev->multi_pf);
eth_table_cleanup:
free(nfp_eth_table);
hwinfo_cleanup:
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-03-05 17:39:33.280678476 +0800
+++ 0075-net-nfp-fix-resource-leak-for-PF-initialization.patch 2024-03-05 17:39:30.813566494 +0800
@@ -1 +1 @@
-From 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 Mon Sep 17 00:00:00 2001
+From 02916557c12578a78bef1e837aa2b4bb923bca80 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index c132e97d1a..6fdde105ba 100644
+index 38ee1c399a..bb0ddf3d54 100644
@@ -24 +26 @@
-@@ -1333,12 +1333,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
+@@ -1326,12 +1326,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
More information about the stable
mailing list