From: Mike Rapoport <rppt@kernel•org>
To: linux-kernel@vger•kernel.org
Cc: nvdimm@lists•linux.dev, x86@kernel•org,
Andreas Larsson <andreas@gaisler•com>,
Catalin Marinas <catalin.marinas@arm•com>,
Dave Hansen <dave.hansen@linux•intel.com>,
David Hildenbrand <david@redhat•com>,
Jiaxun Yang <jiaxun.yang@flygoat•com>,
linux-mm@kvack•org, sparclinux@vger•kernel.org,
Alexander Gordeev <agordeev@linux•ibm.com>,
Will Deacon <will@kernel•org>,
Thomas Gleixner <tglx@linutronix•de>,
linux-arch@vger•kernel.org, Rob Herring <robh@kernel•org>,
Davidlohr Bueso <dave@stgolabs•net>,
Vasily Gorbik <gor@linux•ibm.com>,
Jonathan Corbet <corbet@lwn•net>,
linux-sh@vger•kernel.org, Huacai Chen <chenhuacai@kernel•org>,
Christophe Leroy <christophe.leroy@csgroup•eu>,
linux-acpi@vger•kernel.org, Ingo Molnar <mingo@redhat•com>,
Zi Yan <ziy@nvidia•com>,
devicetree@vger•kernel.org, Arnd Bergmann <arnd@arndb•de>,
linux-s390@vger•kernel.org, Heiko Carstens <hca@linux•ibm.com>,
Borislav Petkov <bp@alien8•de>,
linux-cxl@vger•kernel.org, loongarch@lists•linux.dev,
John Paul Adrian Glaubitz <glaubitz@physik•fu-berlin.de>,
Dan Williams <dan.j.williams@intel•com>,
linux-arm-kernel@lists•infradead.org,
Thomas Bogendoerfer <tsbogend@alpha•franken.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
linux-doc@vger•kernel.org, linux-mips@vger•kernel.org,
Samuel Holland <samuel.holland@sifive•com>,
linux-riscv@lists•infradead.org,
Palmer Dabbelt <palmer@dabbelt•com>,
Jonathan Cameron <jonathan.cameron@huawei•com>,
"Rafael J. Wysocki" <rafael@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>,
linuxppc-dev@lists•ozlabs.org,
"David S. Miller" <davem@davemloft•net>,
Mike Rapoport <rppt@kernel•org>
Subject: [PATCH v2 07/25] mm: drop CONFIG_HAVE_ARCH_NODEDATA_EXTENSION
Date: Tue, 23 Jul 2024 09:41:38 +0300 [thread overview]
Message-ID: <20240723064156.4009477-8-rppt@kernel.org> (raw)
In-Reply-To: <20240723064156.4009477-1-rppt@kernel.org>
From: "Mike Rapoport (Microsoft)" <rppt@kernel•org>
There are no users of HAVE_ARCH_NODEDATA_EXTENSION left, so
arch_alloc_nodedata() and arch_refresh_nodedata() are not needed
anymore.
Replace the call to arch_alloc_nodedata() in free_area_init() with
memblock_alloc(), remove arch_refresh_nodedata() and cleanup
include/linux/memory_hotplug.h from the associated ifdefery.
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel•org>
---
include/linux/memory_hotplug.h | 48 ----------------------------------
mm/mm_init.c | 3 +--
2 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 7a9ff464608d..978c0dfb64a1 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -16,54 +16,6 @@ struct resource;
struct vmem_altmap;
struct dev_pagemap;
-#ifdef CONFIG_HAVE_ARCH_NODEDATA_EXTENSION
-/*
- * For supporting node-hotadd, we have to allocate a new pgdat.
- *
- * If an arch has generic style NODE_DATA(),
- * node_data[nid] = kzalloc() works well. But it depends on the architecture.
- *
- * In general, generic_alloc_nodedata() is used.
- *
- */
-extern pg_data_t *arch_alloc_nodedata(int nid);
-extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat);
-
-#else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */
-
-#define arch_alloc_nodedata(nid) generic_alloc_nodedata(nid)
-
-#ifdef CONFIG_NUMA
-/*
- * XXX: node aware allocation can't work well to get new node's memory at this time.
- * Because, pgdat for the new node is not allocated/initialized yet itself.
- * To use new node's memory, more consideration will be necessary.
- */
-#define generic_alloc_nodedata(nid) \
-({ \
- memblock_alloc(sizeof(*pgdat), SMP_CACHE_BYTES); \
-})
-
-extern pg_data_t *node_data[];
-static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)
-{
- node_data[nid] = pgdat;
-}
-
-#else /* !CONFIG_NUMA */
-
-/* never called */
-static inline pg_data_t *generic_alloc_nodedata(int nid)
-{
- BUG();
- return NULL;
-}
-static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)
-{
-}
-#endif /* CONFIG_NUMA */
-#endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */
-
#ifdef CONFIG_MEMORY_HOTPLUG
struct page *pfn_to_online_page(unsigned long pfn);
diff --git a/mm/mm_init.c b/mm/mm_init.c
index 3ec04933f7fd..e1b3ea0523bd 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -1831,11 +1831,10 @@ void __init free_area_init(unsigned long *max_zone_pfn)
if (!node_online(nid)) {
/* Allocator not initialized yet */
- pgdat = arch_alloc_nodedata(nid);
+ pgdat = memblock_alloc(sizeof(*pgdat), SMP_CACHE_BYTES);
if (!pgdat)
panic("Cannot allocate %zuB for node %d.\n",
sizeof(*pgdat), nid);
- arch_refresh_nodedata(nid, pgdat);
}
pgdat = NODE_DATA(nid);
--
2.43.0
next prev parent reply other threads:[~2024-07-23 6:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 6:41 [PATCH v2 00/25] mm: introduce numa_memblks Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 01/25] mm: move kernel/numa.c to mm/ Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 02/25] MIPS: sgi-ip27: make NODE_DATA() the same as on all other architectures Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 03/25] MIPS: sgi-ip27: ensure node_possible_map only contains valid nodes Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 04/25] MIPS: sgi-ip27: drop HAVE_ARCH_NODEDATA_EXTENSION Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 05/25] MIPS: loongson64: rename __node_data to node_data Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 06/25] MIPS: loongson64: drop HAVE_ARCH_NODEDATA_EXTENSION Mike Rapoport
2024-07-23 6:41 ` Mike Rapoport [this message]
2024-07-23 6:41 ` [PATCH v2 08/25] arch, mm: move definition of node_data to generic code Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 09/25] arch, mm: pull out allocation of NODE_DATA " Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 10/25] x86/numa: simplify numa_distance allocation Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 11/25] x86/numa: use get_pfn_range_for_nid to verify that node spans memory Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 12/25] x86/numa: move FAKE_NODE_* defines to numa_emu Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 13/25] x86/numa_emu: simplify allocation of phys_dist Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 14/25] x86/numa_emu: split __apicid_to_node update to a helper function Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 15/25] x86/numa_emu: use a helper function to get MAX_DMA32_PFN Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 16/25] x86/numa: numa_{add,remove}_cpu: make cpu parameter unsigned Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 17/25] mm: introduce numa_memblks Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 18/25] mm: move numa_distance and related code from x86 to numa_memblks Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 19/25] mm: introduce numa_emulation Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 20/25] mm: numa_memblks: introduce numa_memblks_init Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 21/25] mm: numa_memblks: make several functions and variables static Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 22/25] mm: numa_memblks: use memblock_{start,end}_of_DRAM() when sanitizing meminfo Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 23/25] arch_numa: switch over to numa_memblks Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 24/25] mm: make range-to-target_node lookup facility a part of numa_memblks Mike Rapoport
2024-07-23 6:41 ` [PATCH v2 25/25] docs: move numa=fake description to kernel-parameters.txt Mike Rapoport
2024-07-24 22:44 ` [PATCH v2 00/25] mm: introduce numa_memblks Zi Yan
2024-07-25 0:35 ` Zi Yan
2024-07-25 2:48 ` Zi Yan
2024-07-26 9:40 ` Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240723064156.4009477-8-rppt@kernel.org \
--to=rppt@kernel$(echo .)org \
--cc=agordeev@linux$(echo .)ibm.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andreas@gaisler$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=bp@alien8$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=corbet@lwn$(echo .)net \
--cc=dan.j.williams@intel$(echo .)com \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=dave@stgolabs$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=david@redhat$(echo .)com \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=glaubitz@physik$(echo .)fu-berlin.de \
--cc=gor@linux$(echo .)ibm.com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hca@linux$(echo .)ibm.com \
--cc=jiaxun.yang@flygoat$(echo .)com \
--cc=jonathan.cameron@huawei$(echo .)com \
--cc=linux-acpi@vger$(echo .)kernel.org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-cxl@vger$(echo .)kernel.org \
--cc=linux-doc@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-riscv@lists$(echo .)infradead.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=loongarch@lists$(echo .)linux.dev \
--cc=mingo@redhat$(echo .)com \
--cc=nvdimm@lists$(echo .)linux.dev \
--cc=palmer@dabbelt$(echo .)com \
--cc=rafael@kernel$(echo .)org \
--cc=robh@kernel$(echo .)org \
--cc=samuel.holland@sifive$(echo .)com \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=ziy@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox