From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F238C4634C for ; Wed, 5 Mar 2025 14:47:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E40D04042E; Wed, 5 Mar 2025 14:47:30 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by mails.dpdk.org (Postfix) with ESMTP id E828A40275; Wed, 5 Mar 2025 14:47:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741182448; x=1772718448; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=N+0XBS5mY+OVN8w2s2cm3Gjg2xwRTE23buPg+r4Ubyg=; b=iZZUNeN1pnw75atCHUCZybxO1/VLK3k6/aMte7TG15dXL+hjkdJcHT8m dJVBFAQemNXPhISJPTl0pzVKtPERk7sXZ1J11XaUpvMLS0Tfu4I2HuYMa KpOZWAQQHclFJ0EwfT1AE1WnKL7CKSVZDhQcwDszVVa3kS9qC+FWs3wRN 1+CemKmCJ1HaKlwGtBd+hQrwvRTjkw07IB0Ckf4uQLPE81GHwB16NoIuQ rbimcOd+e5vG4KCfshvjgRqfjWZfLCrmX+LFDIzyKCOb+AOrRi0LpltMK 1vUOQkOwwIJPuZ/OzLm43bjXwIi1snHGOEcaPW4EPI53bGgvcrHFUz0ss Q==; X-CSE-ConnectionGUID: hMj+qkWxQ/KGnTaTcaxUSA== X-CSE-MsgGUID: HMGMHkHnQo2mzAcGwQ1HXw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="41854844" X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="41854844" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 05:47:27 -0800 X-CSE-ConnectionGUID: 0IshRkl0QYemMWgq87wzeg== X-CSE-MsgGUID: /ZFxShdGRb6dMXzUaKehBw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="123629722" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.43]) by orviesa003.jf.intel.com with ESMTP; 05 Mar 2025 05:47:26 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Anatoly Burakov , Bruce Richardson , stable@dpdk.org Subject: [PATCH] eal: fix undetected NUMA nodes Date: Wed, 5 Mar 2025 13:47:20 +0000 Message-ID: <20250305134720.907347-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 In cases where the number of cores on a given socket is greater than RTE_MAX_LCORES, then EAL will be unaware of all the sockets/numa nodes on a system. Fix this limitation by having the EAL probe the NUMA node for cores it isn't going to use, and recording that for completeness. This is necessary as memory is tracked per node, and with the --lcores parameters our app lcores may be on different sockets than the lcore ids may imply. For example, lcore 0 is on socket zero, but if app is run with --lcores=0@64, then DPDK lcore 0 may be on socket one, so DPDK needs to be aware of that socket. Fixes: 952b20777255 ("eal: provide API for querying valid socket ids") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/eal/common/eal_common_lcore.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c index 2ff9252c52..c37f38f17a 100644 --- a/lib/eal/common/eal_common_lcore.c +++ b/lib/eal/common/eal_common_lcore.c @@ -144,7 +144,7 @@ rte_eal_cpu_init(void) unsigned lcore_id; unsigned count = 0; unsigned int socket_id, prev_socket_id; - int lcore_to_socket_id[RTE_MAX_LCORE]; + int lcore_to_socket_id[CPU_SETSIZE] = {0}; /* * Parse the maximum set of logical cores, detect the subset of running @@ -183,9 +183,11 @@ rte_eal_cpu_init(void) for (; lcore_id < CPU_SETSIZE; lcore_id++) { if (eal_cpu_detected(lcore_id) == 0) continue; + socket_id = eal_cpu_socket_id(lcore_id); + lcore_to_socket_id[lcore_id] = socket_id; EAL_LOG(DEBUG, "Skipped lcore %u as core %u on socket %u", lcore_id, eal_cpu_core_id(lcore_id), - eal_cpu_socket_id(lcore_id)); + socket_id); } /* Set the count of enabled logical cores of the EAL configuration */ @@ -201,12 +203,13 @@ rte_eal_cpu_init(void) prev_socket_id = -1; config->numa_node_count = 0; - for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { + for (lcore_id = 0; lcore_id < RTE_DIM(lcore_to_socket_id); lcore_id++) { socket_id = lcore_to_socket_id[lcore_id]; if (socket_id != prev_socket_id) - config->numa_nodes[config->numa_node_count++] = - socket_id; + config->numa_nodes[config->numa_node_count++] = socket_id; prev_socket_id = socket_id; + if (config->numa_node_count >= RTE_MAX_NUMA_NODES) + break; } EAL_LOG(INFO, "Detected NUMA nodes: %u", config->numa_node_count); -- 2.43.0