From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergio Gonzalez Monroy Subject: [PATCH] pci: limit default numa node to used devices Date: Fri, 21 Jul 2017 10:11:19 +0100 Message-ID: <20170721091119.15701-1-sergio.gonzalez.monroy@intel.com> Cc: thomas@monjalon.net, nic@opencloud.tech To: dev@dpdk.org Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id F0BE129C8 for ; Fri, 21 Jul 2017 11:11:21 +0200 (CEST) List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Commit 8a04cb612589 ("pci: set default numa node for broken systems") added logic to default to NUMA node 0 when sysfs numa_node information was wrong or not available. Unfortunately there are many devices with wrong NUMA node information that DPDK does not care about but still show warnings for them. Instead, only check for invalid NUMA node information for devices managed by the DPDK. Signed-off-by: Sergio Gonzalez Monroy --- lib/librte_eal/common/eal_common_pci.c | 5 +++++ lib/librte_eal/linuxapp/eal/eal_pci.c | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index eaa041e..52fd38c 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -226,6 +226,11 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr, return 1; } + if (dev->device.numa_node < 0) { + RTE_LOG(WARNING, EAL, " Invalid NUMA socket, default to 0\n"); + dev->device.numa_node = 0; + } + RTE_LOG(INFO, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id, dev->id.device_id, dr->driver.name); diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 556ae2c..2041d5f 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -314,15 +314,10 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) snprintf(filename, sizeof(filename), "%s/numa_node", dirname); - if (eal_parse_sysfs_value(filename, &tmp) == 0 && - tmp < RTE_MAX_NUMA_NODES) + if (eal_parse_sysfs_value(filename, &tmp) == 0) dev->device.numa_node = tmp; - else { - RTE_LOG(WARNING, EAL, - "numa_node is invalid or not present. " - "Set it 0 as default\n"); - dev->device.numa_node = 0; - } + else + dev->device.numa_node = -1; pci_name_set(dev); -- 2.9.4