From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx106.postini.com [74.125.245.106]) by kanga.kvack.org (Postfix) with SMTP id CD3186B0036 for ; Thu, 13 Jun 2013 09:27:58 -0400 (EDT) From: Tang Chen Subject: [Part2 PATCH v4 05/15] x86, numa, acpi, memory-hotplug: Consider hotplug info when cleanup numa_meminfo. Date: Thu, 13 Jun 2013 21:03:29 +0800 Message-Id: <1371128619-8987-6-git-send-email-tangchen@cn.fujitsu.com> In-Reply-To: <1371128619-8987-1-git-send-email-tangchen@cn.fujitsu.com> References: <1371128619-8987-1-git-send-email-tangchen@cn.fujitsu.com> Sender: owner-linux-mm@kvack.org List-ID: To: tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org 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 bf610f8..05e4443 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -293,18 +293,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; @@ -324,6 +328,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, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org