Commit c9118e6c authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

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: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarBaoquan 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6e245ad4

arch/arm/mm/init.c

+4 −7
Original line number Diff line number Diff line
@@ -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

arch/arm64/mm/init.c

+4 −7
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/fadump.c

+6 −5
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/mm/mem.c

+8 −7
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/mm/numa.c

+2 −5
Original line number Diff line number Diff line
@@ -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),

CRA Git | Maintained and supported by SUSTech CRA and CCSE