lkml.org 
[lkml]   [2012]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 1/5] x86: get pg_data_t's memory from other node
On 11/23/2012 06:44 PM, Tang Chen wrote:
> 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>
> Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> ---
> 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;
> + }
Hi Tang,
Seems memblock_alloc_try_nid() serves the same purpose, so you may just
simply replace memblock_alloc_nid() with memblock_alloc_try_nid().

Regards!
Gerry

> }
> nd = __va(nd_pa);
> }
>



\
 
 \ /
  Last update: 2012-12-02 17:01    [W:0.479 / U:0.600 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site