Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecc3e771 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: memblock_phys_alloc(): don't panic 

Make the memblock_phys_alloc() function an inline wrapper for
memblock_phys_alloc_range() and update the memblock_phys_alloc() callers
to check the returned value and panic in case of error.

Link: http://lkml.kernel.org/r/1548057848-15136-8-git-send-email-rppt@linux.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Guo Ren <ren_guo@c-sky.com>				[c-sky]
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Juergen Gross <jgross@suse.com>			[Xen]
Cc: Mark Salter <msalter@redhat.com>
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: Paul Burton <paul.burton@mips.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 33755574

arch/arm/mm/init.c

+4 −0
Original line number Diff line number Diff line
@@ -206,6 +206,10 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align) 
	BUG_ON(!arm_memblock_steal_permitted);



	phys = memblock_phys_alloc(size, align);

	if (!phys)

		panic("Failed to steal %pa bytes at %pS\n",

		      &size, (void *)_RET_IP_);



	memblock_free(phys, size);

	memblock_remove(phys, size);

arch/arm64/mm/mmu.c

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ static phys_addr_t __init early_pgtable_alloc(void) 
	void *ptr;



	phys = memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE);

	if (!phys)

		panic("Failed to allocate page table page\n");



	/*

	 * The FIX_{PGD,PUD,PMD} slots may be in active use, but the FIX_PTE

arch/powerpc/sysdev/dart_iommu.c

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ static void allocate_dart(void) 
	 * prefetching into invalid pages and corrupting data

	 */

	tmp = memblock_phys_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE);

	if (!tmp)

		panic("DART: table allocation failed\n");



	dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) &

					 DARTMAP_RPNMASK);

arch/s390/kernel/crash_dump.c

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ struct save_area * __init save_area_alloc(bool is_boot_cpu) 
	struct save_area *sa;



	sa = (void *) memblock_phys_alloc(sizeof(*sa), 8);

	if (!sa)

		panic("Failed to allocate save area\n");



	if (is_boot_cpu)

		list_add(&sa->list, &dump_save_areas);

	else

arch/s390/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -966,6 +966,9 @@ static void __init setup_randomness(void) 


	vmms = (struct sysinfo_3_2_2 *) memblock_phys_alloc(PAGE_SIZE,

							    PAGE_SIZE);

	if (!vmms)

		panic("Failed to allocate memory for sysinfo structure\n");



	if (stsi(vmms, 3, 2, 2) == 0 && vmms->count)

		add_device_randomness(&vmms->vm, sizeof(vmms->vm[0]) * vmms->count);

	memblock_free((unsigned long) vmms, PAGE_SIZE);