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 40644A04F3 for ; Fri, 3 Jan 2020 12:14:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E37A81D152; Fri, 3 Jan 2020 12:14:00 +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 8DD7D1D152 for ; Fri, 3 Jan 2020 12:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578050038; 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; bh=GfREoS/UfGomoTH/4lle32UDfLm34E9OCA4QpUaa+cw=; b=AgF1YRT2tsnPBlhtRTALAciMq0ie5VDUIZnZE7F0uoPdX4Qh7cX09eUHjs98/kHfnLkTyt YqzzDMBZkZqAu5Au9qwZbGjviSpATePcjrCeQtcsFVtn5oMcn5BYFHLik+tiydYWasGtNQ emO5+ynNJmcy55oE1ii79FXJZXpg514= 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-277-yMh_amZpPWqfFmdaPxCZVw-1; Fri, 03 Jan 2020 06:13:55 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C68AB10054E3; Fri, 3 Jan 2020 11:13:54 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-19.brq.redhat.com [10.40.204.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8A341001281; Fri, 3 Jan 2020 11:13:53 +0000 (UTC) From: David Marchand To: stable@dpdk.org Cc: luca.boccassi@gmail.com Date: Fri, 3 Jan 2020 12:13:40 +0100 Message-Id: <20200103111340.25760-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: yMh_amZpPWqfFmdaPxCZVw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] [PATCH 17.11] eal: remove dead code on NUMA node detection 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" [ 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") Acked-by: Stephen Hemminger Acked-by: Anatoly Burakov Signed-off-by: David Marchand --- config/common_base | 1 - lib/librte_eal/common/eal_common_lcore.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/config/common_base b/config/common_base index 7b4792293e..4355cad3b4 100644 --- a/config/common_base +++ b/config/common_base @@ -99,7 +99,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/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/comm= on/eal_common_lcore.c index 0db1555b58..723f2b2bd0 100644 --- a/lib/librte_eal/common/eal_common_lcore.c +++ b/lib/librte_eal/common/eal_common_lcore.c @@ -84,17 +84,6 @@ rte_eal_cpu_init(void) =09=09lcore_config[lcore_id].core_role =3D ROLE_RTE; =09=09lcore_config[lcore_id].core_id =3D eal_cpu_core_id(lcore_id); =09=09lcore_config[lcore_id].socket_id =3D eal_cpu_socket_id(lcore_id); -=09=09if (lcore_config[lcore_id].socket_id >=3D RTE_MAX_NUMA_NODES) { -#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID -=09=09=09lcore_config[lcore_id].socket_id =3D 0; -#else -=09=09=09RTE_LOG(ERR, EAL, "Socket ID (%u) is greater than " -=09=09=09=09"RTE_MAX_NUMA_NODES (%d)\n", -=09=09=09=09lcore_config[lcore_id].socket_id, -=09=09=09=09RTE_MAX_NUMA_NODES); -=09=09=09return -1; -#endif -=09=09} =09=09RTE_LOG(DEBUG, EAL, "Detected lcore %u as " =09=09=09=09"core %u on socket %u\n", =09=09=09=09lcore_id, lcore_config[lcore_id].core_id, --=20 2.23.0