From: Nobuhiro Iwamatsu Date: Wed, 16 Oct 2024 09:21:01 +0000 (+0900) Subject: mm: numa_clear_kernel_node_hotplug: Add NUMA_NO_NODE check for node id X-Git-Tag: v6.12-rc6~41^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d95fb348f0160f562ac07fa201dbbaf14524381f;p=thirdparty%2Flinux.git mm: numa_clear_kernel_node_hotplug: Add NUMA_NO_NODE check for node id 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. Link: https://lkml.kernel.org/r/1729070461-13576-1-git-send-email-nobuhiro1.iwamatsu@toshiba.co.jp Fixes: 87482708210f ("mm: introduce numa_memblks") Signed-off-by: Nobuhiro Iwamatsu Reviewed-by: Mike Rapoport (Microsoft) Reviewed-by: Anshuman Khandual Suggested-by: Yuji Ishikawa Signed-off-by: Andrew Morton --- diff --git a/mm/numa_memblks.c b/mm/numa_memblks.c index be52b93a9c580..a3877e9bc878a 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); }