In some physical memory layout designs, the address space of CFMW resides between multiple segments of system memory belonging to the same NUMA node. In numa_cleanup_meminfo, these multiple segments of system memory are merged into a larger numa_memblk. When identifying which NUMA node the CFMW belongs to, it may be incorrectly assigned to the NUMA node of the merged system memory. To address this scenario, accurately identifying the correct NUMA node can be achieved by checking whether the region belongs to both numa_meminfo and numa_reserved_meminfo. Signed-off-by: Cui Chao --- mm/numa_memblks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/numa_memblks.c b/mm/numa_memblks.c index 5b009a9cd8b4..1ef037f0e0e0 100644 --- a/mm/numa_memblks.c +++ b/mm/numa_memblks.c @@ -573,7 +573,8 @@ int phys_to_target_node(u64 start) * Prefer online nodes, but if reserved memory might be * hot-added continue the search with reserved ranges. */ - if (nid != NUMA_NO_NODE) + if (nid != NUMA_NO_NODE && + meminfo_to_nid(&numa_reserved_meminfo, start) == NUMA_NO_NODE) return nid; return meminfo_to_nid(&numa_reserved_meminfo, start); -- 2.33.0