From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5B38C433DF for ; Thu, 20 Aug 2020 03:22:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4EA81207BB for ; Thu, 20 Aug 2020 03:22:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3lLgJu/h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4EA81207BB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jk7d0XMlW+5nYz6ZuQaQ+mSulpvKU60TUZJ8+IYik74=; b=3lLgJu/hxOFqliV29cZ+ZfNcn 09CmCreo9y4m27EQ4dm68XwnP/11Zsl0hcYIK4PZWAZJl/WI8QrS/BT/J6iZGwunOsRMivb83zrEH a72iL5WkiituRhrQ5RkUgaIyd6XobGYUKrfQ2FcxcztB2KDSHjIvmSMMa0RrL/5GEPa7x1zRfob2z v6VZeZsJtFRc4gj7qV6gxqF6l+zPB0fubHSDOTDjVvFDTaUcpAm7BMTgyupSun4uEaEpAaeS0AoTL J210yxcaViYdPGsDZaTifYGHTvPKjoGRWCdNBBlgLSppL/QNwu9b3ri0U7qkF8y/dOb1i6bpd1uk+ o0kd8E0lA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8b8K-000419-8b; Thu, 20 Aug 2020 03:20:56 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8b8G-00040W-NG; Thu, 20 Aug 2020 03:20:53 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C794C1045; Wed, 19 Aug 2020 20:20:51 -0700 (PDT) Received: from [192.168.0.130] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 404683F66B; Wed, 19 Aug 2020 20:20:45 -0700 (PDT) Subject: Re: [RFC/RFT PATCH 1/6] numa: Move numa implementation to common code To: Atish Patra References: <20200814214725.28818-1-atish.patra@wdc.com> <20200814214725.28818-2-atish.patra@wdc.com> <2dce83a8-bda4-7664-9661-4e0542eecd57@arm.com> From: Anshuman Khandual Message-ID: <4caa2123-970a-0241-bb6e-03bd0f8478db@arm.com> Date: Thu, 20 Aug 2020 08:50:14 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200819_232052_888799_E67A0F32 X-CRM114-Status: GOOD ( 30.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rafael J. Wysocki" , Catalin Marinas , Jonathan Cameron , Atish Patra , Zong Li , linux-riscv , Will Deacon , linux-arch@vger.kernel.org, Rob Herring , Lorenzo Pieralisi , Ganapatrao Kulkarni , Steven Price , Greentime Hu , Albert Ou , Arnd Bergmann , Paul Walmsley , "linux-arm-kernel@lists.infradead.org" , Nick Hu , Greg Kroah-Hartman , Anup Patel , "linux-kernel@vger.kernel.org List" , Palmer Dabbelt , Andrew Morton , Mike Rapoport Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 08/20/2020 12:48 AM, Atish Patra wrote: > On Tue, Aug 18, 2020 at 8:19 PM Anshuman Khandual > wrote: >> >> >> >> On 08/15/2020 03:17 AM, Atish Patra wrote: >>> 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 >>> --- >>> 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 | 51 +++++++++++++++++++ >>> 7 files changed, 60 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 >> >> So this introduces a generic NUMA framework selectable with 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..73c2151de194 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 >> >> drivers/base/ does not seem right place to host generic NUMA code. > > I chose drivers/base because the common topology code is also present there. > drivers/base/arch_topology.c under GENERIC_ARCH_TOPOLOGY > The idea is to keep all common arch(at least between RISC-V & ARM64) > related code at one place. > >> Probably it should be either mm/ or kernel/. The other question here > > I am fine with mm/arch_numa.c as well if that is preferred over driver/base. GENERIC_ARCH_NUMA being near other shared code such as GENERIC_ARCH_TOPOLOGY do make sense. That being said, its a small nit and can be figured out later. > >> would be if existing arm64 NUMA implementation is sufficient enough >> for generic NUMA. I would expect any platform selecting this config >> should get some NUMA enabled, will be that be true with present code ? > > It is for RISC-V. Here is the RISC-V support patch (last patch in the series) > > http://lists.infradead.org/pipermail/linux-riscv/2020-August/001659.html > + Jonathan Cameron There is another patch/discussion which is trying to unify ARM64 NUMA init code with X86 (https://patchwork.kernel.org/patch/11651437/). I am wondering if all three platforms could use GENERIC_ARCH_NUMA. >> Otherwise it will be difficult to name it as GENERIC_ARCH_NUMA. >> >> _______________________________________________ >> linux-riscv mailing list >> linux-riscv@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-riscv > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel