The acquired memory blocks for reserved may include blocks outside of
memory management. In this case, the nid variable is set to NUMA_NO_NODE
(-1), so an error occurs in node_set().
This adds a check using numa_valid_node() to numa_clear_kernel_node_hotplug()
that skips node_set() when nid is set to NUMA_NO_NODE.
Fixes: 87482708210f ("mm: introduce numa_memblks")
Cc: Mike Rapoport (Microsoft) <rppt@xxxxxxxxxx>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@xxxxxxxxxx>
Suggested-by: Yuji Ishikawa <yuji2.ishikawa@xxxxxxxxxxxxx>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@xxxxxxxxxxxxx>
---
mm/numa_memblks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
v2:
- Use numa_valid_node() instead of check.
- Add Reviewed-by: Mike Rapoport (Microsoft) <rppt@xxxxxxxxxx>
- Update description.
- Drop RFC from subject.
diff --git a/mm/numa_memblks.c b/mm/numa_memblks.c
index be52b93a9c58..a3877e9bc878 100644
--- a/mm/numa_memblks.c
+++ b/mm/numa_memblks.c
@@ -349,7 +349,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
for_each_reserved_mem_region(mb_region) {
int nid = memblock_get_region_node(mb_region);
- if (nid != MAX_NUMNODES)
+ if (numa_valid_node(nid))
node_set(nid, reserved_nodemask);
}
--
2.45.2
