Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751528AbdGRKwh (ORCPT ); Tue, 18 Jul 2017 06:52:37 -0400 Received: from terminus.zytor.com ([65.50.211.136]:45397 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbdGRKwg (ORCPT ); Tue, 18 Jul 2017 06:52:36 -0400 Date: Tue, 18 Jul 2017 03:47:03 -0700 From: tip-bot for Wei Yang Message-ID: Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, richard.weiyang@gmail.com, rientjes@google.com, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de Reply-To: rientjes@google.com, richard.weiyang@gmail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org In-Reply-To: <20170708013059.29708-4-richard.weiyang@gmail.com> References: <20170708013059.29708-4-richard.weiyang@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] x86/numa_emulation: Recalculate numa_nodes_parsed from emulated nodes Git-Commit-ID: 4f167201edda7cd7525cc7f23944731ef5dd99a8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1979 Lines: 51 Commit-ID: 4f167201edda7cd7525cc7f23944731ef5dd99a8 Gitweb: http://git.kernel.org/tip/4f167201edda7cd7525cc7f23944731ef5dd99a8 Author: Wei Yang AuthorDate: Sat, 8 Jul 2017 09:30:59 +0800 Committer: Ingo Molnar 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 Acked-by: Thomas Gleixner Acked-by: David Rientjes Cc: Linus Torvalds Cc: Peter Zijlstra 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 --- 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