lkml.org 
[lkml]   [2012]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[V5 PATCH 22/26] x86: get pg_data_t's memory from other node
    Date
    From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

    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 <isimatu.yasuaki@jp.fujitsu.com>
    Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
    ---
    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.4.4


    \
     
     \ /
      Last update: 2012-10-29 18:21    [W:4.018 / U:0.872 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site