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

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: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Tested-by: Hoan Tran <hoan@os.amperecomputing.com>	[arm64]
Reviewed-by: default avatarBaoquan 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3f08a302

arch/alpha/mm/init.c

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

arch/c6x/mm/init.c

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

arch/h8300/mm/init.c

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

	}

}

arch/hexagon/mm/init.c

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

arch/m68k/mm/init.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE