Commit 1e5d8e1e authored by Dan Williams's avatar Dan Williams
Browse files

x86/mm: Introduce CONFIG_NUMA_KEEP_MEMINFO 



Currently x86 numa_meminfo is marked __initdata in the
CONFIG_MEMORY_HOTPLUG=n case. In support of a new facility to allow
drivers to map reserved memory to a 'target_node'
(phys_to_target_node()), add support for removing the __initdata
designation for those users. Both memory hotplug and
phys_to_target_node() users select CONFIG_NUMA_KEEP_MEMINFO to tell the
arch to maintain its physical address to NUMA mapping infrastructure
post init.

Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <x86@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/158188326422.894464.15742054998046628934.stgit@dwillia2-desk3.amr.corp.intel.com
parent 575e23b6

arch/x86/mm/numa.c

+1 −5
Original line number Diff line number Diff line
@@ -25,11 +25,7 @@ nodemask_t numa_nodes_parsed __initdata; 
struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;

EXPORT_SYMBOL(node_data);



static struct numa_meminfo numa_meminfo

#ifndef CONFIG_MEMORY_HOTPLUG

__initdata

#endif

;

static struct numa_meminfo numa_meminfo __initdata_or_meminfo;



static int numa_distance_cnt;

static u8 *numa_distance;

include/linux/numa.h

+7 −0
Original line number Diff line number Diff line
@@ -13,6 +13,13 @@ 


#define	NUMA_NO_NODE	(-1)



/* optionally keep NUMA memory info available post init */

#ifdef CONFIG_NUMA_KEEP_MEMINFO

#define __initdata_or_meminfo

#else

#define __initdata_or_meminfo __initdata

#endif



#ifdef CONFIG_NUMA

int numa_map_to_online_node(int node);

#else

mm/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ config HAVE_FAST_GUP 
config ARCH_KEEP_MEMBLOCK

	bool



# Keep arch NUMA mapping infrastructure post-init.

config NUMA_KEEP_MEMINFO

	bool



config MEMORY_ISOLATION

	bool
@@ -154,6 +158,7 @@ config MEMORY_HOTPLUG 
	bool "Allow for memory hot-add"

	depends on SPARSEMEM || X86_64_ACPI_NUMA

	depends on ARCH_ENABLE_MEMORY_HOTPLUG

	select NUMA_KEEP_MEMINFO if NUMA



config MEMORY_HOTPLUG_SPARSE

	def_bool y

CRA Git | Maintained and supported by SUSTech CRA and CCSE