[dpdk-stable] patch 'net/hns3: fix memory leak on secondary process exit' has been queued to stable release 20.11.1
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Fri Feb 5 12:19:07 CET 2021
Hi,
FYI, your patch has been queued to stable release 20.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 02/07/21. 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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/89796f0f761f83447edd0c26f1b93f79a7059b16
Thanks.
Luca Boccassi
---
>From 89796f0f761f83447edd0c26f1b93f79a7059b16 Mon Sep 17 00:00:00 2001
From: Lijun Ou <oulijun at huawei.com>
Date: Fri, 22 Jan 2021 18:18:46 +0800
Subject: [PATCH] net/hns3: fix memory leak on secondary process exit
[ upstream commit 4101114586e42e3dfb0dee2e5b054dee3074e63f ]
The secondary process is applied a memory for the process_private
during initialization. Therefore, the memory needs to be released
when exiting.
Fixes: c203571b3602 ("net/hns3: register and add log interface")
Signed-off-by: Lijun Ou <oulijun at huawei.com>
---
drivers/net/hns3/hns3_ethdev.c | 7 +++++--
drivers/net/hns3/hns3_ethdev_vf.c | 12 +++++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 03d6df716d..ac1c1c0c64 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -6226,8 +6226,11 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
PMD_INIT_FUNC_TRACE();
- if (rte_eal_process_type() != RTE_PROC_PRIMARY)
- return -EPERM;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ rte_free(eth_dev->process_private);
+ eth_dev->process_private = NULL;
+ return 0;
+ }
if (hw->adapter_state < HNS3_NIC_CLOSING)
hns3_dev_close(eth_dev);
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 32e35dc463..291166c461 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1977,8 +1977,11 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
struct hns3_hw *hw = &hns->hw;
int ret = 0;
- if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ rte_free(eth_dev->process_private);
+ eth_dev->process_private = NULL;
return 0;
+ }
if (hw->adapter_state == HNS3_NIC_STARTED)
ret = hns3vf_dev_stop(eth_dev);
@@ -2848,8 +2851,11 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
PMD_INIT_FUNC_TRACE();
- if (rte_eal_process_type() != RTE_PROC_PRIMARY)
- return -EPERM;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ rte_free(eth_dev->process_private);
+ eth_dev->process_private = NULL;
+ return 0;
+ }
if (hw->adapter_state < HNS3_NIC_CLOSING)
hns3vf_dev_close(eth_dev);
--
2.29.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-02-05 11:18:40.679668434 +0000
+++ 0261-net-hns3-fix-memory-leak-on-secondary-process-exit.patch 2021-02-05 11:18:29.302700555 +0000
@@ -1 +1 @@
-From 4101114586e42e3dfb0dee2e5b054dee3074e63f Mon Sep 17 00:00:00 2001
+From 89796f0f761f83447edd0c26f1b93f79a7059b16 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4101114586e42e3dfb0dee2e5b054dee3074e63f ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index c5dccec5ae..b89bc48714 100644
+index 03d6df716d..ac1c1c0c64 100644
@@ -23 +24 @@
-@@ -6263,8 +6263,11 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
+@@ -6226,8 +6226,11 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -38 +39 @@
-index 063f2f5c2f..5bf8c2e8fd 100644
+index 32e35dc463..291166c461 100644
@@ -41 +42 @@
-@@ -1971,8 +1971,11 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
+@@ -1977,8 +1977,11 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
@@ -54 +55 @@
-@@ -2839,8 +2842,11 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
+@@ -2848,8 +2851,11 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
More information about the stable
mailing list