Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753526Ab2KSPth (ORCPT ); Mon, 19 Nov 2012 10:49:37 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:62760 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752881Ab2KSPtf (ORCPT ); Mon, 19 Nov 2012 10:49:35 -0500 X-IronPort-AV: E=Sophos;i="4.83,281,1352044800"; d="scan'208";a="6232231" From: Tang Chen To: tangchen@cn.fujitsu.com, wency@cn.fujitsu.com, linfeng@cn.fujitsu.com, rob@landley.net, akpm@linux-foundation.org, isimatu.yasuaki@jp.fujitsu.com, laijs@cn.fujitsu.com, jiang.liu@huawei.com, kosaki.motohiro@jp.fujitsu.com, minchan.kim@gmail.com, mgorman@suse.de, rientjes@google.com, yinghai@kernel.org, rusty@rustcorp.com.au Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-doc@vger.kernel.org Subject: [PATCH 1/5] x86: Get pg_data_t's memory from other node Date: Mon, 19 Nov 2012 22:27:22 +0800 Message-Id: <1353335246-9127-2-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1353335246-9127-1-git-send-email-tangchen@cn.fujitsu.com> References: <1353335246-9127-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/19 22:28:19, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/19 22:28:24, Serialize complete at 2012/11/19 22:28:24 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1563 Lines: 46 From: Yasuaki Ishimatsu If system can create movable node which all memory of the node is allocated as ZONE_MOVABLE, setup_node_data() cannot allocate memory for the node's pg_data_t. So when memblock_alloc_nid() fails, setup_node_data() retries memblock_alloc(). Signed-off-by: Yasuaki Ishimatsu Signed-off-by: Lai Jiangshan Signed-off-by: Tang Chen Reviewed-by: Wen Congyang Tested-by: Lin Feng --- arch/x86/mm/numa.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 2d125be..ae2e76e 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -224,9 +224,14 @@ static void __init setup_node_data(int nid, u64 start, u64 end) } else { nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid); if (!nd_pa) { - pr_err("Cannot find %zu bytes in node %d\n", + printk(KERN_WARNING "Cannot find %zu bytes in node %d\n", nd_size, nid); - return; + nd_pa = memblock_alloc(nd_size, SMP_CACHE_BYTES); + if (!nd_pa) { + pr_err("Cannot find %zu bytes in other node\n", + nd_size); + return; + } } nd = __va(nd_pa); } -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/