[RFC PATCH 19/23 V2] x86: get pg_data_t's memory from other node
From: Lai Jiangshan <hidden>
Date: 2012-08-02 02:53:07
Also in:
linux-mm
Subsystem:
the rest, x86 architecture (32-bit and 64-bit), x86 mm · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, Andy Lutomirski, Peter Zijlstra
From: Yasuaki Ishimatsu <redacted> 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(). Signed-off-by: Yasuaki Ishimatsu <redacted> Signed-off-by: Lai Jiangshan <redacted> --- arch/x86/mm/numa.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 2d125be..a86e315 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c@@ -223,9 +223,13 @@ static void __init setup_node_data(int nid, u64 start, u64 end) 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);
--
1.7.1