mm/memblock: Introduce memblock_alloc_node_or_panic() helper
Subsystems (6)
PATCH 1/1 mm/memblock: Introduce memblock_alloc_node_or_panic() helper
During early boot, several subsystems allocate memory from specific NUMA nodes using memblock_alloc_node(). When allocation fails, the typical requirement is to panic immediately.
Introduce memblock_alloc_node_or_panic() to automatically panic on allocation failure. This reduces repetitive error checking, improves code consistency across subsystems, and enhances code readability.
--- arch/sh/mm/numa.c | 10 ++++------ arch/sparc/kernel/setup_64.c | 16 ++++++---------- arch/x86/coco/sev/core.c | 5 ++--- include/linux/memblock.h | 6 ++++++ mm/memblock.c | 22 ++++++++++++++++++++++ mm/mm_init.c | 11 ++++------- mm/sparse.c | 13 +++++-------- 7 files changed, 49 insertions(+), 34 deletions(-)
arch/sh/mm/numa.c +4 -6
@@ -38,12 +38,10 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)__add_active_range (nid, start_pfn, end_pfn);/* Node-local pgdat */ -NODE_DATA (nid) =memblock_alloc_node (sizeof (struct pglist_data ), -SMP_CACHE_BYTES , nid); -if (!NODE_DATA (nid)) -panic ("%s: Failed to allocate %zu bytes align=0x%x nid=%d\n" , - __func__,sizeof (struct pglist_data ),SMP_CACHE_BYTES , - nid); +NODE_DATA (nid) =memblock_alloc_node_or_panic ( +sizeof (struct pglist_data ), +SMP_CACHE_BYTES , + nid);NODE_DATA (nid)->node_start_pfn = start_pfn;NODE_DATA (nid)->node_spanned_pages = end_pfn - start_pfn;
arch/sparc/kernel/setup_64.c +6 -10
@@ -606,16 +606,12 @@ static void __init alloc_irqstack_bootmem(void)for_each_possible_cpu (i) { node =cpu_to_node (i); - 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); + softirq_stack[i] =memblock_alloc_node_or_panic (THREAD_SIZE , +THREAD_SIZE , + node); + hardirq_stack[i] =memblock_alloc_node_or_panic (THREAD_SIZE , +THREAD_SIZE , + node); } }
arch/x86/coco/sev/core.c +2 -3
@@ -1191,9 +1191,8 @@ static void __init alloc_runtime_data(int cpu) {struct sev_es_runtime_data *data; - data =memblock_alloc_node (sizeof (*data),PAGE_SIZE ,cpu_to_node (cpu)); -if (!data) -panic ("Can't allocate SEV-ES runtime data" ); + data =memblock_alloc_node_or_panic (sizeof (*data),PAGE_SIZE , +cpu_to_node (cpu));per_cpu (runtime_data, cpu) = data;
include/linux/memblock.h +6 -0
@@ -433,6 +433,12 @@ void *__memblock_alloc_or_panic(phys_addr_t size, phys_addr_t align,#define memblock_alloc_or_panic (size, align) \ __memblock_alloc_or_panic(size, align, __func__) +void *__memblock_alloc_node_or_panic (phys_addr_t size,phys_addr_t align, +int nid,const char *func); + +#define memblock_alloc_node_or_panic (size, align, nid) \ + __memblock_alloc_node_or_panic(size, align, nid, __func__) +static inline void *memblock_alloc_raw (phys_addr_t size,phys_addr_t align) {
mm/memblock.c +22 -0
@@ -1845,6 +1845,28 @@ void *__init __memblock_alloc_or_panic(phys_addr_t size, phys_addr_t align,return addr; } +/** +* __memblock_alloc_node_or_panic - Try to allocate memory on a node and panic on failure +* @size: size of memory block to be allocated in bytes +* @align: alignment of the region and block's size +* @nid: nid of the free area to find, %NUMA_NO_NODE for any node +* @func: caller func name +* +* This function attempts to allocate memory on a specific node using memblock_alloc_node, +* and in case of failure, it calls panic with the formatted message. +* This function should not be used directly, please use the macro memblock_alloc_node_or_panic. +*/ +void *__init __memblock_alloc_node_or_panic (phys_addr_t size,phys_addr_t align, +int nid,const char *func) +{ +void *addr =memblock_alloc_node (size, align, nid); + +if (unlikely (!addr)) +panic ("%s: Failed to allocate %pap bytes on node %d\n" , + func, &size, nid); +return addr; +} +/* * Remaining API functions */
mm/mm_init.c +4 -7
@@ -1477,14 +1477,11 @@ static void __ref setup_usemap(struct zone *zone)unsigned long usemapsize =usemap_size (zone->zone_start_pfn, zone->spanned_pages); zone->pageblock_flags =NULL ; -if (usemapsize) { +if (usemapsize) zone->pageblock_flags = -memblock_alloc_node (usemapsize,SMP_CACHE_BYTES , -zone_to_nid (zone)); -if (!zone->pageblock_flags) -panic ("Failed to allocate %ld bytes for zone %s pageblock flags on node %d\n" , - usemapsize, zone->name,zone_to_nid (zone)); - } +memblock_alloc_node_or_panic (usemapsize, +SMP_CACHE_BYTES , + zone_to_nid(zone)); }#else static inline void setup_usemap (struct zone *zone) {}
mm/sparse.c +5 -8
@@ -66,15 +66,12 @@ static noinline struct mem_section __ref *sparse_index_alloc(int nid)unsigned long array_size =SECTIONS_PER_ROOT *sizeof (struct mem_section ); -if (slab_is_available ()) { +if (slab_is_available ()) section =kzalloc_node (array_size,GFP_KERNEL , nid); - }else { - section =memblock_alloc_node (array_size,SMP_CACHE_BYTES , - nid); -if (!section) -panic ("%s: Failed to allocate %lu bytes nid=%d\n" , - __func__, array_size, nid); - } +else + section =memblock_alloc_node_or_panic (array_size, +SMP_CACHE_BYTES , + nid);return section; }
Signature · 1 line
2.20.1
Mike Rapoport
maintainerQuoted 7 lines · Zhen Ni
During early boot, several subsystems allocate memory from specific NUMA nodes using
memblock_alloc_node(). When allocation fails, the typical requirement is to panic immediately.Introduce
memblock_alloc_node_or_panic()to automatically panic on allocation failure. This reduces repetitive error checking, improves code consistency across subsystems, and enhances code readability.
memblock_alloc_or_panic() made sense because it's the most used memblock API.
Adding panic() versions for a handful of uses is unnecessary churn.
A better patch would be to update panic() messages to convey more useful information.
Quoted 19 lines
Signed-off-by Zhen Ni <[email protected]>--- arch/sh/mm/numa.c | 10 ++++------ arch/sparc/kernel/setup_64.c | 16 ++++++---------- arch/x86/coco/sev/core.c | 5 ++--- include/linux/memblock.h | 6 ++++++ mm/memblock.c | 22 ++++++++++++++++++++++ mm/mm_init.c | 11 ++++------- mm/sparse.c | 13 +++++-------- 7 files changed, 49 insertions(+), 34 deletions(-)arch/sh/mm/numa.c +0
-0@@ -38,12 +38,10 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)__add_active_range (nid, start_pfn, end_pfn);/* Node-local pgdat */
arch/sh/mm/numa.c void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) · line 44
Quoted 10 lines
arch/sh/mm/numa.c +4
-6-NODE_DATA (nid) =memblock_alloc_node (sizeof (struct pglist_data ), -SMP_CACHE_BYTES , nid); -if (!NODE_DATA (nid)) -panic ("%s: Failed to allocate %zu bytes align=0x%x nid=%d\n" , - __func__,sizeof (struct pglist_data ),SMP_CACHE_BYTES , - nid); +NODE_DATA (nid) =memblock_alloc_node_or_panic ( +sizeof (struct pglist_data ), +SMP_CACHE_BYTES , + nid);
Please don't touch this, the entire file is going away after rc1.
Quoted 3 lines
arch/sh/mm/numa.c +0
-0NODE_DATA (nid)->node_start_pfn = start_pfn;NODE_DATA (nid)->node_spanned_pages = end_pfn - start_pfn;
Signature · 2 lines
Sincerely yours, Mike.