patch 'ethdev: fix memory leak in xstats telemetry' has been queued to stable release 20.11.6

Xueming Li xuemingl at nvidia.com
Tue Jun 21 10:02:21 CEST 2022


Hi,

FYI, your patch has been queued to stable release 20.11.6

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/23/22. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/7386b53220564c4f10aefdadd9ccb09bc37f2216

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 7386b53220564c4f10aefdadd9ccb09bc37f2216 Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Fri, 13 May 2022 10:53:55 +0800
Subject: [PATCH] ethdev: fix memory leak in xstats telemetry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 2d00e2b4382d6538d305fc6f3606ecea72011f5b ]

The 'eth_xstats' should be freed after telemetry dictionary setup.

Fixes: c190daedb9b1 ("ethdev: add telemetry callbacks")

Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
Acked-by: Morten Brørup <mb at smartsharesystems.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 lib/librte_ethdev/rte_ethdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 028d16f99e..8df4b0f6ac 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -5721,6 +5721,7 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused,
 	for (i = 0; i < num_xstats; i++)
 		rte_tel_data_add_dict_u64(d, xstat_names[i].name,
 				eth_xstats[i].value);
+	free(eth_xstats);
 	return 0;
 }
 
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-21 15:37:52.666404356 +0800
+++ 0075-ethdev-fix-memory-leak-in-xstats-telemetry.patch	2022-06-21 15:37:49.114451524 +0800
@@ -1 +1 @@
-From 2d00e2b4382d6538d305fc6f3606ecea72011f5b Mon Sep 17 00:00:00 2001
+From 7386b53220564c4f10aefdadd9ccb09bc37f2216 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 2d00e2b4382d6538d305fc6f3606ecea72011f5b ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
- lib/ethdev/rte_ethdev.c | 1 +
+ lib/librte_ethdev/rte_ethdev.c | 1 +
@@ -21,5 +23,5 @@
-diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
-index 10db76c1a6..dc47543e6b 100644
---- a/lib/ethdev/rte_ethdev.c
-+++ b/lib/ethdev/rte_ethdev.c
-@@ -5595,6 +5595,7 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused,
+diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
+index 028d16f99e..8df4b0f6ac 100644
+--- a/lib/librte_ethdev/rte_ethdev.c
++++ b/lib/librte_ethdev/rte_ethdev.c
+@@ -5721,6 +5721,7 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused,


More information about the stable mailing list