[PATCH v2 1/5] x86: get pg_data_t's memory from other node
From: Tang Chen <hidden>
Date: 2012-11-23 10:47:59
Also in:
lkml
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> Signed-off-by: Tang Chen <redacted> --- arch/x86/mm/numa.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 2d125be..734bbd2 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c@@ -224,9 +224,14 @@ static void __init setup_node_data(int nid, u64 start, u64 end) } 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", - nd_size, nid); - return; + pr_warn("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
--
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>