Hi, On Wed, Mar 27, 2019 at 01:57:50PM -0400, Sasha Levin wrote: > From: Mike Rapoport <rppt@xxxxxxxxxxxxx> > > [ Upstream commit 337555744e6e39dd1d87698c6084dd88a606d60a ] > > The memblock_phys_alloc_try_nid() function tries to allocate memory from > the requested node and then falls back to allocation from any node in > the system. The memblock_alloc_base() fallback used by this function > panics if the allocation fails. > > Replace the memblock_alloc_base() fallback with the direct call to > memblock_alloc_range_nid() and update the memblock_phys_alloc_try_nid() > callers to check the returned value and panic in case of error. This is a part of memblock refactoring, I don't think it should be applied to -stable. > Link: http://lkml.kernel.org/r/1548057848-15136-7-git-send-email-rppt@xxxxxxxxxxxxx > Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxx> > Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> [powerpc] > Cc: Catalin Marinas <catalin.marinas@xxxxxxx> > Cc: Christophe Leroy <christophe.leroy@xxxxxx> > Cc: Christoph Hellwig <hch@xxxxxx> > Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> > Cc: Dennis Zhou <dennis@xxxxxxxxxx> > Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> > Cc: Greentime Hu <green.hu@xxxxxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Cc: Guan Xuetao <gxt@xxxxxxxxxx> > Cc: Guo Ren <guoren@xxxxxxxxxx> > Cc: Guo Ren <ren_guo@xxxxxxxxx> [c-sky] > Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> > Cc: Juergen Gross <jgross@xxxxxxxx> [Xen] > Cc: Mark Salter <msalter@xxxxxxxxxx> > Cc: Matt Turner <mattst88@xxxxxxxxx> > Cc: Max Filippov <jcmvbkbc@xxxxxxxxx> > Cc: Michal Simek <monstr@xxxxxxxxx> > Cc: Paul Burton <paul.burton@xxxxxxxx> > Cc: Petr Mladek <pmladek@xxxxxxxx> > Cc: Richard Weinberger <richard@xxxxxx> > Cc: Rich Felker <dalias@xxxxxxxx> > Cc: Rob Herring <robh+dt@xxxxxxxxxx> > Cc: Rob Herring <robh@xxxxxxxxxx> > Cc: Russell King <linux@xxxxxxxxxxxxxxx> > Cc: Stafford Horne <shorne@xxxxxxxxx> > Cc: Tony Luck <tony.luck@xxxxxxxxx> > Cc: Vineet Gupta <vgupta@xxxxxxxxxxxx> > Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > arch/arm64/mm/numa.c | 4 ++++ > arch/powerpc/mm/numa.c | 4 ++++ > mm/memblock.c | 4 +++- > 3 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c > index ae34e3a1cef1..2c61ea4e290b 100644 > --- a/arch/arm64/mm/numa.c > +++ b/arch/arm64/mm/numa.c > @@ -237,6 +237,10 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn) > pr_info("Initmem setup node %d [<memory-less node>]\n", nid); > > nd_pa = memblock_phys_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid); > + if (!nd_pa) > + panic("Cannot allocate %zu bytes for node %d data\n", > + nd_size, nid); > + > nd = __va(nd_pa); > > /* report and initialize */ > diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c > index 87f0dd004295..8ec2ed30d44c 100644 > --- a/arch/powerpc/mm/numa.c > +++ b/arch/powerpc/mm/numa.c > @@ -788,6 +788,10 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn) > int tnid; > > nd_pa = memblock_phys_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid); > + if (!nd_pa) > + panic("Cannot allocate %zu bytes for node %d data\n", > + nd_size, nid); > + > nd = __va(nd_pa); > > /* report and initialize */ > diff --git a/mm/memblock.c b/mm/memblock.c > index ea31045ba704..d5923df56acc 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -1342,7 +1342,9 @@ phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t ali > > if (res) > return res; > - return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE); > + return memblock_alloc_range_nid(size, align, 0, > + MEMBLOCK_ALLOC_ACCESSIBLE, > + NUMA_NO_NODE, MEMBLOCK_NONE); > } > > /** > -- > 2.19.1 > -- Sincerely yours, Mike.
