mm: free_area_init: use maximal zone PFNs rather than zone sizes

Currently, architectures that use free_area_init() to initialize memory
map and node and zone structures need to calculate zone and hole sizes.
We can use free_area_init_nodes() instead and let it detect the zone
boundaries while the architectures will only have to supply the possible
limits for the zones.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: Hoan Tran <hoan@os.amperecomputing.com>	[arm64]
Reviewed-by: Baoquan He <bhe@redhat.com>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200412194859.12663-5-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 12e218d3792ae033159cf5e766ee489b4cafe6aa..667cd21393b5b4603698bd987b654f203e4a1f97 100644 (file)
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -243,21 +243,17 @@ callback_init(void * kernel_end)
  */
 void __init paging_init(void)
 {
-       unsigned long zones_size[MAX_NR_ZONES] = {0, };
-       unsigned long dma_pfn, high_pfn;
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = {0, };
+       unsigned long dma_pfn;
 
        dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
-       high_pfn = max_pfn = max_low_pfn;
+       max_pfn = max_low_pfn;
 
-       if (dma_pfn >= high_pfn)
-               zones_size[ZONE_DMA] = high_pfn;
-       else {
-               zones_size[ZONE_DMA] = dma_pfn;
-               zones_size[ZONE_NORMAL] = high_pfn - dma_pfn;
-       }
+       max_zone_pfn[ZONE_DMA] = dma_pfn;
+       max_zone_pfn[ZONE_NORMAL] = max_pfn;
 
        /* Initialize mem_map[].  */
-       free_area_init(zones_size);
+       free_area_init(max_zone_pfn);
 
        /* Initialize the kernel's ZERO_PGE. */
        memset((void *)ZERO_PGE, 0, PAGE_SIZE);

diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c
index 9b374393a8f4ff5589643cc050cbd53c03c58d0b..a97e51a3e26d3108154ce557a08b15e513b1be9a 100644 (file)
--- a/arch/c6x/mm/init.c
+++ b/arch/c6x/mm/init.c
@@ -33,7 +33,7 @@ EXPORT_SYMBOL(empty_zero_page);
 void __init paging_init(void)
 {
        struct pglist_data *pgdat = NODE_DATA(0);
-       unsigned long zones_size[MAX_NR_ZONES] = {0, };
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = {0, };
 
        empty_zero_page      = (unsigned long) memblock_alloc(PAGE_SIZE,
                                                              PAGE_SIZE);
@@ -49,11 +49,9 @@ void __init paging_init(void)
        /*
         * Define zones
         */
-       zones_size[ZONE_NORMAL] = (memory_end - PAGE_OFFSET) >> PAGE_SHIFT;
-       pgdat->node_zones[ZONE_NORMAL].zone_start_pfn =
-               __pa(PAGE_OFFSET) >> PAGE_SHIFT;
+       max_zone_pfn[ZONE_NORMAL] = memory_end >> PAGE_SHIFT;
 
-       free_area_init(zones_size);
+       free_area_init(max_zone_pfn);
 }
 
 void __init mem_init(void)

diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 1eab16b1a0bcfbf688294855f72eb7e1668fef90..27a0020e37711393c5275ef5d7093a74614b5205 100644 (file)
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c
@@ -83,10 +83,10 @@ void __init paging_init(void)
                 start_mem, end_mem);
 
        {
-               unsigned long zones_size[MAX_NR_ZONES] = {0, };
+               unsigned long max_zone_pfn[MAX_NR_ZONES] = {0, };
 
-               zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
-               free_area_init(zones_size);
+               max_zone_pfn[ZONE_NORMAL] = end_mem >> PAGE_SHIFT;
+               free_area_init(max_zone_pfn);
        }
 }
 

diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c
index c961773a6fff5cc2b23712bb780f0fc5fde98163..f2e6c868e477c8086f5bac6cca6fecfc5d5e7bc2 100644 (file)
--- a/arch/hexagon/mm/init.c
+++ b/arch/hexagon/mm/init.c
@@ -91,7 +91,7 @@ void sync_icache_dcache(pte_t pte)
  */
 void __init paging_init(void)
 {
-       unsigned long zones_sizes[MAX_NR_ZONES] = {0, };
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = {0, };
 
        /*
         *  This is not particularly well documented anywhere, but
@@ -101,9 +101,9 @@ void __init paging_init(void)
         *  adjust accordingly.
         */
 
-       zones_sizes[ZONE_NORMAL] = max_low_pfn;
+       max_zone_pfn[ZONE_NORMAL] = max_low_pfn;
 
-       free_area_init(zones_sizes);  /*  sets up the zonelists and mem_map  */
+       free_area_init(max_zone_pfn);  /*  sets up the zonelists and mem_map  */
 
        /*
         * Start of high memory area.  Will probably need something more

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index b88d510d4fe3f0c4d98109e60846d87c94646437..6d3147662ff26bc933c8e56943e4ef674922f3b8 100644 (file)
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -84,7 +84,7 @@ void __init paging_init(void)
         * page_alloc get different views of the world.
         */
        unsigned long end_mem = memory_end & PAGE_MASK;
-       unsigned long zones_size[MAX_NR_ZONES] = { 0, };
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0, };
 
        high_memory = (void *) end_mem;
 
@@ -98,8 +98,8 @@ void __init paging_init(void)
         */
        set_fs (USER_DS);
 
-       zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
-       free_area_init(zones_size);
+       max_zone_pfn[ZONE_DMA] = end_mem >> PAGE_SHIFT;
+       free_area_init(max_zone_pfn);
 }
 
 #endif /* CONFIG_MMU */

diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
index 0ea375607767c6d7cf29ec9aff40cf0134fed4d9..80064e6d064f1c1ff77e1b43d762b71271e25788 100644 (file)
--- a/arch/m68k/mm/mcfmmu.c
+++ b/arch/m68k/mm/mcfmmu.c
@@ -39,7 +39,7 @@ void __init paging_init(void)
        pte_t *pg_table;
        unsigned long address, size;
        unsigned long next_pgtable, bootmem_end;
-       unsigned long zones_size[MAX_NR_ZONES];
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
        enum zone_type zone;
        int i;
 
@@ -80,11 +80,8 @@ void __init paging_init(void)
        }
 
        current->mm = NULL;
-
-       for (zone = 0; zone < MAX_NR_ZONES; zone++)
-               zones_size[zone] = 0x0;
-       zones_size[ZONE_DMA] = num_pages;
-       free_area_init(zones_size);
+       max_zone_pfn[ZONE_DMA] = PFN_DOWN(_ramend);
+       free_area_init(max_zone_pfn);
 }
 
 int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)

diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c
index 0be3833f6814e3f5f8e5caf8e829ddd96e64b050..91147cca4b64dbf7f9fe77c3ca8c1ec2037d315f 100644 (file)
--- a/arch/nds32/mm/init.c
+++ b/arch/nds32/mm/init.c
@@ -31,16 +31,13 @@ EXPORT_SYMBOL(empty_zero_page);
 
 static void __init zone_sizes_init(void)
 {
-       unsigned long zones_size[MAX_NR_ZONES];
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
 
-       /* Clear the zone sizes */
-       memset(zones_size, 0, sizeof(zones_size));
-
-       zones_size[ZONE_NORMAL] = max_low_pfn;
+       max_zone_pfn[ZONE_NORMAL] = max_low_pfn;
 #ifdef CONFIG_HIGHMEM
-       zones_size[ZONE_HIGHMEM] = max_pfn;
+       max_zone_pfn[ZONE_HIGHMEM] = max_pfn;
 #endif
-       free_area_init(zones_size);
+       free_area_init(max_zone_pfn);
 
 }
 

diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c
index 2c609c2516b29c1a83f402abb2010e28fa62bdd3..9afca77d10b14fbacff1f825dd1c73b4b7407f9d 100644 (file)
--- a/arch/nios2/mm/init.c
+++ b/arch/nios2/mm/init.c
@@ -46,17 +46,15 @@ pgd_t *pgd_current;
  */
 void __init paging_init(void)
 {
-       unsigned long zones_size[MAX_NR_ZONES];
-
-       memset(zones_size, 0, sizeof(zones_size));
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
 
        pagetable_init();
        pgd_current = swapper_pg_dir;
 
-       zones_size[ZONE_NORMAL] = max_mapnr;
+       max_zone_pfn[ZONE_NORMAL] = max_mapnr;
 
        /* pass the memory from the bootmem allocator to the main allocator */
-       free_area_init(zones_size);
+       free_area_init(max_zone_pfn);
 
        flush_dcache_range((unsigned long)empty_zero_page,
                        (unsigned long)empty_zero_page + PAGE_SIZE);

diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index 1f87b524db78cb3d52193b93f907612e5abda0ef..f94fe6d3f499fc9e632873810772533c3bcef8ba 100644 (file)
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c
@@ -45,17 +45,14 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
 static void __init zone_sizes_init(void)
 {
-       unsigned long zones_size[MAX_NR_ZONES];
-
-       /* Clear the zone sizes */
-       memset(zones_size, 0, sizeof(zones_size));
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
 
        /*
         * We use only ZONE_NORMAL
         */
-       zones_size[ZONE_NORMAL] = max_low_pfn;
+       max_zone_pfn[ZONE_NORMAL] = max_low_pfn;
 
-       free_area_init(zones_size);
+       free_area_init(max_zone_pfn);
 }
 
 extern const char _s_kernel_ro[], _e_kernel_ro[];

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 30885d0b94acfe449dcf6d7470b6aad51e53b3cc..401b22f14743a37ff22890ddd2d6ee420ac28d71 100644 (file)
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -158,8 +158,8 @@ static void __init fixaddr_user_init( void)
 
 void __init paging_init(void)
 {
-       unsigned long zones_size[MAX_NR_ZONES], vaddr;
-       int i;
+       unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
+       unsigned long vaddr;
 
        empty_zero_page = (unsigned long *) memblock_alloc_low(PAGE_SIZE,
                                                               PAGE_SIZE);
@@ -167,12 +167,8 @@ void __init paging_init(void)
                panic("%s: Failed to allocate %lu bytes align=%lx\n",
                      __func__, PAGE_SIZE, PAGE_SIZE);
 
-       for (i = 0; i < ARRAY_SIZE(zones_size); i++)
-               zones_size[i] = 0;
-
-       zones_size[ZONE_NORMAL] = (end_iomem >> PAGE_SHIFT) -
-               (uml_physmem >> PAGE_SHIFT);
-       free_area_init(zones_size);
+       max_zone_pfn[ZONE_NORMAL] = end_iomem >> PAGE_SHIFT;
+       free_area_init(max_zone_pfn);
 
        /*
         * Fixed mappings, only the page table structure has to be

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 5f15d87231672a0982b734ff9b6b1e9c0b8dffef..788704977de0aa74aba75a83e7c4a2a0043edf09 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2329,7 +2329,7 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud)
 }
 
 extern void __init pagecache_init(void);
-extern void free_area_init(unsigned long * zones_size);
+extern void free_area_init(unsigned long * max_zone_pfn);
 extern void __init free_area_init_node(int nid, unsigned long * zones_size,
                unsigned long zone_start_pfn, unsigned long *zholes_size);
 extern void free_initmem(void);

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 430e35384b7803a2fafe80203e780e50ac8182e8..cf420e947d9c3d92cdbf2e52d31b15b6b88e2f65 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7712,11 +7712,10 @@ void __init set_dma_reserve(unsigned long new_dma_reserve)
        dma_reserve = new_dma_reserve;
 }
 
-void __init free_area_init(unsigned long *zones_size)
+void __init free_area_init(unsigned long *max_zone_pfn)
 {
        init_unavailable_mem();
-       free_area_init_node(0, zones_size,
-                       __pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL);
+       free_area_init_nodes(max_zone_pfn);
 }
 
 static int page_alloc_cpu_dead(unsigned int cpu)