From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 8D8B8A0096 for ; Wed, 10 Apr 2019 18:45:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7DAB21B12B; Wed, 10 Apr 2019 18:45:46 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0EC971B12B for ; Wed, 10 Apr 2019 18:45:45 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 686FE7D0C9; Wed, 10 Apr 2019 16:45:44 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-94.ams2.redhat.com [10.36.117.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AAAD5D962; Wed, 10 Apr 2019 16:45:43 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Anatoly Burakov , Rami Rosen , dpdk stable Date: Wed, 10 Apr 2019 17:43:56 +0100 Message-Id: <20190410164411.10546-48-ktraynor@redhat.com> In-Reply-To: <20190410164411.10546-1-ktraynor@redhat.com> References: <20190410164411.10546-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 10 Apr 2019 16:45:44 +0000 (UTC) Subject: [dpdk-stable] patch 'eal: fix check when retrieving current CPU affinity' has been queued to LTS release 18.11.2 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 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/16/19. 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. Thanks. Kevin Traynor --- >From c5ba174479d9d0aa3ba7bf0ba64e06929b17fc48 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 f6dfbc73a..fb966780f 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -1343,8 +1343,7 @@ eal_auto_detect_cores(struct rte_config *cfg) 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); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-10 14:06:11.573315631 +0100 +++ 0048-eal-fix-check-when-retrieving-current-CPU-affinity.patch 2019-04-10 14:06:07.989291382 +0100 @@ -1,8 +1,10 @@ -From b206376438f1cb2ccd389f3be4e6b2e459c99ea9 Mon Sep 17 00:00:00 2001 +From c5ba174479d9d0aa3ba7bf0ba64e06929b17fc48 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 6c96f459c..1f45f82f3 100644 +index f6dfbc73a..fb966780f 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c -@@ -1344,8 +1344,7 @@ eal_auto_detect_cores(struct rte_config *cfg) +@@ -1343,8 +1343,7 @@ eal_auto_detect_cores(struct rte_config *cfg) unsigned int removed = 0; rte_cpuset_t affinity_set; - pthread_t tid = pthread_self();