patch 'eal/linux: remove unused variable for socket memory' has been queued to stable release 19.11.11

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Tue Nov 30 17:35:12 CET 2021


Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/6c135cfbe7d80baaa45ed45b82660445b93c7a23

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 6c135cfbe7d80baaa45ed45b82660445b93c7a23 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris at intel.com>
Date: Fri, 29 Oct 2021 17:14:10 +0000
Subject: [PATCH] eal/linux: remove unused variable for socket memory

[ upstream commit 628bac7df18904c7083c8ad04669c69688f352de ]

clang-13 rightfully complains that the total_mem variable in
eal_parse_socket_arg is set but not used, since the final
accumulated total_mem result isn't used anywhere.
So just remove the total_mem variable.

Fixes: 0a703f0f36c1 ("eal/linux: fix parsing zero socket memory and limits")

Signed-off-by: Jim Harris <james.r.harris at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/linux/eal/eal.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
index 8f1bcab390..a2898705b6 100644
--- a/lib/librte_eal/linux/eal/eal.c
+++ b/lib/librte_eal/linux/eal/eal.c
@@ -587,7 +587,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
 	char * arg[RTE_MAX_NUMA_NODES];
 	char *end;
 	int arg_num, i, len;
-	uint64_t total_mem = 0;
 
 	len = strnlen(strval, SOCKET_MEM_STRLEN);
 	if (len == SOCKET_MEM_STRLEN) {
@@ -619,7 +618,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
 				(arg[i][0] == '\0') || (end == NULL) || (*end != '\0'))
 			return -1;
 		val <<= 20;
-		total_mem += val;
 		socket_arg[i] = val;
 	}
 
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:12.098582095 +0100
+++ 0108-eal-linux-remove-unused-variable-for-socket-memory.patch	2021-11-30 16:50:05.914874440 +0100
@@ -1 +1 @@
-From 628bac7df18904c7083c8ad04669c69688f352de Mon Sep 17 00:00:00 2001
+From 6c135cfbe7d80baaa45ed45b82660445b93c7a23 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 628bac7df18904c7083c8ad04669c69688f352de ]
+
@@ -16 +18 @@
- lib/eal/linux/eal.c | 2 --
+ lib/librte_eal/linux/eal/eal.c | 2 --
@@ -19,5 +21,5 @@
-diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
-index 81fdebc6a0..60b4924838 100644
---- a/lib/eal/linux/eal.c
-+++ b/lib/eal/linux/eal.c
-@@ -562,7 +562,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
+diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
+index 8f1bcab390..a2898705b6 100644
+--- a/lib/librte_eal/linux/eal/eal.c
++++ b/lib/librte_eal/linux/eal/eal.c
+@@ -587,7 +587,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
@@ -31 +33 @@
-@@ -594,7 +593,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
+@@ -619,7 +618,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)


More information about the stable mailing list