From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754126Ab3FNVdH (ORCPT ); Fri, 14 Jun 2013 17:33:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34475 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752656Ab3FNVdB (ORCPT ); Fri, 14 Jun 2013 17:33:01 -0400 Date: Fri, 14 Jun 2013 14:32:50 -0700 From: tip-bot for Yinghai Lu Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, yinghai@kernel.org, tangchen@cn.fujitsu.com, tglx@linutronix.de, hpa@linux.intel.com Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, yinghai@kernel.org, tangchen@cn.fujitsu.com, tglx@linutronix.de, hpa@linux.intel.com In-Reply-To: <1371128589-8953-15-git-send-email-tangchen@cn.fujitsu.com> References: <1371128589-8953-15-git-send-email-tangchen@cn.fujitsu.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86, mm, numa: Set memblock nid later Git-Commit-ID: 1b74b2fd7fa0b4b1493a4921eefd560f9ff67963 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 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (terminus.zytor.com [127.0.0.1]); Fri, 14 Jun 2013 14:32:55 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1b74b2fd7fa0b4b1493a4921eefd560f9ff67963 Gitweb: http://git.kernel.org/tip/1b74b2fd7fa0b4b1493a4921eefd560f9ff67963 Author: Yinghai Lu AuthorDate: Thu, 13 Jun 2013 21:03:01 +0800 Committer: H. Peter Anvin CommitDate: Fri, 14 Jun 2013 14:05:02 -0700 x86, mm, numa: Set memblock nid later In order to seperate parsing numa info procedure into two steps, we need to set memblock nid later because it could change memblock array, and possible doube memblock.memory array which will allocate buffer. Only set memblock nid once for successful path. Also rename numa_register_memblks to numa_check_memblks() after moving out code of setting memblock nid. Signed-off-by: Yinghai Lu Link: http://lkml.kernel.org/r/1371128589-8953-15-git-send-email-tangchen@cn.fujitsu.com Reviewed-by: Tang Chen Tested-by: Tang Chen Signed-off-by: H. Peter Anvin --- arch/x86/mm/numa.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index cff565a..e448b6f 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -534,10 +534,9 @@ static unsigned long __init node_map_pfn_alignment(struct numa_meminfo *mi) } #endif -static int __init numa_register_memblks(struct numa_meminfo *mi) +static int __init numa_check_memblks(struct numa_meminfo *mi) { unsigned long pfn_align; - int i; /* Account for nodes with cpus and no memory */ node_possible_map = numa_nodes_parsed; @@ -560,11 +559,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) return -EINVAL; } - for (i = 0; i < mi->nr_blks; i++) { - struct numa_memblk *mb = &mi->blk[i]; - memblock_set_node(mb->start, mb->end - mb->start, mb->nid); - } - return 0; } @@ -601,7 +595,6 @@ static int __init numa_init(int (*init_func)(void)) nodes_clear(numa_nodes_parsed); nodes_clear(node_possible_map); memset(&numa_meminfo, 0, sizeof(numa_meminfo)); - WARN_ON(memblock_set_node(0, ULLONG_MAX, MAX_NUMNODES)); numa_reset_distance(); ret = init_func(); @@ -613,7 +606,7 @@ static int __init numa_init(int (*init_func)(void)) numa_emulation(&numa_meminfo, numa_distance_cnt); - ret = numa_register_memblks(&numa_meminfo); + ret = numa_check_memblks(&numa_meminfo); if (ret < 0) return ret; @@ -676,6 +669,11 @@ void __init x86_numa_init(void) early_x86_numa_init(); + for (i = 0; i < mi->nr_blks; i++) { + struct numa_memblk *mb = &mi->blk[i]; + memblock_set_node(mb->start, mb->end - mb->start, mb->nid); + } + /* Finally register nodes. */ for_each_node_mask(nid, node_possible_map) { u64 start = PFN_PHYS(max_pfn);