Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756223Ab2ENL5z (ORCPT ); Mon, 14 May 2012 07:57:55 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:34144 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755747Ab2ENL5y (ORCPT ); Mon, 14 May 2012 07:57:54 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.4.0 Message-ID: <4FB0F356.70101@jp.fujitsu.com> Date: Mon, 14 May 2012 20:58:14 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Lai Jiangshan CC: Mel Gorman , Andrew Morton , linux-mm@kvack.org, LKML Subject: [Patch 1/4] x86: get pg_data_t's memory from other node References: <4FACA79C.9070103@cn.fujitsu.com> <4FB0F174.1000400@jp.fujitsu.com> In-Reply-To: <4FB0F174.1000400@jp.fujitsu.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1350 Lines: 36 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(). --- arch/x86/mm/numa.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: linux-3.4-rc6/arch/x86/mm/numa.c =================================================================== --- linux-3.4-rc6.orig/arch/x86/mm/numa.c 2012-05-15 06:43:38.887962970 +0900 +++ linux-3.4-rc6/arch/x86/mm/numa.c 2012-05-15 06:43:42.422918776 +0900 @@ -223,9 +223,13 @@ static void __init setup_node_data(int n remapped = true; } 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", + if (!nd_pa) + printk(KERN_WARNING "Cannot find %zu bytes in node %d\n", nd_size, nid); + 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); -- 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/