Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751499AbdGRKwQ (ORCPT ); Tue, 18 Jul 2017 06:52:16 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47905 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbdGRKwO (ORCPT ); Tue, 18 Jul 2017 06:52:14 -0400 Date: Tue, 18 Jul 2017 03:46:39 -0700 From: tip-bot for Wei Yang Message-ID: Cc: bp@suse.de, tglx@linutronix.de, peterz@infradead.org, rientjes@google.com, hpa@zytor.com, richard.weiyang@gmail.com, mingo@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Reply-To: richard.weiyang@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, bp@suse.de, rientjes@google.com, hpa@zytor.com In-Reply-To: <20170708013059.29708-3-richard.weiyang@gmail.com> References: <20170708013059.29708-3-richard.weiyang@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] x86/numa_emulation: Assign physnode_mask directly from numa_nodes_parsed Git-Commit-ID: d80a9eb3c78d7d0c823a8224cd6e3b37ebdfd8cd 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: 3285 Lines: 91 Commit-ID: d80a9eb3c78d7d0c823a8224cd6e3b37ebdfd8cd Gitweb: http://git.kernel.org/tip/d80a9eb3c78d7d0c823a8224cd6e3b37ebdfd8cd Author: Wei Yang AuthorDate: Sat, 8 Jul 2017 09:30:58 +0800 Committer: Ingo Molnar CommitDate: Tue, 18 Jul 2017 11:16:49 +0200 x86/numa_emulation: Assign physnode_mask directly from numa_nodes_parsed numa_init() has already called init_func(), which is responsible for setting numa_nodes_parsed, so use this nodemask instead of re-finding it when calling numa_emulation(). This patch gets the physnode_mask directly from numa_nodes_parsed. At the same time, it corrects the comment of these two functions. Signed-off-by: Wei Yang Reviewed-by: Borislav Petkov 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-3-richard.weiyang@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/mm/numa_emulation.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c index a6d5530..80904ed 100644 --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c @@ -75,13 +75,15 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei, /* * Sets up nr_nodes fake nodes interleaved over physical nodes ranging from addr - * to max_addr. The return value is the number of nodes allocated. + * to max_addr. + * + * Returns zero on success or negative on error. */ static int __init split_nodes_interleave(struct numa_meminfo *ei, struct numa_meminfo *pi, u64 addr, u64 max_addr, int nr_nodes) { - nodemask_t physnode_mask = NODE_MASK_NONE; + nodemask_t physnode_mask = numa_nodes_parsed; u64 size; int big; int nid = 0; @@ -116,9 +118,6 @@ static int __init split_nodes_interleave(struct numa_meminfo *ei, return -1; } - for (i = 0; i < pi->nr_blks; i++) - node_set(pi->blk[i].nid, physnode_mask); - /* * Continue to fill physical nodes with fake nodes until there is no * memory left on any of them. @@ -200,13 +199,15 @@ static u64 __init find_end_of_node(u64 start, u64 max_addr, u64 size) /* * Sets up fake nodes of `size' interleaved over physical nodes ranging from - * `addr' to `max_addr'. The return value is the number of nodes allocated. + * `addr' to `max_addr'. + * + * Returns zero on success or negative on error. */ static int __init split_nodes_size_interleave(struct numa_meminfo *ei, struct numa_meminfo *pi, u64 addr, u64 max_addr, u64 size) { - nodemask_t physnode_mask = NODE_MASK_NONE; + nodemask_t physnode_mask = numa_nodes_parsed; u64 min_size; int nid = 0; int i, ret; @@ -231,9 +232,6 @@ static int __init split_nodes_size_interleave(struct numa_meminfo *ei, } size &= FAKE_NODE_MIN_HASH_MASK; - for (i = 0; i < pi->nr_blks; i++) - node_set(pi->blk[i].nid, physnode_mask); - /* * Fill physical nodes with fake nodes of size until there is no memory * left on any of them.