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

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.comSigned-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
...@@ -206,6 +206,10 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align) ...@@ -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); BUG_ON(!arm_memblock_steal_permitted);
phys = memblock_phys_alloc(size, align); 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_free(phys, size);
memblock_remove(phys, size); memblock_remove(phys, size);
......
...@@ -103,6 +103,8 @@ static phys_addr_t __init early_pgtable_alloc(void) ...@@ -103,6 +103,8 @@ static phys_addr_t __init early_pgtable_alloc(void)
void *ptr; void *ptr;
phys = memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE); 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 * The FIX_{PGD,PUD,PMD} slots may be in active use, but the FIX_PTE
......
...@@ -265,6 +265,9 @@ static void allocate_dart(void) ...@@ -265,6 +265,9 @@ static void allocate_dart(void)
* prefetching into invalid pages and corrupting data * prefetching into invalid pages and corrupting data
*/ */
tmp = memblock_phys_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE); 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) & dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) &
DARTMAP_RPNMASK); DARTMAP_RPNMASK);
......
...@@ -61,6 +61,9 @@ struct save_area * __init save_area_alloc(bool is_boot_cpu) ...@@ -61,6 +61,9 @@ struct save_area * __init save_area_alloc(bool is_boot_cpu)
struct save_area *sa; struct save_area *sa;
sa = (void *) memblock_phys_alloc(sizeof(*sa), 8); sa = (void *) memblock_phys_alloc(sizeof(*sa), 8);
if (!sa)
panic("Failed to allocate save area\n");
if (is_boot_cpu) if (is_boot_cpu)
list_add(&sa->list, &dump_save_areas); list_add(&sa->list, &dump_save_areas);
else else
......
...@@ -966,6 +966,9 @@ static void __init setup_randomness(void) ...@@ -966,6 +966,9 @@ static void __init setup_randomness(void)
vmms = (struct sysinfo_3_2_2 *) memblock_phys_alloc(PAGE_SIZE, vmms = (struct sysinfo_3_2_2 *) memblock_phys_alloc(PAGE_SIZE,
PAGE_SIZE); PAGE_SIZE);
if (!vmms)
panic("Failed to allocate memory for sysinfo structure\n");
if (stsi(vmms, 3, 2, 2) == 0 && vmms->count) if (stsi(vmms, 3, 2, 2) == 0 && vmms->count)
add_device_randomness(&vmms->vm, sizeof(vmms->vm[0]) * vmms->count); add_device_randomness(&vmms->vm, sizeof(vmms->vm[0]) * vmms->count);
memblock_free((unsigned long) vmms, PAGE_SIZE); memblock_free((unsigned long) vmms, PAGE_SIZE);
......
...@@ -557,6 +557,9 @@ static void __init ap325rxa_mv_mem_reserve(void) ...@@ -557,6 +557,9 @@ static void __init ap325rxa_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE; phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
phys = memblock_phys_alloc(size, PAGE_SIZE); phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU memory\n");
memblock_free(phys, size); memblock_free(phys, size);
memblock_remove(phys, size); memblock_remove(phys, size);
......
...@@ -1477,11 +1477,17 @@ static void __init ecovec_mv_mem_reserve(void) ...@@ -1477,11 +1477,17 @@ static void __init ecovec_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE; phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
phys = memblock_phys_alloc(size, PAGE_SIZE); phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU0 memory\n");
memblock_free(phys, size); memblock_free(phys, size);
memblock_remove(phys, size); memblock_remove(phys, size);
ceu0_dma_membase = phys; ceu0_dma_membase = phys;
phys = memblock_phys_alloc(size, PAGE_SIZE); phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU1 memory\n");
memblock_free(phys, size); memblock_free(phys, size);
memblock_remove(phys, size); memblock_remove(phys, size);
ceu1_dma_membase = phys; ceu1_dma_membase = phys;
......
...@@ -631,6 +631,9 @@ static void __init kfr2r09_mv_mem_reserve(void) ...@@ -631,6 +631,9 @@ static void __init kfr2r09_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE; phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
phys = memblock_phys_alloc(size, PAGE_SIZE); phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU memory\n");
memblock_free(phys, size); memblock_free(phys, size);
memblock_remove(phys, size); memblock_remove(phys, size);
......
...@@ -631,6 +631,9 @@ static void __init migor_mv_mem_reserve(void) ...@@ -631,6 +631,9 @@ static void __init migor_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE; phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
phys = memblock_phys_alloc(size, PAGE_SIZE); phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU memory\n");
memblock_free(phys, size); memblock_free(phys, size);
memblock_remove(phys, size); memblock_remove(phys, size);
......
...@@ -964,11 +964,17 @@ static void __init ms7724se_mv_mem_reserve(void) ...@@ -964,11 +964,17 @@ static void __init ms7724se_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE; phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
phys = memblock_phys_alloc(size, PAGE_SIZE); phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU0 memory\n");
memblock_free(phys, size); memblock_free(phys, size);
memblock_remove(phys, size); memblock_remove(phys, size);
ceu0_dma_membase = phys; ceu0_dma_membase = phys;
phys = memblock_phys_alloc(size, PAGE_SIZE); phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU1 memory\n");
memblock_free(phys, size); memblock_free(phys, size);
memblock_remove(phys, size); memblock_remove(phys, size);
ceu1_dma_membase = phys; ceu1_dma_membase = phys;
......
...@@ -54,6 +54,9 @@ static void __init populate(void *start, void *end) ...@@ -54,6 +54,9 @@ static void __init populate(void *start, void *end)
phys_addr_t phys = phys_addr_t phys =
memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE); memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE);
if (!phys)
panic("Failed to allocate page table page\n");
set_pte(pte + j, pfn_pte(PHYS_PFN(phys), PAGE_KERNEL)); set_pte(pte + j, pfn_pte(PHYS_PFN(phys), PAGE_KERNEL));
} }
} }
......
...@@ -330,7 +330,12 @@ phys_addr_t memblock_phys_alloc_range(phys_addr_t size, phys_addr_t align, ...@@ -330,7 +330,12 @@ phys_addr_t memblock_phys_alloc_range(phys_addr_t size, phys_addr_t align,
phys_addr_t memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid); phys_addr_t memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid);
phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid); phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid);
phys_addr_t memblock_phys_alloc(phys_addr_t size, phys_addr_t align); static inline phys_addr_t memblock_phys_alloc(phys_addr_t size,
phys_addr_t align)
{
return memblock_phys_alloc_range(size, align, 0,
MEMBLOCK_ALLOC_ACCESSIBLE);
}
void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align, void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
phys_addr_t min_addr, phys_addr_t max_addr, phys_addr_t min_addr, phys_addr_t max_addr,
......
...@@ -1325,11 +1325,6 @@ phys_addr_t __init memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys ...@@ -1325,11 +1325,6 @@ phys_addr_t __init memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys
return alloc; return alloc;
} }
phys_addr_t __init memblock_phys_alloc(phys_addr_t size, phys_addr_t align)
{
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
}
phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid) phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid)
{ {
phys_addr_t res = memblock_phys_alloc_nid(size, align, nid); phys_addr_t res = memblock_phys_alloc_nid(size, align, nid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment