summaryrefslogtreecommitdiff
path: root/arch/x86/mm/numa_emulation.c
diff options
context:
space:
mode:
authorWei Yang <richard.weiyang@gmail.com>2017-07-08 04:30:59 +0300
committerIngo Molnar <mingo@kernel.org>2017-07-18 12:16:49 +0300
commit4f167201edda7cd7525cc7f23944731ef5dd99a8 (patch)
tree8ab7a84ce85810b08d0e6870d3be43721e294409 /arch/x86/mm/numa_emulation.c
parentd80a9eb3c78d7d0c823a8224cd6e3b37ebdfd8cd (diff)
downloadlinux-4f167201edda7cd7525cc7f23944731ef5dd99a8.tar.xz
x86/numa_emulation: Recalculate numa_nodes_parsed from emulated nodes
When emulating NUMA, the kernel's emulated NUMA configuration may contain more or less nodes than there are physical nodes. In numa_emulation(), we recalculate numa_meminfo/numa_distance/__apicid_to_node according to the number of emulated nodes, except numa_nodes_parsed, which is arguably an omission. Recalculate numa_nodes_parsed as well. Signed-off-by: Wei Yang <richard.weiyang@gmail.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: David Rientjes <rientjes@google.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: bp@alien8.de Cc: kirill@shutemov.name Cc: tj@kernel.org Link: http://lkml.kernel.org/r/20170708013059.29708-4-richard.weiyang@gmail.com [ Changelog fixes. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/numa_emulation.c')
-rw-r--r--arch/x86/mm/numa_emulation.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index 80904ede2e7f..d805162e6045 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -395,6 +395,13 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
/* commit */
*numa_meminfo = ei;
+ /* Make sure numa_nodes_parsed only contains emulated nodes */
+ nodes_clear(numa_nodes_parsed);
+ for (i = 0; i < ARRAY_SIZE(ei.blk); i++)
+ if (ei.blk[i].start != ei.blk[i].end &&
+ ei.blk[i].nid != NUMA_NO_NODE)
+ node_set(ei.blk[i].nid, numa_nodes_parsed);
+
/*
* Transform __apicid_to_node table to use emulated nids by
* reverse-mapping phys_nid. The maps should always exist but fall