Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp49475pxk; Mon, 5 Oct 2020 17:22:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzznrnBJdxWRVcKmBmRUQKef5qnE1MwBNVfVoGq6ZB3jjUFi6UQwVy1Q+VJew2J7KyQZJN X-Received: by 2002:a05:6402:1012:: with SMTP id c18mr2418314edu.77.1601943725253; Mon, 05 Oct 2020 17:22:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601943725; cv=none; d=google.com; s=arc-20160816; b=qVMmIDaoroZBh964JGfB6wKgnO3chpNjPw6crlt38HqVmPuZRezPubPsuXVZBhHGbY MhnbfC7TQ8n8YdW4a3kZy3ip3TmQJYA4eOB9SmsH3yINC1iCAfIqU//b2OujpNw+DUxy WJ1AXh2fIgksm/kKqX4tnp6ucE9iJrr+zPlXYpXyd1vXmkkmvhfTpuLMBVDdDqLzRE3z P4btdPPBTKqevZzGGaB9xVxSF8TlKz2Q1eNZvaHEnvqaXRx0+Ed8BuDHedPj/i1AE7/4 CiBMhvl957597QFnB9t23ATq4XtUt+wqpMb5CEGrXc08XFUbFANNcARvwZ5tXZ9BOV9a lIdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :wdcironportexception:ironport-sdr:ironport-sdr:ironport-sdr :dkim-signature; bh=bKJk50lDN5+XoR5z8A9ipnIvVEof4WOQPz4k2+4z31Q=; b=TJqGJ2TaKMwHxXFfeCD8EeKR0slLX4QshXKMZrRIJXryBEzfGvLn0MLfdPenSvsdrq rh4jI3uH/VOSKV9IFzRF+dWEaouOSGNo3TiDrRqzf+H43GGf9UjoZqhEIVtzURxjLUlY gNoMlARcSvwDBb6u0JQmC5e48KDxoLhJOXd8LQEhis95rG+leQrlHXvco2Qe6/Sea6f1 cLTXPd0Z+T7QEk7BZiW/sZlB4a0c+RfguvatP/U8pq3uC1YuEqSKBf42TYPF2DdDckt3 Ad3iKuJfTm2yj2f6GwTx2oszMophk0HdBug8T7ic0clj+Zh/r9ZZMxa18BZniGQPOlf8 Xo2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=pAWXJNB+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id co5si1133858edb.493.2020.10.05.17.21.42; Mon, 05 Oct 2020 17:22:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=pAWXJNB+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726803AbgJFASB (ORCPT + 99 others); Mon, 5 Oct 2020 20:18:01 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:18352 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725865AbgJFAR6 (ORCPT ); Mon, 5 Oct 2020 20:17:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1601943477; x=1633479477; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BCeALvxSw7TkRBorsKB9HZiBElTOz/5Cfmc9covNeMs=; b=pAWXJNB+yrSuP5BvSu7PEBY+8VwV1PlYSHEYC09MK0S821Lpk0iak5Uc zDNtD3U68nBV8jMFUOw0oKaWZet/Vx8mjO0DAeSFuxzZezmnAXNWDvp78 j9WrYIfUhYBIbmtwnZJfU573cwG9IRN34Oq7GY6dUc58CZwwDMUz5PlbH CiwLs3uQ+eZInuuBpl9mTWeKHTA4KyD5OkG09eBlosssXg7qtCasIuAGe Vb9dYGRtneVBpTEddp/YlJJSbWh4SKeXegnmqarRQSXRleI0N6HsikjZ2 VxYchnQWvzRIyYb1KoiTwfCs28a7h2Klz2pNT0//BME6/3lR19e/8/lmr g==; IronPort-SDR: lMm782WF4JTi5165xwAPkF9zDOR50WO4x5HEfsaaFs6r0H/K9ftaw2StaR279/33oPwvhYdStc pvsMWtlyG3W0ruYBg9fG/yZ/KtvNJThpnsDjy6W5dchuTa+Hs4TR+vQt+FmQG6qjbGXyKeNPOE kHakatPOI5tOZKThWCkpwCypbIz1XkMnb5RzQwPFRf/g4QHLbmXTZ7hId0nZBRogp7h4SYlFew 76HLfYvSXjaFKrJ78jqrVtPm/DedCLP7PZNCIhZPy0MWU37q3gurJ6rktw6pvnaBbUp96Av0BX lWo= X-IronPort-AV: E=Sophos;i="5.77,341,1596470400"; d="scan'208";a="149023392" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 06 Oct 2020 08:17:57 +0800 IronPort-SDR: BXMPj7SX7ur42V1hP+P0SY9AjinsCJSAu7RMX9ttsXicsREMPOb4/3OcnmJFch+PmypOOwHADk NTQBOryyR2fw== Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2020 17:03:49 -0700 IronPort-SDR: uqPXfCgpo2ff2kfyH+CSANlb9Q5TFZMGqvAa9v2FYGcVamLPuRkMhOBK55p7yvpOkrwHvARqyv wnw1X/YO2uNw== WDCIronportException: Internal Received: from b9f8262.ad.shared (HELO jedi-01.hgst.com) ([10.86.59.253]) by uls-op-cesaip01.wdc.com with ESMTP; 05 Oct 2020 17:17:56 -0700 From: Atish Patra To: linux-kernel@vger.kernel.org Cc: Atish Patra , Jonathan Cameron , Albert Ou , Andrew Morton , Anshuman Khandual , Anup Patel , Arnd Bergmann , Catalin Marinas , David Hildenbrand , Greentime Hu , Greg Kroah-Hartman , Jia He , Kefeng Wang , linux-arch@vger.kernel.org, linux-riscv@lists.infradead.org, Mike Rapoport , Nicolas Saenz Julienne , Palmer Dabbelt , Paul Walmsley , "Rafael J. Wysocki" , Steven Price , Will Deacon , Zong Li , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 1/5] numa: Move numa implementation to common code Date: Mon, 5 Oct 2020 17:17:48 -0700 Message-Id: <20201006001752.248564-2-atish.patra@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201006001752.248564-1-atish.patra@wdc.com> References: <20201006001752.248564-1-atish.patra@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ARM64 numa implementation is generic enough that RISC-V can reuse that implementation with very minor cosmetic changes. This will help both ARM64 and RISC-V in terms of maintanace and feature improvement Move the numa implementation code to common directory so that both ISAs can reuse this. This doesn't introduce any function changes for ARM64. Signed-off-by: Atish Patra Acked-by: Jonathan Cameron Tested-by: Jonathan Cameron --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/numa.h | 45 +---------------- arch/arm64/mm/Makefile | 1 - drivers/base/Kconfig | 6 +++ drivers/base/Makefile | 1 + .../mm/numa.c => drivers/base/arch_numa.c | 0 include/asm-generic/numa.h | 49 +++++++++++++++++++ 7 files changed, 58 insertions(+), 45 deletions(-) rename arch/arm64/mm/numa.c => drivers/base/arch_numa.c (100%) create mode 100644 include/asm-generic/numa.h diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 6d232837cbee..955a0cf75b16 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -960,6 +960,7 @@ config HOTPLUG_CPU # Common NUMA Features config NUMA bool "NUMA Memory Allocation and Scheduler Support" + select GENERIC_ARCH_NUMA select ACPI_NUMA if ACPI select OF_NUMA help diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h index 626ad01e83bf..8c8cf4297cc3 100644 --- a/arch/arm64/include/asm/numa.h +++ b/arch/arm64/include/asm/numa.h @@ -3,49 +3,6 @@ #define __ASM_NUMA_H #include - -#ifdef CONFIG_NUMA - -#define NR_NODE_MEMBLKS (MAX_NUMNODES * 2) - -int __node_distance(int from, int to); -#define node_distance(a, b) __node_distance(a, b) - -extern nodemask_t numa_nodes_parsed __initdata; - -extern bool numa_off; - -/* Mappings between node number and cpus on that node. */ -extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES]; -void numa_clear_node(unsigned int cpu); - -#ifdef CONFIG_DEBUG_PER_CPU_MAPS -const struct cpumask *cpumask_of_node(int node); -#else -/* Returns a pointer to the cpumask of CPUs on Node 'node'. */ -static inline const struct cpumask *cpumask_of_node(int node) -{ - return node_to_cpumask_map[node]; -} -#endif - -void __init arm64_numa_init(void); -int __init numa_add_memblk(int nodeid, u64 start, u64 end); -void __init numa_set_distance(int from, int to, int distance); -void __init numa_free_distance(void); -void __init early_map_cpu_to_node(unsigned int cpu, int nid); -void numa_store_cpu_info(unsigned int cpu); -void numa_add_cpu(unsigned int cpu); -void numa_remove_cpu(unsigned int cpu); - -#else /* CONFIG_NUMA */ - -static inline void numa_store_cpu_info(unsigned int cpu) { } -static inline void numa_add_cpu(unsigned int cpu) { } -static inline void numa_remove_cpu(unsigned int cpu) { } -static inline void arm64_numa_init(void) { } -static inline void early_map_cpu_to_node(unsigned int cpu, int nid) { } - -#endif /* CONFIG_NUMA */ +#include #endif /* __ASM_NUMA_H */ diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile index d91030f0ffee..928c308b044b 100644 --- a/arch/arm64/mm/Makefile +++ b/arch/arm64/mm/Makefile @@ -6,7 +6,6 @@ obj-y := dma-mapping.o extable.o fault.o init.o \ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_PTDUMP_CORE) += dump.o obj-$(CONFIG_PTDUMP_DEBUGFS) += ptdump_debugfs.o -obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o KASAN_SANITIZE_physaddr.o += n diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 8d7001712062..c5956c8845cc 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -210,4 +210,10 @@ config GENERIC_ARCH_TOPOLOGY appropriate scaling, sysfs interface for reading capacity values at runtime. +config GENERIC_ARCH_NUMA + bool + help + Enable support for generic NUMA implementation. Currently, RISC-V + and ARM64 uses it. + endmenu diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 157452080f3d..c3d02c644222 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_PINCTRL) += pinctrl.o obj-$(CONFIG_DEV_COREDUMP) += devcoredump.o obj-$(CONFIG_GENERIC_MSI_IRQ_DOMAIN) += platform-msi.o obj-$(CONFIG_GENERIC_ARCH_TOPOLOGY) += arch_topology.o +obj-$(CONFIG_GENERIC_ARCH_NUMA) += arch_numa.o obj-y += test/ diff --git a/arch/arm64/mm/numa.c b/drivers/base/arch_numa.c similarity index 100% rename from arch/arm64/mm/numa.c rename to drivers/base/arch_numa.c diff --git a/include/asm-generic/numa.h b/include/asm-generic/numa.h new file mode 100644 index 000000000000..2718d5a6ff03 --- /dev/null +++ b/include/asm-generic/numa.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_GENERIC_NUMA_H +#define __ASM_GENERIC_NUMA_H + +#ifdef CONFIG_NUMA + +#define NR_NODE_MEMBLKS (MAX_NUMNODES * 2) + +int __node_distance(int from, int to); +#define node_distance(a, b) __node_distance(a, b) + +extern nodemask_t numa_nodes_parsed __initdata; + +extern bool numa_off; + +/* Mappings between node number and cpus on that node. */ +extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES]; +void numa_clear_node(unsigned int cpu); + +#ifdef CONFIG_DEBUG_PER_CPU_MAPS +const struct cpumask *cpumask_of_node(int node); +#else +/* Returns a pointer to the cpumask of CPUs on Node 'node'. */ +static inline const struct cpumask *cpumask_of_node(int node) +{ + return node_to_cpumask_map[node]; +} +#endif + +void __init arm64_numa_init(void); +int __init numa_add_memblk(int nodeid, u64 start, u64 end); +void __init numa_set_distance(int from, int to, int distance); +void __init numa_free_distance(void); +void __init early_map_cpu_to_node(unsigned int cpu, int nid); +void numa_store_cpu_info(unsigned int cpu); +void numa_add_cpu(unsigned int cpu); +void numa_remove_cpu(unsigned int cpu); + +#else /* CONFIG_NUMA */ + +static inline void numa_store_cpu_info(unsigned int cpu) { } +static inline void numa_add_cpu(unsigned int cpu) { } +static inline void numa_remove_cpu(unsigned int cpu) { } +static inline void arm64_numa_init(void) { } +static inline void early_map_cpu_to_node(unsigned int cpu, int nid) { } + +#endif /* CONFIG_NUMA */ + +#endif /* __ASM_GENERIC_NUMA_H */ -- 2.25.1