mm-drop-config_have_arch_nodedata_extension.patch removed from -mm tree
The quilt patch titled
Subject: mm: drop CONFIG_HAVE_ARCH_NODEDATA_EXTENSION
has been removed from the -mm tree. Its filename was
mm-drop-config_have_arch_nodedata_extension.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: mm: drop CONFIG_HAVE_ARCH_NODEDATA_EXTENSION
Date: Wed, 7 Aug 2024 09:40:52 +0300
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 a new helper alloc_offline_node_data(), remove arch_refresh_nodedata() and cleanup include/linux/memory_hotplug.h from the associated ifdefery.
---
include/linux/memory_hotplug.h | 48 ------------------------------- include/linux/numa.h | 4 ++ mm/mm_init.c | 10 +----- mm/numa.c | 12 +++++++ 4 files changed, 18 insertions(+), 56 deletions(-)
include/linux/memory_hotplug.h renamed from include/linux/memory_hotplug.h~mm-drop-config_have_arch_nodedata_extension +0 -48
@@ -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);
include/linux/numa.h renamed from include/linux/numa.h~mm-drop-config_have_arch_nodedata_extension +4 -0
@@ -33,6 +33,8 @@ static inline bool numa_valid_node(int nextern struct pglist_data *node_data[];#define NODE_DATA (nid) (node_data[nid]) +void __init alloc_offline_node_data (int nid); +/* Generic implementation available */ int numa_nearest_node (int node,unsigned int state);
@@ -60,6 +62,8 @@ static inline int phys_to_target_node(u6 {return 0 ; } + +static inline void alloc_offline_node_data (int nid) {}#endif #define numa_map_to_online_node (node) numa_nearest_node(node, N_ONLINE)
mm/mm_init.c renamed from mm/mm_init.c~mm-drop-config_have_arch_nodedata_extension +2 -8
@@ -1835,14 +1835,8 @@ void __init free_area_init(unsigned longfor_each_node (nid) {pg_data_t *pgdat; -if (!node_online (nid)) { -/* Allocator not initialized yet */ - pgdat =arch_alloc_nodedata (nid); -if (!pgdat) -panic ("Cannot allocate %zuB for node %d.\n" , -sizeof (*pgdat), nid); -arch_refresh_nodedata (nid, pgdat); - } +if (!node_online (nid)) +alloc_offline_node_data (nid); pgdat =NODE_DATA (nid);free_area_init_node (nid);
mm/numa.c renamed from mm/numa.c~mm-drop-config_have_arch_nodedata_extension +12 -0
@@ -6,6 +6,18 @@struct pglist_data *node_data[MAX_NUMNODES ];EXPORT_SYMBOL (node_data); +void __init alloc_offline_node_data (int nid) +{ +pg_data_t *pgdat; + + pgdat =memblock_alloc (sizeof (*pgdat),SMP_CACHE_BYTES ); +if (!pgdat) +panic ("Cannot allocate %zuB for node %d.\n" , +sizeof (*pgdat), nid); + + node_data[nid] = pgdat; +} +/* Stub functions: */ #ifndef memory_add_physaddr_to_nid
_
Patches currently in -mm which might be from [email protected] are