[dpdk-stable] patch 'eal: fix check when retrieving current CPU affinity' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 02:59:47 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Thanks.

Yongseok

---
>From 948d9c42f88cdad34edef3feab95b698b53ae55b Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 19 Feb 2019 21:38:13 +0100
Subject: [PATCH] eal: fix check when retrieving current CPU affinity

[ upstream commit b206376438f1cb2ccd389f3be4e6b2e459c99ea9 ]

pthread_getaffinity_np returns a >0 value when failing.

This is mainly for the sake of correctness.
The only case where it could fail is when passing an incorrect cpuset
size wrt to the kernel.

Fixes: 2eba8d21f3c9 ("eal: restrict cores auto detection")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov at intel.com>
Reviewed-by: Rami Rosen <ramirose at gmail.com>
---
 lib/librte_eal/common/eal_common_options.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index a3d4d346b5..535c11f821 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -1183,10 +1183,9 @@ eal_auto_detect_cores(struct rte_config *cfg)
 	unsigned int lcore_id;
 	unsigned int removed = 0;
 	rte_cpuset_t affinity_set;
-	pthread_t tid = pthread_self();
 
-	if (pthread_getaffinity_np(tid, sizeof(rte_cpuset_t),
-				&affinity_set) < 0)
+	if (pthread_getaffinity_np(pthread_self(), sizeof(rte_cpuset_t),
+				&affinity_set))
 		CPU_ZERO(&affinity_set);
 
 	for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:07.594273297 -0700
+++ 0020-eal-fix-check-when-retrieving-current-CPU-affinity.patch	2019-07-22 17:55:05.865468000 -0700
@@ -1,8 +1,10 @@
-From b206376438f1cb2ccd389f3be4e6b2e459c99ea9 Mon Sep 17 00:00:00 2001
+From 948d9c42f88cdad34edef3feab95b698b53ae55b Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Tue, 19 Feb 2019 21:38:13 +0100
 Subject: [PATCH] eal: fix check when retrieving current CPU affinity
 
+[ upstream commit b206376438f1cb2ccd389f3be4e6b2e459c99ea9 ]
+
 pthread_getaffinity_np returns a >0 value when failing.
 
 This is mainly for the sake of correctness.
@@ -10,7 +12,6 @@
 size wrt to the kernel.
 
 Fixes: 2eba8d21f3c9 ("eal: restrict cores auto detection")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Reviewed-by: Anatoly Burakov <anatoly.burakov at intel.com>
@@ -20,10 +21,10 @@
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
-index 6c96f459c7..1f45f82f35 100644
+index a3d4d346b5..535c11f821 100644
 --- a/lib/librte_eal/common/eal_common_options.c
 +++ b/lib/librte_eal/common/eal_common_options.c
-@@ -1343,10 +1343,9 @@ eal_auto_detect_cores(struct rte_config *cfg)
+@@ -1183,10 +1183,9 @@ eal_auto_detect_cores(struct rte_config *cfg)
  	unsigned int lcore_id;
  	unsigned int removed = 0;
  	rte_cpuset_t affinity_set;


More information about the stable mailing list