samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm/memblock: repeat setting reserved region nid if array is doubled

Browse Source 
commit eac8ea8736ccc09513152d970eb2a42ed78e87e8 upstream.

Commit 61167ad5fe ("mm: pass nid to reserve_bootmem_region()") introduce
a way to set nid to all reserved region.

But there is a corner case it will leave some region with invalid nid.
When memblock_set_node() doubles the array of memblock.reserved, it may
lead to a new reserved region before current position. The new region
will be left with an invalid node id.

Repeat the process when detecting it.

Fixes: 61167ad5fe ("mm: pass nid to reserve_bootmem_region()")
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
CC: Mike Rapoport <rppt@kernel.org>
CC: Yajun Deng <yajun.deng@linux.dev>
CC: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20250318071948.23854-3-richard.weiyang@gmail.com
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Wei Yang
2025-03-18 07:19:47 +00:00
committed by Greg Kroah-Hartman
parent c0fabecd65
commit 4d1a2d1363
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mm/memblock.c
View File

@@ -2122,11 +2122,14 @@ static void __init memmap_init_reserved_pages(void)
struct memblock_region *region; struct memblock_region *region;
phys_addr_t start, end; phys_addr_t start, end;
int nid; int nid;
unsigned long max_reserved;
/* /*
* set nid on all reserved pages and also treat struct * set nid on all reserved pages and also treat struct
* pages for the NOMAP regions as PageReserved * pages for the NOMAP regions as PageReserved
*/ */
repeat:
max_reserved = memblock.reserved.max;
for_each_mem_region(region) { for_each_mem_region(region) {
nid = memblock_get_region_node(region); nid = memblock_get_region_node(region);
start = region->base; start = region->base;
@@ -2137,6 +2140,13 @@ static void __init memmap_init_reserved_pages(void)
memblock_set_node(start, region->size, &memblock.reserved, nid); memblock_set_node(start, region->size, &memblock.reserved, nid);
} }
/*
* 'max' is changed means memblock.reserved has been doubled its
* array, which may result a new reserved region before current
* 'start'. Now we should repeat the procedure to set its node id.
*/
if (max_reserved != memblock.reserved.max)
goto repeat;
/* initialize struct pages for the reserved regions */ /* initialize struct pages for the reserved regions */
for_each_reserved_mem_region(region) { for_each_reserved_mem_region(region) {