Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390: make setup_zero_pages() use memblock

Allocating the zero pages from memblock is simpler because the memory is
already reserved.

This will also help with pulling out memblock_free_all() to the generic
code and reducing code duplication in arch::mem_init().

Link: https://lkml.kernel.org/r/20250313135003.836600-8-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Betkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Guo Ren (csky) <guoren@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russel King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleinxer <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Mike Rapoport (Microsoft) and committed by
Andrew Morton
54ccf66f be971f95

+3 -13
+3 -13
arch/s390/mm/init.c
··· 73 73 { 74 74 unsigned long total_pages = memblock_estimated_nr_free_pages(); 75 75 unsigned int order; 76 - struct page *page; 77 - int i; 78 76 79 77 /* Latest machines require a mapping granularity of 512KB */ 80 78 order = 7; ··· 81 83 while (order > 2 && (total_pages >> 10) < (1UL << order)) 82 84 order--; 83 85 84 - empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); 85 - if (!empty_zero_page) 86 - panic("Out of memory in setup_zero_pages"); 87 - 88 - page = virt_to_page((void *) empty_zero_page); 89 - split_page(page, order); 90 - for (i = 1 << order; i > 0; i--) { 91 - mark_page_reserved(page); 92 - page++; 93 - } 86 + empty_zero_page = (unsigned long)memblock_alloc_or_panic(PAGE_SIZE << order, PAGE_SIZE); 94 87 95 88 zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK; 96 89 } ··· 165 176 pv_init(); 166 177 kfence_split_mapping(); 167 178 179 + setup_zero_pages(); /* Setup zeroed pages. */ 180 + 168 181 /* this will put all low memory onto the freelists */ 169 182 memblock_free_all(); 170 - setup_zero_pages(); /* Setup zeroed pages. */ 171 183 } 172 184 173 185 unsigned long memory_block_size_bytes(void)