patch 'malloc: remove return from void functions' has been queued to stable release 20.11.10

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Nov 8 20:24:59 CET 2023


Hi,

FYI, your patch has been queued to stable release 20.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/10/23. 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/3c037d05500c38b7accf25a4ef00762ef019f625

Thanks.

Luca Boccassi

---
>From 3c037d05500c38b7accf25a4ef00762ef019f625 Mon Sep 17 00:00:00 2001
From: Tyler Retzlaff <roretzla at linux.microsoft.com>
Date: Tue, 17 Oct 2023 06:03:39 -0700
Subject: [PATCH] malloc: remove return from void functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ]

Remove return from rte_free and eal_free_no_trace both functions are
declared to have a return type of void so they shouldn't return a value.

Fixes: 52f409d614a0 ("trace: add memory tracepoints")

Signed-off-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
Reviewed-by: Morten Brørup <mb at smartsharesystems.com>
---
 lib/librte_eal/common/rte_malloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c
index 9d39e58c08..684af4e1fc 100644
--- a/lib/librte_eal/common/rte_malloc.c
+++ b/lib/librte_eal/common/rte_malloc.c
@@ -46,13 +46,13 @@ mem_free(void *addr, const bool trace_ena)
 void
 rte_free(void *addr)
 {
-	return mem_free(addr, true);
+	mem_free(addr, true);
 }
 
 void
 eal_free_no_trace(void *addr)
 {
-	return mem_free(addr, false);
+	mem_free(addr, false);
 }
 
 static void *
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-08 19:23:51.952816220 +0000
+++ 0001-malloc-remove-return-from-void-functions.patch	2023-11-08 19:23:51.713395051 +0000
@@ -1 +1 @@
-From 732ba1be28f75c87aa2616660d34ed0a278c7ae6 Mon Sep 17 00:00:00 2001
+From 3c037d05500c38b7accf25a4ef00762ef019f625 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
- lib/eal/common/rte_malloc.c | 4 ++--
+ lib/librte_eal/common/rte_malloc.c | 4 ++--
@@ -21,5 +22,5 @@
-diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
-index ebafef3f6c..9db0c399ae 100644
---- a/lib/eal/common/rte_malloc.c
-+++ b/lib/eal/common/rte_malloc.c
-@@ -41,13 +41,13 @@ mem_free(void *addr, const bool trace_ena)
+diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c
+index 9d39e58c08..684af4e1fc 100644
+--- a/lib/librte_eal/common/rte_malloc.c
++++ b/lib/librte_eal/common/rte_malloc.c
+@@ -46,13 +46,13 @@ mem_free(void *addr, const bool trace_ena)


More information about the stable mailing list