Commit 4267739c authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

arch, mm: consolidate initialization of SPARSE memory model 

Every architecture calls sparse_init() during setup_arch() although the
data structures created by sparse_init() are not used until the
initialization of the core MM.

Beside the code duplication, calling sparse_init() from architecture
specific code causes ordering differences of vmemmap and HVO
initialization on different architectures.

Move the call to sparse_init() from architecture specific code to
free_area_init() to ensure that vmemmap and HVO initialization order is
always the same.

Link: https://lkml.kernel.org/r/20260111082105.290734-25-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alex Shi <alexs@kernel.org>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Klara Modin <klarasmodin@gmail.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Magnus Lindholm <linmag7@gmail.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Pratyush Yadav <pratyush@kernel.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d49004c5

Documentation/mm/memory-model.rst

+0 −3
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ sections: 
  `mem_section` objects and the number of rows is calculated to fit

  all the memory sections.



The architecture setup code should call sparse_init() to

initialize the memory sections and the memory maps.



With SPARSEMEM there are two possible ways to convert a PFN to the

corresponding `struct page` - a "classic sparse" and "sparse

vmemmap". The selection is made at build time and it is determined by

Documentation/translations/zh_CN/mm/memory-model.rst

+0 −2
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ SPARSEMEM模型将物理内存显示为一个部分的集合。一个区段用me 
  每一行包含价值 `PAGE_SIZE` 的 `mem_section` 对象，行数的计算是为了适应所有的

  内存区。



架构设置代码应该调用sparse_init()来初始化内存区和内存映射。



通过SPARSEMEM，有两种可能的方式将PFN转换为相应的 `struct page` --"classic sparse"和

 "sparse vmemmap"。选择是在构建时进行的，它由 `CONFIG_SPARSEMEM_VMEMMAP` 的

 值决定。

arch/alpha/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -607,7 +607,6 @@ setup_arch(char **cmdline_p) 
	/* Find our memory.  */

	setup_memory(kernel_end);

	memblock_set_bottom_up(true);

	sparse_init();



	/* First guess at cpu cache sizes.  Do this before init_arch.  */

	determine_cpu_caches(cpu->type);

arch/arm/mm/init.c

+0 −6
Original line number Diff line number Diff line
@@ -207,12 +207,6 @@ void __init bootmem_init(void) 


	early_memtest((phys_addr_t)min_low_pfn << PAGE_SHIFT,

		      (phys_addr_t)max_low_pfn << PAGE_SHIFT);



	/*

	 * sparse_init() tries to allocate memory from memblock, so must be

	 * done after the fixed reservations

	 */

	sparse_init();

}



/*

arch/arm64/mm/init.c

+0 −6
Original line number Diff line number Diff line
@@ -321,12 +321,6 @@ void __init bootmem_init(void) 
#endif



	kvm_hyp_reserve();



	/*

	 * sparse_init() tries to allocate memory from memblock, so must be

	 * done after the fixed reservations

	 */

	sparse_init();

	dma_limits_init();



	/*