linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mem-hotplug: let memblock skip the hotpluggable memory regions in __next_mem_range()
@ 2014-08-11 13:31 Xishi Qiu
  2014-08-16 13:04 ` Tejun Heo
  0 siblings, 1 reply; 8+ messages in thread
From: Xishi Qiu @ 2014-08-11 13:31 UTC (permalink / raw)
  To: Andrew Morton, Tang Chen, Zhang Yanfei, tj, Wen Congyang,
	Rafael J. Wysocki, H. Peter Anvin
  Cc: Linux MM, LKML, Xishi Qiu

Let memblock skip the hotpluggable memory regions in __next_mem_range(),
it is used to to prevent memblock from allocating hotpluggable memory 
for the kernel at early time. The code is the same as __next_mem_range_rev().

Clear hotpluggable flag before releasing free pages to the buddy allocator.

Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
---
 mm/memblock.c  |    4 ++++
 mm/nobootmem.c |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 6d2f219..5090050 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -817,6 +817,10 @@ void __init_memblock __next_mem_range(u64 *idx, int nid,
 		if (nid != NUMA_NO_NODE && nid != m_nid)
 			continue;
 
+		/* skip hotpluggable memory regions if needed */
+		if (movable_node_is_enabled() && memblock_is_hotpluggable(m))
+			continue;
+
 		if (!type_b) {
 			if (out_start)
 				*out_start = m_start;
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index 7ed5860..03de286 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -119,6 +119,8 @@ static unsigned long __init free_low_memory_core_early(void)
 	phys_addr_t start, end;
 	u64 i;
 
+	memblock_clear_hotplug(0, ULLONG_MAX);
+
 	for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL)
 		count += __free_memory_core(start, end);
 
-- 
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-08-18 13:13 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-11 13:31 [PATCH] mem-hotplug: let memblock skip the hotpluggable memory regions in __next_mem_range() Xishi Qiu
2014-08-16 13:04 ` Tejun Heo
2014-08-16 14:36   ` Xishi Qiu
2014-08-17 11:08     ` Tejun Heo
2014-08-18  1:13       ` tangchen
2014-08-18  3:18         ` Xishi Qiu
2014-08-18 13:13           ` Tejun Heo
2014-08-18  2:00       ` Xishi Qiu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).