Commit 35c3151a authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Ingo Molnar
Browse files

x86/mm: Consolidate initmem_init() 



There are 4 wariants of initmem_init(), for 32 and 64 bits and for
CONFIG_NUMA enabled and disabled.

After commit bbeb69ce ("x86/mm: Remove CONFIG_HIGHMEM64G support")
NUMA is not supported on 32 bit kernels anymore, and
arch/x86/mm/numa_32.c can be just deleted and setup_bootmem_allocator()
with completely misleading name can be folded into initmem_init().

For 64 bits the NUMA variant calls x86_numa_init() and !NUMA variant
sets all memory to node 0. The later can be split out into inline helper
called x86_numa_init() and then both initmem_init() functions become the
same.

Split out memblock_set_node() from initmem_init() for !NUMA on 64 bit
into x86_numa_init() helper and remove arch/x86/mm/numa_*.c that only
contained initmem_init() variants for NUMA configs.

Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Len Brown <len.brown@intel.com>
Link: https://lore.kernel.org/r/20250409122815.420041-1-rppt@kernel.org
parent 78a84fbf

arch/x86/include/asm/page_32_types.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ extern unsigned int __VMALLOC_RESERVE; 
extern int sysctl_legacy_va_layout;



extern void find_low_pfn_range(void);

extern void setup_bootmem_allocator(void);



#endif	/* !__ASSEMBLER__ */

arch/x86/mm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ obj-$(CONFIG_MMIOTRACE) += mmiotrace.o 
mmiotrace-y			:= kmmio.o pf_in.o mmio-mod.o

obj-$(CONFIG_MMIOTRACE_TEST)	+= testmmiotrace.o



obj-$(CONFIG_NUMA)		+= numa.o numa_$(BITS).o

obj-$(CONFIG_NUMA)		+= numa.o

obj-$(CONFIG_AMD_NUMA)		+= amdtopology.o

obj-$(CONFIG_ACPI_NUMA)		+= srat.o

arch/x86/mm/init_32.c

+0 −7
Original line number Diff line number Diff line
@@ -612,7 +612,6 @@ void __init find_low_pfn_range(void) 
		highmem_pfn_init();

}



#ifndef CONFIG_NUMA

void __init initmem_init(void)

{

#ifdef CONFIG_HIGHMEM
@@ -633,12 +632,6 @@ void __init initmem_init(void) 
	printk(KERN_NOTICE "%ldMB LOWMEM available.\n",

			pages_to_mb(max_low_pfn));



	setup_bootmem_allocator();

}

#endif /* !CONFIG_NUMA */



void __init setup_bootmem_allocator(void)

{

	printk(KERN_INFO "  mapped low ram: 0 - %08lx\n",

		 max_pfn_mapped<<PAGE_SHIFT);

	printk(KERN_INFO "  low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT);

arch/x86/mm/init_64.c

+6 −1
Original line number Diff line number Diff line
@@ -805,12 +805,17 @@ kernel_physical_mapping_change(unsigned long paddr_start, 
}



#ifndef CONFIG_NUMA

void __init initmem_init(void)

static inline void x86_numa_init(void)

{

	memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);

}

#endif



void __init initmem_init(void)

{

	x86_numa_init();

}



void __init paging_init(void)

{

	sparse_init();

arch/x86/mm/mm_internal.h

+4 −0
Original line number Diff line number Diff line
@@ -25,4 +25,8 @@ void update_cache_mode_entry(unsigned entry, enum page_cache_mode cache); 


extern unsigned long tlb_single_page_flush_ceiling;



#ifdef CONFIG_NUMA

void __init x86_numa_init(void);

#endif



#endif	/* __X86_MM_INTERNAL_H */