On Tue, Apr 30, 2013 at 05:21:11PM +0800, Tang Chen wrote: > Date: Tue, 30 Apr 2013 17:21:11 +0800 > From: Tang Chen <tangc...@cn.fujitsu.com> > To: mi...@redhat.com, h...@zytor.com, a...@linux-foundation.org, > ying...@kernel.org, jiang....@huawei.com, we...@cn.fujitsu.com, > isimatu.yasu...@jp.fujitsu.com, t...@kernel.org, la...@cn.fujitsu.com, > da...@davemloft.net, mgor...@suse.de, minc...@kernel.org, > min...@mina86.com > Cc: x...@kernel.org, linux-...@vger.kernel.org, > linux-kernel@vger.kernel.org, linux...@kvack.org > Subject: [PATCH v2 01/13] x86: get pg_data_t's memory from other node > X-Mailer: git-send-email 1.7.10.1 > > From: Yasuaki Ishimatsu <isimatu.yasu...@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, use memblock_alloc_try_nid() instead of memblock_alloc_nid() > to retry when the first allocation fails. > > Signed-off-by: Yasuaki Ishimatsu <isimatu.yasu...@jp.fujitsu.com> > Signed-off-by: Lai Jiangshan <la...@cn.fujitsu.com> > Signed-off-by: Tang Chen <tangc...@cn.fujitsu.com> > Signed-off-by: Jiang Liu <jiang....@huawei.com> > --- > arch/x86/mm/numa.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c > index 11acdf6..4f754e6 100644 > --- a/arch/x86/mm/numa.c > +++ b/arch/x86/mm/numa.c > @@ -214,10 +214,9 @@ static void __init setup_node_data(int nid, u64 start, > u64 end) > * Allocate node data. Try node-local memory and then any node. > * Never allocate in DMA zone. > */ > - nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid); > + nd_pa = memblock_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid);
go through the implementation of memblock_alloc_try_nid, it will call
panic when allocation fails(a.k.a alloc = 0), if so, below information
will be never printed. Do we really need this?
> if (!nd_pa) {
> - pr_err("Cannot find %zu bytes in node %d\n",
> - nd_size, nid);
> + pr_err("Cannot find %zu bytes in any 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 majord...@kvack.org. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"d...@kvack.org";> em...@kvack.org </a>
signature.asc
Description: Digital signature
