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>
This commit is contained in:
parent
3f08a302f5
commit
fa3354e4ea
|
@ -243,21 +243,17 @@ callback_init(void * kernel_end)
|
||||||
*/
|
*/
|
||||||
void __init paging_init(void)
|
void __init paging_init(void)
|
||||||
{
|
{
|
||||||
unsigned long zones_size[MAX_NR_ZONES] = {0, };
|
unsigned long max_zone_pfn[MAX_NR_ZONES] = {0, };
|
||||||
unsigned long dma_pfn, high_pfn;
|
unsigned long dma_pfn;
|
||||||
|
|
||||||
dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
|
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)
|
max_zone_pfn[ZONE_DMA] = dma_pfn;
|
||||||
zones_size[ZONE_DMA] = high_pfn;
|
max_zone_pfn[ZONE_NORMAL] = max_pfn;
|
||||||
else {
|
|
||||||
zones_size[ZONE_DMA] = dma_pfn;
|
|
||||||
zones_size[ZONE_NORMAL] = high_pfn - dma_pfn;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Initialize mem_map[]. */
|
/* Initialize mem_map[]. */
|
||||||
free_area_init(zones_size);
|
free_area_init(max_zone_pfn);
|
||||||
|
|
||||||
/* Initialize the kernel's ZERO_PGE. */
|
/* Initialize the kernel's ZERO_PGE. */
|
||||||
memset((void *)ZERO_PGE, 0, PAGE_SIZE);
|
memset((void *)ZERO_PGE, 0, PAGE_SIZE);
|
||||||
|
|
|
@ -33,7 +33,7 @@ EXPORT_SYMBOL(empty_zero_page);
|
||||||
void __init paging_init(void)
|
void __init paging_init(void)
|
||||||
{
|
{
|
||||||
struct pglist_data *pgdat = NODE_DATA(0);
|
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,
|
empty_zero_page = (unsigned long) memblock_alloc(PAGE_SIZE,
|
||||||
PAGE_SIZE);
|
PAGE_SIZE);
|
||||||
|
@ -49,11 +49,9 @@ void __init paging_init(void)
|
||||||
/*
|
/*
|
||||||
* Define zones
|
* Define zones
|
||||||
*/
|
*/
|
||||||
zones_size[ZONE_NORMAL] = (memory_end - PAGE_OFFSET) >> PAGE_SHIFT;
|
max_zone_pfn[ZONE_NORMAL] = memory_end >> PAGE_SHIFT;
|
||||||
pgdat->node_zones[ZONE_NORMAL].zone_start_pfn =
|
|
||||||
__pa(PAGE_OFFSET) >> PAGE_SHIFT;
|
|
||||||
|
|
||||||
free_area_init(zones_size);
|
free_area_init(max_zone_pfn);
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init mem_init(void)
|
void __init mem_init(void)
|
||||||
|
|
|
@ -83,10 +83,10 @@ void __init paging_init(void)
|
||||||
start_mem, end_mem);
|
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;
|
max_zone_pfn[ZONE_NORMAL] = end_mem >> PAGE_SHIFT;
|
||||||
free_area_init(zones_size);
|
free_area_init(max_zone_pfn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ void sync_icache_dcache(pte_t pte)
|
||||||
*/
|
*/
|
||||||
void __init paging_init(void)
|
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
|
* This is not particularly well documented anywhere, but
|
||||||
|
@ -101,9 +101,9 @@ void __init paging_init(void)
|
||||||
* adjust accordingly.
|
* 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
|
* Start of high memory area. Will probably need something more
|
||||||
|
|
|
@ -84,7 +84,7 @@ void __init paging_init(void)
|
||||||
* page_alloc get different views of the world.
|
* page_alloc get different views of the world.
|
||||||
*/
|
*/
|
||||||
unsigned long end_mem = memory_end & PAGE_MASK;
|
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;
|
high_memory = (void *) end_mem;
|
||||||
|
|
||||||
|
@ -98,8 +98,8 @@ void __init paging_init(void)
|
||||||
*/
|
*/
|
||||||
set_fs (USER_DS);
|
set_fs (USER_DS);
|
||||||
|
|
||||||
zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
|
max_zone_pfn[ZONE_DMA] = end_mem >> PAGE_SHIFT;
|
||||||
free_area_init(zones_size);
|
free_area_init(max_zone_pfn);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_MMU */
|
#endif /* CONFIG_MMU */
|
||||||
|
|
|
@ -39,7 +39,7 @@ void __init paging_init(void)
|
||||||
pte_t *pg_table;
|
pte_t *pg_table;
|
||||||
unsigned long address, size;
|
unsigned long address, size;
|
||||||
unsigned long next_pgtable, bootmem_end;
|
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;
|
enum zone_type zone;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -80,11 +80,8 @@ void __init paging_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
current->mm = NULL;
|
current->mm = NULL;
|
||||||
|
max_zone_pfn[ZONE_DMA] = PFN_DOWN(_ramend);
|
||||||
for (zone = 0; zone < MAX_NR_ZONES; zone++)
|
free_area_init(max_zone_pfn);
|
||||||
zones_size[zone] = 0x0;
|
|
||||||
zones_size[ZONE_DMA] = num_pages;
|
|
||||||
free_area_init(zones_size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)
|
int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)
|
||||||
|
|
|
@ -31,16 +31,13 @@ EXPORT_SYMBOL(empty_zero_page);
|
||||||
|
|
||||||
static void __init zone_sizes_init(void)
|
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 */
|
max_zone_pfn[ZONE_NORMAL] = max_low_pfn;
|
||||||
memset(zones_size, 0, sizeof(zones_size));
|
|
||||||
|
|
||||||
zones_size[ZONE_NORMAL] = max_low_pfn;
|
|
||||||
#ifdef CONFIG_HIGHMEM
|
#ifdef CONFIG_HIGHMEM
|
||||||
zones_size[ZONE_HIGHMEM] = max_pfn;
|
max_zone_pfn[ZONE_HIGHMEM] = max_pfn;
|
||||||
#endif
|
#endif
|
||||||
free_area_init(zones_size);
|
free_area_init(max_zone_pfn);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,17 +46,15 @@ pgd_t *pgd_current;
|
||||||
*/
|
*/
|
||||||
void __init paging_init(void)
|
void __init paging_init(void)
|
||||||
{
|
{
|
||||||
unsigned long zones_size[MAX_NR_ZONES];
|
unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
|
||||||
|
|
||||||
memset(zones_size, 0, sizeof(zones_size));
|
|
||||||
|
|
||||||
pagetable_init();
|
pagetable_init();
|
||||||
pgd_current = swapper_pg_dir;
|
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 */
|
/* 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,
|
flush_dcache_range((unsigned long)empty_zero_page,
|
||||||
(unsigned long)empty_zero_page + PAGE_SIZE);
|
(unsigned long)empty_zero_page + PAGE_SIZE);
|
||||||
|
|
|
@ -45,17 +45,14 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
||||||
|
|
||||||
static void __init zone_sizes_init(void)
|
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));
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We use only ZONE_NORMAL
|
* 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[];
|
extern const char _s_kernel_ro[], _e_kernel_ro[];
|
||||||
|
|
|
@ -158,8 +158,8 @@ static void __init fixaddr_user_init( void)
|
||||||
|
|
||||||
void __init paging_init(void)
|
void __init paging_init(void)
|
||||||
{
|
{
|
||||||
unsigned long zones_size[MAX_NR_ZONES], vaddr;
|
unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
|
||||||
int i;
|
unsigned long vaddr;
|
||||||
|
|
||||||
empty_zero_page = (unsigned long *) memblock_alloc_low(PAGE_SIZE,
|
empty_zero_page = (unsigned long *) memblock_alloc_low(PAGE_SIZE,
|
||||||
PAGE_SIZE);
|
PAGE_SIZE);
|
||||||
|
@ -167,12 +167,8 @@ void __init paging_init(void)
|
||||||
panic("%s: Failed to allocate %lu bytes align=%lx\n",
|
panic("%s: Failed to allocate %lu bytes align=%lx\n",
|
||||||
__func__, PAGE_SIZE, PAGE_SIZE);
|
__func__, PAGE_SIZE, PAGE_SIZE);
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(zones_size); i++)
|
max_zone_pfn[ZONE_NORMAL] = end_iomem >> PAGE_SHIFT;
|
||||||
zones_size[i] = 0;
|
free_area_init(max_zone_pfn);
|
||||||
|
|
||||||
zones_size[ZONE_NORMAL] = (end_iomem >> PAGE_SHIFT) -
|
|
||||||
(uml_physmem >> PAGE_SHIFT);
|
|
||||||
free_area_init(zones_size);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Fixed mappings, only the page table structure has to be
|
* Fixed mappings, only the page table structure has to be
|
||||||
|
|
|
@ -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 __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,
|
extern void __init free_area_init_node(int nid, unsigned long * zones_size,
|
||||||
unsigned long zone_start_pfn, unsigned long *zholes_size);
|
unsigned long zone_start_pfn, unsigned long *zholes_size);
|
||||||
extern void free_initmem(void);
|
extern void free_initmem(void);
|
||||||
|
|
|
@ -7712,11 +7712,10 @@ void __init set_dma_reserve(unsigned long new_dma_reserve)
|
||||||
dma_reserve = 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();
|
init_unavailable_mem();
|
||||||
free_area_init_node(0, zones_size,
|
free_area_init_nodes(max_zone_pfn);
|
||||||
__pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int page_alloc_cpu_dead(unsigned int cpu)
|
static int page_alloc_cpu_dead(unsigned int cpu)
|
||||||
|
|
Loading…
Reference in New Issue