[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1405670163-53747-2-git-send-email-wangnan0@huawei.com>
Date: Fri, 18 Jul 2014 15:55:59 +0800
From: Wang Nan <wangnan0@...wei.com>
To: Ingo Molnar <mingo@...hat.com>, Yinghai Lu <yinghai@...nel.org>,
"Mel Gorman" <mgorman@...e.de>,
Andrew Morton <akpm@...ux-foundation.org>
CC: Pei Feiyue <peifeiyue@...wei.com>, <linux-mm@...ck.org>,
<x86@...nel.org>, <linux-ia64@...r.kernel.org>,
<linuxppc-dev@...ts.ozlabs.org>, <linux-sh@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: [PATCH 1/5] memory-hotplug: x86_64: suitable memory should go to ZONE_MOVABLE
This patch add new memory to ZONE_MOVABLE if movable zone is setup
and lower than newly added memory for x86_64.
Signed-off-by: Wang Nan <wangnan0@...wei.com>
---
arch/x86/mm/init_64.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index df1a992..825915e 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -685,17 +685,23 @@ static void update_end_of_memory_vars(u64 start, u64 size)
}
/*
- * Memory is added always to NORMAL zone. This means you will never get
- * additional DMA/DMA32 memory.
+ * Memory is added always to NORMAL or MOVABLE zone. This means you
+ * will never get additional DMA/DMA32 memory.
*/
int arch_add_memory(int nid, u64 start, u64 size)
{
struct pglist_data *pgdat = NODE_DATA(nid);
struct zone *zone = pgdat->node_zones + ZONE_NORMAL;
+ struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE;
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
int ret;
+ if (!zone_is_empty(movable_zone))
+ if (zone_spans_pfn(movable_zone, start_pfn) ||
+ (zone_end_pfn(movable_zone) <= start_pfn))
+ zone = movable_zone;
+
init_memory_mapping(start, start + size);
ret = __add_pages(nid, zone, start_pfn, nr_pages);
--
1.8.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists