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

MIPS: 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-6-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
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: 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: 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
e74e2b8e 67e7a600

+5 -15
-2
arch/mips/include/asm/mmzone.h
··· 20 20 #define nid_to_addrbase(nid) 0 21 21 #endif 22 22 23 - extern void setup_zero_pages(void); 24 - 25 23 #endif /* _ASM_MMZONE_H_ */
+5 -13
arch/mips/mm/init.c
··· 59 59 /* 60 60 * Not static inline because used by IP27 special magic initialization code 61 61 */ 62 - void setup_zero_pages(void) 62 + static void __init setup_zero_pages(void) 63 63 { 64 - unsigned int order, i; 65 - struct page *page; 64 + unsigned int order; 66 65 67 66 if (cpu_has_vce) 68 67 order = 3; 69 68 else 70 69 order = 0; 71 70 72 - empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); 73 - if (!empty_zero_page) 74 - panic("Oh boy, that early out of memory?"); 75 - 76 - page = virt_to_page((void *)empty_zero_page); 77 - split_page(page, order); 78 - for (i = 0; i < (1 << order); i++, page++) 79 - mark_page_reserved(page); 71 + empty_zero_page = (unsigned long)memblock_alloc_or_panic(PAGE_SIZE << order, PAGE_SIZE); 80 72 81 73 zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK; 82 74 } ··· 462 470 BUILD_BUG_ON(IS_ENABLED(CONFIG_32BIT) && (PFN_PTE_SHIFT > PAGE_SHIFT)); 463 471 464 472 maar_init(); 465 - memblock_free_all(); 466 473 setup_zero_pages(); /* Setup zeroed pages. */ 467 474 mem_init_free_highmem(); 475 + memblock_free_all(); 468 476 469 477 #ifdef CONFIG_64BIT 470 478 if ((unsigned long) &_text > (unsigned long) CKSEG0) ··· 478 486 void __init mem_init(void) 479 487 { 480 488 high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); 481 - memblock_free_all(); 482 489 setup_zero_pages(); /* This comes from node 0 */ 490 + memblock_free_all(); 483 491 } 484 492 #endif /* !CONFIG_NUMA */ 485 493