Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161371Ab3DEJhU (ORCPT ); Fri, 5 Apr 2013 05:37:20 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:12694 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1765166Ab3DEJhR (ORCPT ); Fri, 5 Apr 2013 05:37:17 -0400 X-IronPort-AV: E=Sophos;i="4.87,413,1363104000"; d="scan'208";a="7001882" From: Tang Chen To: rob@landley.net, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, yinghai@kernel.org, akpm@linux-foundation.org, wency@cn.fujitsu.com, trenn@suse.de, liwanp@linux.vnet.ibm.com, mgorman@suse.de, walken@google.com, riel@redhat.com, khlebnikov@openvz.org, tj@kernel.org, minchan@kernel.org, m.szyprowski@samsung.com, mina86@mina86.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, linfeng@cn.fujitsu.com, kosaki.motohiro@jp.fujitsu.com, jiang.liu@huawei.com, guz.fnst@cn.fujitsu.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 05/11] x86, numa, acpi, memory-hotplug: Consider hotplug info when cleanup numa_meminfo. Date: Fri, 5 Apr 2013 17:39:55 +0800 Message-Id: <1365154801-473-6-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1365154801-473-1-git-send-email-tangchen@cn.fujitsu.com> References: <1365154801-473-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 2013/04/05 17:36:10, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/04/05 17:36:11, Serialize complete at 2013/04/05 17:36:11 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2067 Lines: 63 Since we have introduced hotplug info into struct numa_meminfo, we need to consider it when cleanup numa_meminfo. The original logic in numa_cleanup_meminfo() is: Merge blocks on the same node, holes between which don't overlap with memory on other nodes. This patch modifies numa_cleanup_meminfo() logic like this: Merge blocks with the same hotpluggable type on the same node, holes between which don't overlap with memory on other nodes. Signed-off-by: Tang Chen --- arch/x86/mm/numa.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index ecf37fd..26d1800 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -296,18 +296,22 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi) } /* - * Join together blocks on the same node, holes - * between which don't overlap with memory on other - * nodes. + * Join together blocks on the same node, with the same + * hotpluggable flags, holes between which don't overlap + * with memory on other nodes. */ if (bi->nid != bj->nid) continue; + if (bi->hotpluggable != bj->hotpluggable) + continue; + start = min(bi->start, bj->start); end = max(bi->end, bj->end); for (k = 0; k < mi->nr_blks; k++) { struct numa_memblk *bk = &mi->blk[k]; - if (bi->nid == bk->nid) + if (bi->nid == bk->nid && + bi->hotpluggable == bk->hotpluggable) continue; if (start < bk->end && end > bk->start) break; @@ -327,6 +331,7 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi) for (i = mi->nr_blks; i < ARRAY_SIZE(mi->blk); i++) { mi->blk[i].start = mi->blk[i].end = 0; mi->blk[i].nid = NUMA_NO_NODE; + mi->blk[i].hotpluggable = false; } return 0; -- 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/