| Message ID | 1543852035-26634-4-git-send-email-rppt@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | memblock: simplify several early memory allocation | expand |
Hi Mike. On Mon, Dec 03, 2018 at 05:47:12PM +0200, Mike Rapoport wrote: > Rather than use the memblock_alloc_base that returns a physical address and > then convert this address to the virtual one, use appropriate memblock > function that returns a virtual address. > > There is a small functional change in the allocation of then NODE_DATA(). > Instead of panicing if the local allocation failed, the non-local > allocation attempt will be made. > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > --- > arch/sh/mm/init.c | 18 +++++------------- > arch/sh/mm/numa.c | 5 ++--- > 2 files changed, 7 insertions(+), 16 deletions(-) > > diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c > index c8c13c77..3576b5f 100644 > --- a/arch/sh/mm/init.c > +++ b/arch/sh/mm/init.c > @@ -192,24 +192,16 @@ void __init page_table_range_init(unsigned long start, unsigned long end, > void __init allocate_pgdat(unsigned int nid) > { > unsigned long start_pfn, end_pfn; > -#ifdef CONFIG_NEED_MULTIPLE_NODES > - unsigned long phys; > -#endif > > get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); > > #ifdef CONFIG_NEED_MULTIPLE_NODES > - phys = __memblock_alloc_base(sizeof(struct pglist_data), > - SMP_CACHE_BYTES, end_pfn << PAGE_SHIFT); > - /* Retry with all of system memory */ > - if (!phys) > - phys = __memblock_alloc_base(sizeof(struct pglist_data), > - SMP_CACHE_BYTES, memblock_end_of_DRAM()); > - if (!phys) > + NODE_DATA(nid) = memblock_alloc_try_nid_nopanic( > + sizeof(struct pglist_data), > + SMP_CACHE_BYTES, MEMBLOCK_LOW_LIMIT, > + MEMBLOCK_ALLOC_ACCESSIBLE, nid); > + if (!NODE_DATA(nid)) > panic("Can't allocate pgdat for node %d\n", nid); > - > - NODE_DATA(nid) = __va(phys); > - memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); The new code will always assign NODE_DATA(nid), where the old code only assigned NODE_DATA(nid) in the good case. I dunno if this is an issue, just noticed the difference and wanted to point it out. Sam
On Mon, Dec 03, 2018 at 05:10:52PM +0100, Sam Ravnborg wrote: > Hi Mike. > > On Mon, Dec 03, 2018 at 05:47:12PM +0200, Mike Rapoport wrote: > > Rather than use the memblock_alloc_base that returns a physical address and > > then convert this address to the virtual one, use appropriate memblock > > function that returns a virtual address. > > > > There is a small functional change in the allocation of then NODE_DATA(). > > Instead of panicing if the local allocation failed, the non-local > > allocation attempt will be made. > > > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > > --- > > arch/sh/mm/init.c | 18 +++++------------- > > arch/sh/mm/numa.c | 5 ++--- > > 2 files changed, 7 insertions(+), 16 deletions(-) > > > > diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c > > index c8c13c77..3576b5f 100644 > > --- a/arch/sh/mm/init.c > > +++ b/arch/sh/mm/init.c > > @@ -192,24 +192,16 @@ void __init page_table_range_init(unsigned long start, unsigned long end, > > void __init allocate_pgdat(unsigned int nid) > > { > > unsigned long start_pfn, end_pfn; > > -#ifdef CONFIG_NEED_MULTIPLE_NODES > > - unsigned long phys; > > -#endif > > > > get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); > > > > #ifdef CONFIG_NEED_MULTIPLE_NODES > > - phys = __memblock_alloc_base(sizeof(struct pglist_data), > > - SMP_CACHE_BYTES, end_pfn << PAGE_SHIFT); > > - /* Retry with all of system memory */ > > - if (!phys) > > - phys = __memblock_alloc_base(sizeof(struct pglist_data), > > - SMP_CACHE_BYTES, memblock_end_of_DRAM()); > > - if (!phys) > > + NODE_DATA(nid) = memblock_alloc_try_nid_nopanic( > > + sizeof(struct pglist_data), > > + SMP_CACHE_BYTES, MEMBLOCK_LOW_LIMIT, > > + MEMBLOCK_ALLOC_ACCESSIBLE, nid); > > + if (!NODE_DATA(nid)) > > panic("Can't allocate pgdat for node %d\n", nid); > > - > > - NODE_DATA(nid) = __va(phys); > > - memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); > The new code will always assign NODE_DATA(nid), where the old > code only assigned NODE_DATA(nid) in the good case. > I dunno if this is an issue, just noticed the difference and > wanted to point it out. If the allocation fails the NODE_DATA(nid) remains zero anyway and there is a panic() call. So I think there is no actual functional change here. > Sam >
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index c8c13c77..3576b5f 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -192,24 +192,16 @@ void __init page_table_range_init(unsigned long start, unsigned long end, void __init allocate_pgdat(unsigned int nid) { unsigned long start_pfn, end_pfn; -#ifdef CONFIG_NEED_MULTIPLE_NODES - unsigned long phys; -#endif get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); #ifdef CONFIG_NEED_MULTIPLE_NODES - phys = __memblock_alloc_base(sizeof(struct pglist_data), - SMP_CACHE_BYTES, end_pfn << PAGE_SHIFT); - /* Retry with all of system memory */ - if (!phys) - phys = __memblock_alloc_base(sizeof(struct pglist_data), - SMP_CACHE_BYTES, memblock_end_of_DRAM()); - if (!phys) + NODE_DATA(nid) = memblock_alloc_try_nid_nopanic( + sizeof(struct pglist_data), + SMP_CACHE_BYTES, MEMBLOCK_LOW_LIMIT, + MEMBLOCK_ALLOC_ACCESSIBLE, nid); + if (!NODE_DATA(nid)) panic("Can't allocate pgdat for node %d\n", nid); - - NODE_DATA(nid) = __va(phys); - memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); #endif NODE_DATA(nid)->node_start_pfn = start_pfn; diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c index 830e8b3..c4bde61 100644 --- a/arch/sh/mm/numa.c +++ b/arch/sh/mm/numa.c @@ -41,9 +41,8 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) __add_active_range(nid, start_pfn, end_pfn); /* Node-local pgdat */ - NODE_DATA(nid) = __va(memblock_alloc_base(sizeof(struct pglist_data), - SMP_CACHE_BYTES, end)); - memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); + NODE_DATA(nid) = memblock_alloc_node(sizeof(struct pglist_data), + SMP_CACHE_BYTES, nid); NODE_DATA(nid)->node_start_pfn = start_pfn; NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;
Rather than use the memblock_alloc_base that returns a physical address and then convert this address to the virtual one, use appropriate memblock function that returns a virtual address. There is a small functional change in the allocation of then NODE_DATA(). Instead of panicing if the local allocation failed, the non-local allocation attempt will be made. Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> --- arch/sh/mm/init.c | 18 +++++------------- arch/sh/mm/numa.c | 5 ++--- 2 files changed, 7 insertions(+), 16 deletions(-)