From: Yajun Deng Date: Thu, 18 Jan 2024 06:18:53 +0000 (+0800) Subject: memblock: fix crash when reserved memory is not added to memory X-Git-Tag: v6.6.17~477 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e791a345fa73276643e860b59cb5c5054e5013b5;p=platform%2Fkernel%2Flinux-rpi.git memblock: fix crash when reserved memory is not added to memory [ Upstream commit 6a9531c3a88096a26cf3ac582f7ec44f94a7dcb2 ] After commit 61167ad5fecd ("mm: pass nid to reserve_bootmem_region()") nid of a reserved region is used by init_reserved_page() (with CONFIG_DEFERRED_STRUCT_PAGE_INIT=y) to access node strucure. In many cases the nid of the reserved memory is not set and this causes a crash. When the nid of a reserved region is not set, fall back to early_pfn_to_nid(), so that nid of the first_online_node will be passed to init_reserved_page(). Fixes: 61167ad5fecd ("mm: pass nid to reserve_bootmem_region()") Signed-off-by: Yajun Deng Link: https://lore.kernel.org/r/20240118061853.2652295-1-yajun.deng@linux.dev [rppt: massaged the commit message] Signed-off-by: Mike Rapoport (IBM) Signed-off-by: Sasha Levin --- diff --git a/mm/memblock.c b/mm/memblock.c index 913b252..6d18485 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2119,6 +2119,9 @@ static void __init memmap_init_reserved_pages(void) start = region->base; end = start + region->size; + if (nid == NUMA_NO_NODE || nid >= MAX_NUMNODES) + nid = early_pfn_to_nid(PFN_DOWN(start)); + reserve_bootmem_region(start, end, nid); } }