Commit d95fb348 authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu Committed by Andrew Morton
Browse files

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: 87482708 ("mm: introduce numa_memblks")
Signed-off-by: default avatarNobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Reviewed-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Suggested-by: default avatarYuji Ishikawa <yuji2.ishikawa@toshiba.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent bc0a2f3a

mm/numa_memblks.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}