From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7AC8FA046B for ; Tue, 23 Jul 2019 03:01:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 72E8F1B998; Tue, 23 Jul 2019 03:01:55 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id CEC661BEDB for ; Tue, 23 Jul 2019 03:01:54 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:01:52 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Hf6026580; Tue, 23 Jul 2019 04:01:50 +0300 From: Yongseok Koh To: David Marchand Cc: Anatoly Burakov , Rami Rosen , dpdk stable Date: Mon, 22 Jul 2019 17:59:47 -0700 Message-Id: <20190723010115.6446-20-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: fix check when retrieving current CPU affinity' has been queued to LTS release 17.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Reviewed-by: Anatoly Burakov Reviewed-by: Rami Rosen --- 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 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@dpdk.org Signed-off-by: David Marchand Reviewed-by: Anatoly Burakov @@ -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;