Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1690116

[tip:x86/debug] x86/numa_emulation: Recalculate numa_nodes_parsed from emulated nodes

Show all headers | View raw

Commit-ID:  4f167201edda7cd7525cc7f23944731ef5dd99a8
Gitweb:     http://git.kernel.org/tip/4f167201edda7cd7525cc7f23944731ef5dd99a8
Author:     Wei Yang <richard.weiyang@gmail.com>
AuthorDate: Sat, 8 Jul 2017 09:30:59 +0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 18 Jul 2017 11:16:49 +0200

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>
---
 arch/x86/mm/numa_emulation.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index 80904ed..d805162 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V3 0/3] Refine numa_emulation Wei Yang <richard.weiyang@gmail.com> - 2017-07-08 03:40 +0200
  [PATCH V3 2/3] x86/numa_emulation: assign physnode_mask directly from numa_nodes_parsed Wei Yang <richard.weiyang@gmail.com> - 2017-07-08 03:40 +0200
    [tip:x86/debug] x86/numa_emulation: Assign physnode_mask directly  from numa_nodes_parsed tip-bot for Wei Yang <tipbot@zytor.com> - 2017-07-18 13:00 +0200
  [PATCH V3 3/3] x86/numa_emulation: restructures numa_nodes_parsed from emulated nodes Wei Yang <richard.weiyang@gmail.com> - 2017-07-08 03:40 +0200
    [tip:x86/debug] x86/numa_emulation: Recalculate numa_nodes_parsed  from emulated nodes tip-bot for Wei Yang <tipbot@zytor.com> - 2017-07-18 13:00 +0200
  [PATCH V3 1/3] x86/numa_emulation: refine the calculation of max_emu_nid and dfl_phys_nid Wei Yang <richard.weiyang@gmail.com> - 2017-07-08 03:40 +0200
    [tip:x86/debug] x86/numa_emulation: Refine the calculation of  max_emu_nid and dfl_phys_nid tip-bot for Wei Yang <tipbot@zytor.com> - 2017-07-18 13:00 +0200
    Re: [PATCH V3 1/3] x86/numa_emulation: refine the calculation of  max_emu_nid and dfl_phys_nid Borislav Petkov <bp@alien8.de> - 2017-07-18 13:10 +0200
      Re: [PATCH V3 1/3] x86/numa_emulation: refine the calculation of  max_emu_nid and dfl_phys_nid Wei Yang <richard.weiyang@gmail.com> - 2017-07-26 05:20 +0200

csiph-web