arch, mm: replace for_each_memblock() with for_each_mem_pfn_range()

There are several occurrences of the following pattern:

	for_each_memblock(memory, reg) {
		start_pfn = memblock_region_memory_base_pfn(reg);
		end_pfn = memblock_region_memory_end_pfn(reg);

		/* do something with start_pfn and end_pfn */
	}

Rather than iterate over all memblock.memory regions and each time query
for their start and end PFNs, use for_each_mem_pfn_range() iterator to get
simpler and clearer code.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Baoquan He <bhe@redhat.com>
Acked-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>	[.clang-format]
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Daniel Axtens <dja@axtens.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Emil Renner Berthing <kernel@esmil.dk>
Cc: Hari Bathini <hbathini@linux.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: https://lkml.kernel.org/r/20200818151634.14343-12-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 50a5a30a78ff2ee264adf1d485fe8dc38e7892a7..45f9d5ec23604ed6c87a247e48593aed4c8d0f53 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -299,16 +299,14 @@ free_memmap(unsigned long start_pfn, unsigned long end_pfn)
  */
 static void __init free_unused_memmap(void)
 {
-       unsigned long start, prev_end = 0;
-       struct memblock_region *reg;
+       unsigned long start, end, prev_end = 0;
+       int i;
 
        /*
         * This relies on each bank being in address order.
         * The banks are sorted previously in bootmem_init().
         */
-       for_each_memblock(memory, reg) {
-               start = memblock_region_memory_base_pfn(reg);
-
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &start, &end, NULL) {
 #ifdef CONFIG_SPARSEMEM
                /*
                 * Take care not to free memmap entries that don't exist
@@ -336,8 +334,7 @@ static void __init free_unused_memmap(void)
                 * memmap entries are valid from the bank end aligned to
                 * MAX_ORDER_NR_PAGES.
                 */
-               prev_end = ALIGN(memblock_region_memory_end_pfn(reg),
-                                MAX_ORDER_NR_PAGES);
+               prev_end = ALIGN(end, MAX_ORDER_NR_PAGES);
        }
 
 #ifdef CONFIG_SPARSEMEM

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 481d22c32a2e7fb08d0a061bb46a9ebe40414891..f0bf86d8162272e89f40be3da49489c4a8ec176b 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -471,12 +471,10 @@ static inline void free_memmap(unsigned long start_pfn, unsigned long end_pfn)
  */
 static void __init free_unused_memmap(void)
 {
-       unsigned long start, prev_end = 0;
-       struct memblock_region *reg;
-
-       for_each_memblock(memory, reg) {
-               start = __phys_to_pfn(reg->base);
+       unsigned long start, end, prev_end = 0;
+       int i;
 
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &start, &end, NULL) {
 #ifdef CONFIG_SPARSEMEM
                /*
                 * Take care not to free memmap entries that don't exist due
@@ -496,8 +494,7 @@ static void __init free_unused_memmap(void)
                 * memmap entries are valid from the bank end aligned to
                 * MAX_ORDER_NR_PAGES.
                 */
-               prev_end = ALIGN(__phys_to_pfn(reg->base + reg->size),
-                                MAX_ORDER_NR_PAGES);
+               prev_end = ALIGN(end, MAX_ORDER_NR_PAGES);
        }
 
 #ifdef CONFIG_SPARSEMEM

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 10ebb4bf71ad0e1859135be40e5ae7940304f24d..e469b150be2117229be8b9a8a6e85d4fa79e472c 100644 (file)
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -1242,14 +1242,15 @@ static void fadump_free_reserved_memory(unsigned long start_pfn,
  */
 static void fadump_release_reserved_area(u64 start, u64 end)
 {
-       u64 tstart, tend, spfn, epfn;
-       struct memblock_region *reg;
+       u64 tstart, tend, spfn, epfn, reg_spfn, reg_epfn, i;
 
        spfn = PHYS_PFN(start);
        epfn = PHYS_PFN(end);
-       for_each_memblock(memory, reg) {
-               tstart = max_t(u64, spfn, memblock_region_memory_base_pfn(reg));
-               tend   = min_t(u64, epfn, memblock_region_memory_end_pfn(reg));
+
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &reg_spfn, &reg_epfn, NULL) {
+               tstart = max_t(u64, spfn, reg_spfn);
+               tend   = min_t(u64, epfn, reg_epfn);
+
                if (tstart < tend) {
                        fadump_free_reserved_memory(tstart, tend);
 

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 42e25874f5a8f3bc4096e42f70b7ff57ffb6da6c..80df329f180ef940f3815c58fe3e3deb79b6845a 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -184,15 +184,16 @@ void __init initmem_init(void)
 /* mark pages that don't exist as nosave */
 static int __init mark_nonram_nosave(void)
 {
-       struct memblock_region *reg, *prev = NULL;
+       unsigned long spfn, epfn, prev = 0;
+       int i;
 
-       for_each_memblock(memory, reg) {
-               if (prev &&
-                   memblock_region_memory_end_pfn(prev) < memblock_region_memory_base_pfn(reg))
-                       register_nosave_region(memblock_region_memory_end_pfn(prev),
-                                              memblock_region_memory_base_pfn(reg));
-               prev = reg;
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &spfn, &epfn, NULL) {
+               if (prev && prev < spfn)
+                       register_nosave_region(prev, spfn);
+
+               prev = epfn;
        }
+
        return 0;
 }
 #else /* CONFIG_NEED_MULTIPLE_NODES */

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 1f61fa2148b52cbe0db783c35c33c4c5654f2d0c..f4e20d8e6c02131afabe8267e130f040bd8631f3 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -804,17 +804,14 @@ static void __init setup_nonnuma(void)
        unsigned long total_ram = memblock_phys_mem_size();
        unsigned long start_pfn, end_pfn;
        unsigned int nid = 0;
-       struct memblock_region *reg;
+       int i;
 
        printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
               top_of_ram, total_ram);
        printk(KERN_DEBUG "Memory hole size: %ldMB\n",
               (top_of_ram - total_ram) >> 20);
 
-       for_each_memblock(memory, reg) {
-               start_pfn = memblock_region_memory_base_pfn(reg);
-               end_pfn = memblock_region_memory_end_pfn(reg);
-
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) {
                fake_numa_create_new_node(end_pfn, &nid);
                memblock_set_node(PFN_PHYS(start_pfn),
                                  PFN_PHYS(end_pfn - start_pfn),

diff --git a/arch/s390/mm/page-states.c b/arch/s390/mm/page-states.c
index fc141893d028493df59883ac04a0450f22ab6e5e..567c69f3069e71cf3c6d6a8a4c6557769d280fbe 100644 (file)
--- a/arch/s390/mm/page-states.c
+++ b/arch/s390/mm/page-states.c
@@ -183,9 +183,9 @@ static void mark_kernel_pgd(void)
 
 void __init cmma_init_nodat(void)
 {
-       struct memblock_region *reg;
        struct page *page;
        unsigned long start, end, ix;
+       int i;
 
        if (cmma_flag < 2)
                return;
@@ -193,9 +193,7 @@ void __init cmma_init_nodat(void)
        mark_kernel_pgd();
 
        /* Set all kernel pages not used for page tables to stable/no-dat */
-       for_each_memblock(memory, reg) {
-               start = memblock_region_memory_base_pfn(reg);
-               end = memblock_region_memory_end_pfn(reg);
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &start, &end, NULL) {
                page = pfn_to_page(start);
                for (ix = start; ix < end; ix++, page++) {
                        if (__test_and_clear_bit(PG_arch_1, &page->flags))

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 4735176ab811fa6c945b91d50fd326ca93098bd0..3348e0c4d769881f93b161130a11a0f0aa1a55de 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -226,15 +226,12 @@ void __init allocate_pgdat(unsigned int nid)
 
 static void __init do_init_bootmem(void)
 {
-       struct memblock_region *reg;
+       unsigned long start_pfn, end_pfn;
+       int i;
 
        /* Add active regions with valid PFNs. */
-       for_each_memblock(memory, reg) {
-               unsigned long start_pfn, end_pfn;
-               start_pfn = memblock_region_memory_base_pfn(reg);
-               end_pfn = memblock_region_memory_end_pfn(reg);
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL)
                __add_active_range(0, start_pfn, end_pfn);
-       }
 
        /* All of system RAM sits in node 0 for the non-NUMA case */
        allocate_pgdat(0);

diff --git a/mm/memblock.c b/mm/memblock.c
index e9b6efd74329d31a9a3e066c010045628fe16794..d66d805dec96bee4060606e370ecba05d3f0859f 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1663,12 +1663,10 @@ phys_addr_t __init_memblock memblock_reserved_size(void)
 phys_addr_t __init memblock_mem_size(unsigned long limit_pfn)
 {
        unsigned long pages = 0;
-       struct memblock_region *r;
        unsigned long start_pfn, end_pfn;
+       int i;
 
-       for_each_memblock(memory, r) {
-               start_pfn = memblock_region_memory_base_pfn(r);
-               end_pfn = memblock_region_memory_end_pfn(r);
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) {
                start_pfn = min_t(unsigned long, start_pfn, limit_pfn);
                end_pfn = min_t(unsigned long, end_pfn, limit_pfn);
                pages += end_pfn - start_pfn;

diff --git a/mm/sparse.c b/mm/sparse.c
index fcc3d176f1eaab84b9e513312563d4994a325dad..b25ad8e64839243c3cb60c3c7cb57e13bc815681 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -291,13 +291,11 @@ static void __init memory_present(int nid, unsigned long start, unsigned long en
  */
 static void __init memblocks_present(void)
 {
-       struct memblock_region *reg;
+       unsigned long start, end;
+       int i, nid;
 
-       for_each_memblock(memory, reg) {
-               memory_present(memblock_get_region_node(reg),
-                              memblock_region_memory_base_pfn(reg),
-                              memblock_region_memory_end_pfn(reg));
-       }
+       for_each_mem_pfn_range(i, MAX_NUMNODES, &start, &end, &nid)
+               memory_present(nid, start, end);
 }
 
 /*