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 6D874A04B5 for ; Tue, 3 Dec 2019 19:28:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 648FF1BF97; Tue, 3 Dec 2019 19:28:58 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id F02C61BF99 for ; Tue, 3 Dec 2019 19:28:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4KLYldvYNgG1IWDO0ytM7axz01sjTjR1MeRnYsfsFNQ=; b=JwDtRYUzb+t43w36ycOjhQ1w8y2phLxqQfV2HM/jN46knAzaNvG3l7voU/neamEk25njq9 TsYlUpvwcYGeUDgyCASi2mM7tYaCBzFCl7hv3caTPRn5cAdkDsV7QwaANzIwD/Bja4AudF HuaPj0v0RK8zIZ6IhcLUi3wQKmY3+Vw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-407-LxrOS0iMOReQRP5HLy1I6A-1; Tue, 03 Dec 2019 13:28:55 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6113A1883521; Tue, 3 Dec 2019 18:28:54 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 281A15C240; Tue, 3 Dec 2019 18:28:50 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Stephen Hemminger , Anatoly Burakov , dpdk stable Date: Tue, 3 Dec 2019 18:26:55 +0000 Message-Id: <20191203182714.17297-46-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: LxrOS0iMOReQRP5HLy1I6A-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'eal: remove dead code on NUMA node detection' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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 rebasi= ng (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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/883ce8ee6b55e44523= 13dc32bbc1fe6bb120e99d Thanks. Kevin. --- >From 883ce8ee6b55e4452313dc32bbc1fe6bb120e99d Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 22 Oct 2019 21:34:17 +0200 Subject: [PATCH] eal: remove dead code on NUMA node detection [ upstream commit 8e35792c5325f9fd2cb7cfab507aa23fc956ced7 ] RTE_EAL_ALLOW_INV_SOCKET_ID had been introduced and documented as used with xen dom0 support (dropped for some time now). Closely looking at this, the code was changed later and ensures that the socket id is in the [0..RTE_MAX_NUMA_NODES] range anyway. Let's drop this dead code and the build option with it. Fixes: 94ef2964148a ("eal/linux: fix numa node detection") Signed-off-by: David Marchand Acked-by: Stephen Hemminger Acked-by: Anatoly Burakov --- config/common_base | 1 - config/meson.build | 1 - lib/librte_eal/common/eal_common_lcore.c | 9 --------- 3 files changed, 11 deletions(-) diff --git a/config/common_base b/config/common_base index d12ae98bc..6bce2c97f 100644 --- a/config/common_base +++ b/config/common_base @@ -89,5 +89,4 @@ CONFIG_RTE_LOG_HISTORY=3D256 CONFIG_RTE_BACKTRACE=3Dy CONFIG_RTE_LIBEAL_USE_HPET=3Dn -CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=3Dn CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=3Dn CONFIG_RTE_EAL_IGB_UIO=3Dn diff --git a/config/meson.build b/config/meson.build index e92be6c47..d76776137 100644 --- a/config/meson.build +++ b/config/meson.build @@ -113,5 +113,4 @@ dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores')= ) dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes')) dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) -dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_soc= ket_id')) # values which have defaults which may be overridden dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/comm= on/eal_common_lcore.c index 3167e9d79..7f4a4ee8d 100644 --- a/lib/librte_eal/common/eal_common_lcore.c +++ b/lib/librte_eal/common/eal_common_lcore.c @@ -58,13 +58,4 @@ rte_eal_cpu_init(void) =09=09/* find socket first */ =09=09socket_id =3D eal_cpu_socket_id(lcore_id); -=09=09if (socket_id >=3D RTE_MAX_NUMA_NODES) { -#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID -=09=09=09socket_id =3D 0; -#else -=09=09=09RTE_LOG(ERR, EAL, "Socket ID (%u) is greater than RTE_MAX_NUMA_NO= DES (%d)\n", -=09=09=09=09=09socket_id, RTE_MAX_NUMA_NODES); -=09=09=09return -1; -#endif -=09=09} =09=09lcore_to_socket_id[lcore_id] =3D socket_id; =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:54.441938652 +0000 +++ 0046-eal-remove-dead-code-on-NUMA-node-detection.patch=092019-12-03 17:= 29:51.770749537 +0000 @@ -1 +1 @@ -From 8e35792c5325f9fd2cb7cfab507aa23fc956ced7 Mon Sep 17 00:00:00 2001 +From 883ce8ee6b55e4452313dc32bbc1fe6bb120e99d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8e35792c5325f9fd2cb7cfab507aa23fc956ced7 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 232315920..ef4c1c4aa 100644 +index d12ae98bc..6bce2c97f 100644 @@ -30 +31 @@ -@@ -103,5 +103,4 @@ CONFIG_RTE_LOG_HISTORY=3D256 +@@ -89,5 +89,4 @@ CONFIG_RTE_LOG_HISTORY=3D256 @@ -37 +38 @@ -index acacba704..6a6ab503e 100644 +index e92be6c47..d76776137 100644 @@ -40,2 +41,2 @@ -@@ -181,5 +181,4 @@ dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_nu= ma_nodes')) - dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports')) +@@ -113,5 +113,4 @@ dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'= )) + dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes')) @@ -47 +48 @@ -index 38af2605e..59a2fd14d 100644 +index 3167e9d79..7f4a4ee8d 100644 @@ -50 +51 @@ -@@ -90,13 +90,4 @@ rte_eal_cpu_init(void) +@@ -58,13 +58,4 @@ rte_eal_cpu_init(void)