Skip to content

Commit

Permalink
memblock: memblock_phys_alloc(): don't panic
Browse files Browse the repository at this point in the history
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/[email protected]
Signed-off-by: Mike Rapoport <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Christophe Leroy <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Dennis Zhou <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Greentime Hu <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Guan Xuetao <[email protected]>
Cc: Guo Ren <[email protected]>
Cc: Guo Ren <[email protected]>				[c-sky]
Cc: Heiko Carstens <[email protected]>
Cc: Juergen Gross <[email protected]>			[Xen]
Cc: Mark Salter <[email protected]>
Cc: Matt Turner <[email protected]>
Cc: Max Filippov <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Paul Burton <[email protected]>
Cc: Petr Mladek <[email protected]>
Cc: Richard Weinberger <[email protected]>
Cc: Rich Felker <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Russell King <[email protected]>
Cc: Stafford Horne <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Vineet Gupta <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
rppt authored and torvalds committed Mar 12, 2019
1 parent 3375557 commit ecc3e77
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 6 deletions.
4 changes: 4 additions & 0 deletions arch/arm/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/mm/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions arch/powerpc/sysdev/dart_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions arch/s390/kernel/crash_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions arch/s390/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions arch/sh/boards/mach-ap325rxa/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,9 @@ static void __init ap325rxa_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;

phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU memory\n");

memblock_free(phys, size);
memblock_remove(phys, size);

Expand Down
6 changes: 6 additions & 0 deletions arch/sh/boards/mach-ecovec24/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1477,11 +1477,17 @@ static void __init ecovec_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;

phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU0 memory\n");

memblock_free(phys, size);
memblock_remove(phys, size);
ceu0_dma_membase = phys;

phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU1 memory\n");

memblock_free(phys, size);
memblock_remove(phys, size);
ceu1_dma_membase = phys;
Expand Down
3 changes: 3 additions & 0 deletions arch/sh/boards/mach-kfr2r09/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,9 @@ static void __init kfr2r09_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;

phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU memory\n");

memblock_free(phys, size);
memblock_remove(phys, size);

Expand Down
3 changes: 3 additions & 0 deletions arch/sh/boards/mach-migor/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,9 @@ static void __init migor_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;

phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU memory\n");

memblock_free(phys, size);
memblock_remove(phys, size);

Expand Down
6 changes: 6 additions & 0 deletions arch/sh/boards/mach-se/7724/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -964,11 +964,17 @@ static void __init ms7724se_mv_mem_reserve(void)
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;

phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU0 memory\n");

memblock_free(phys, size);
memblock_remove(phys, size);
ceu0_dma_membase = phys;

phys = memblock_phys_alloc(size, PAGE_SIZE);
if (!phys)
panic("Failed to allocate CEU1 memory\n");

memblock_free(phys, size);
memblock_remove(phys, size);
ceu1_dma_membase = phys;
Expand Down
3 changes: 3 additions & 0 deletions arch/xtensa/mm/kasan_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ static void __init populate(void *start, void *end)
phys_addr_t phys =
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));
}
}
Expand Down
7 changes: 6 additions & 1 deletion include/linux/memblock.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_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,
phys_addr_t min_addr, phys_addr_t max_addr,
Expand Down
5 changes: 0 additions & 5 deletions mm/memblock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1325,11 +1325,6 @@ phys_addr_t __init memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys
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 res = memblock_phys_alloc_nid(size, align, nid);
Expand Down

0 comments on commit ecc3e77

Please sign in to comment.