Re: [PATCH 15/21] sparc: add checks for the return value of memblock_alloc*()

[David Miller]

From: Mike Rapoport 
Date: Wed, 16 Jan 2019 15:44:15 +0200

> Add panic() calls if memblock_alloc*() returns NULL.
> 
> Most of the changes are simply addition of
> 
> if(!ptr)
> panic();
> 
> statements after the calls to memblock_alloc*() variants.
> 
> Exceptions are pcpu_populate_pte() and kernel_map_range() that were
> slightly refactored to accommodate the change.
> 
> Signed-off-by: Mike Rapoport 

Acked-by: David S. Miller 

[PATCH 15/21] sparc: add checks for the return value of memblock_alloc*()

[Mike Rapoport]

Add panic() calls if memblock_alloc*() returns NULL.

Most of the changes are simply addition of

if(!ptr)
panic();

statements after the calls to memblock_alloc*() variants.

Exceptions are pcpu_populate_pte() and kernel_map_range() that were
slightly refactored to accommodate the change.

Signed-off-by: Mike Rapoport 
---
 arch/sparc/kernel/prom_32.c  |  2 ++
 arch/sparc/kernel/setup_64.c |  6 ++
 arch/sparc/kernel/smp_64.c   | 12 
 arch/sparc/mm/init_64.c  | 11 +++
 arch/sparc/mm/srmmu.c|  8 
 5 files changed, 39 insertions(+)

diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index e7126ca..869b16c 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -33,6 +33,8 @@ void * __init prom_early_alloc(unsigned long size)
void *ret;
 
ret = memblock_alloc(size, SMP_CACHE_BYTES);
+   if (!ret)
+   panic("%s: Failed to allocate %lu bytes\n", __func__, size);
 
prom_early_allocated += size;
 
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 51c4d12..fd2182a 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -624,8 +624,14 @@ void __init alloc_irqstack_bootmem(void)
 
softirq_stack[i] = memblock_alloc_node(THREAD_SIZE,
   THREAD_SIZE, node);
+   if (!softirq_stack[i])
+   panic("%s: Failed to allocate %lu bytes align=%lx 
nid=%d\n",
+ __func__, THREAD_SIZE, THREAD_SIZE, node);
hardirq_stack[i] = memblock_alloc_node(THREAD_SIZE,
   THREAD_SIZE, node);
+   if (!hardirq_stack[i])
+   panic("%s: Failed to allocate %lu bytes align=%lx 
nid=%d\n",
+ __func__, THREAD_SIZE, THREAD_SIZE, node);
}
 }
 
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index f45d876..a8275fe 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1628,6 +1628,8 @@ static void __init pcpu_populate_pte(unsigned long addr)
pud_t *new;
 
new = memblock_alloc_from(PAGE_SIZE, PAGE_SIZE, PAGE_SIZE);
+   if (!new)
+   goto err_alloc;
pgd_populate(&init_mm, pgd, new);
}
 
@@ -1636,6 +1638,8 @@ static void __init pcpu_populate_pte(unsigned long addr)
pmd_t *new;
 
new = memblock_alloc_from(PAGE_SIZE, PAGE_SIZE, PAGE_SIZE);
+   if (!new)
+   goto err_alloc;
pud_populate(&init_mm, pud, new);
}
 
@@ -1644,8 +1648,16 @@ static void __init pcpu_populate_pte(unsigned long addr)
pte_t *new;
 
new = memblock_alloc_from(PAGE_SIZE, PAGE_SIZE, PAGE_SIZE);
+   if (!new)
+   goto err_alloc;
pmd_populate_kernel(&init_mm, pmd, new);
}
+
+   return;
+
+err_alloc:
+   panic("%s: Failed to allocate %lu bytes align=%lx from=%lx\n",
+ __func__, PAGE_SIZE, PAGE_SIZE, PAGE_SIZE);
 }
 
 void __init setup_per_cpu_areas(void)
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index ef340e8..f2d70ff 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1809,6 +1809,8 @@ static unsigned long __ref kernel_map_range(unsigned long 
pstart,
 
new = memblock_alloc_from(PAGE_SIZE, PAGE_SIZE,
  PAGE_SIZE);
+   if (!new)
+   goto err_alloc;
alloc_bytes += PAGE_SIZE;
pgd_populate(&init_mm, pgd, new);
}
@@ -1822,6 +1824,8 @@ static unsigned long __ref kernel_map_range(unsigned long 
pstart,
}
new = memblock_alloc_from(PAGE_SIZE, PAGE_SIZE,
  PAGE_SIZE);
+   if (!new)
+   goto err_alloc;
alloc_bytes += PAGE_SIZE;
pud_populate(&init_mm, pud, new);
}
@@ -1836,6 +1840,8 @@ static unsigned long __ref kernel_map_range(unsigned long 
pstart,
}
new = memblock_alloc_from(PAGE_SIZE, PAGE_SIZE,
  PAGE_SIZE);
+   if (!new)
+   goto err_alloc;
alloc_bytes += PAGE_SIZE;
pmd_populate_kernel(&init_mm, pmd, new);
}
@@ -1855,6 +1861,11 @@ static unsigned long __ref kernel_map_range(unsigned 
long pstart,
}
 
return alloc_bytes;
+
+err_alloc:
+   panic("%s: Failed to allocate %lu byt