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 E5EB5A328D for ; Tue, 22 Oct 2019 21:34:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5DCC61BEAD; Tue, 22 Oct 2019 21:34:34 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id F312E1BE9C for ; Tue, 22 Oct 2019 21:34:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571772872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oCwV9hWsGfsLq2y/cA3Y61yvmnu3bc8s6oetG2v6YPo=; b=WR0EIWuR0HNKMZy7LcsKtdFdeYTK4+kVXq7j2/sSpGfGzSRNJcbeUIcKaZEmMl/U4Zn7Sf wXZak39FCu8m1pvMi3EE0Pir7Zv3VqMXFpmR6Bph7EVQws9x3svD7ofNzMMBIQfwIHwxDH jiJifnHY5ur9WxT/B8vkT7bZdh7HkTU= 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-170-c_XZpj5_Pi-bBWLxdLXyXQ-1; Tue, 22 Oct 2019 15:34:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AAE68800D49; Tue, 22 Oct 2019 19:34:27 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-129.brq.redhat.com [10.40.204.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44B716012D; Tue, 22 Oct 2019 19:34:26 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: bruce.richardson@intel.com, stable@dpdk.org, Thomas Monjalon Date: Tue, 22 Oct 2019 21:34:17 +0200 Message-Id: <1571772857-18287-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: c_XZpj5_Pi-bBWLxdLXyXQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Subject: [dpdk-dev] [PATCH] eal: remove dead code on NUMA node detection X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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") Cc: stable@dpdk.org Signed-off-by: David Marchand --- 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 2323159..ef4c1c4 100644 --- a/config/common_base +++ b/config/common_base @@ -102,7 +102,6 @@ CONFIG_RTE_LOG_DP_LEVEL=3DRTE_LOG_INFO 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 CONFIG_RTE_EAL_VFIO=3Dn diff --git a/config/meson.build b/config/meson.build index a27f731..37b1b25 100644 --- a/config/meson.build +++ b/config/meson.build @@ -162,7 +162,6 @@ 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_MAX_ETHPORTS', get_option('max_ethports')) 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) dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64) diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/comm= on/eal_common_lcore.c index 38af260..59a2fd1 100644 --- a/lib/librte_eal/common/eal_common_lcore.c +++ b/lib/librte_eal/common/eal_common_lcore.c @@ -89,15 +89,6 @@ rte_eal_cpu_init(void) =20 =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 =09=09/* in 1:1 mapping, record related cpu detected state */ --=20 1.8.3.1