Commit 22c4e804 authored by Feiyang Chen's avatar Feiyang Chen Committed by Andrew Morton
Browse files

MIPS&LoongArch&NIOS2: adjust prototypes of p?d_init() 

Patch series "mm/sparse-vmemmap: Generalise helpers and enable for
LoongArch", v14.

This series is in order to enable sparse-vmemmap for LoongArch.  But
LoongArch cannot use generic helpers directly because MIPS&LoongArch need
to call pgd_init()/pud_init()/pmd_init() when populating page tables.  So
we adjust the prototypes of p?d_init() to make generic helpers can call
them, then enable sparse-vmemmap with generic helpers, and to be further,
generalise vmemmap_populate_hugepages() for ARM64, X86 and LoongArch.


This patch (of 4):

We are preparing to add sparse vmemmap support to LoongArch.  MIPS and
LoongArch need to call pgd_init()/pud_init()/pmd_init() when populating
page tables, so adjust their prototypes to make generic helpers can call
them.

NIOS2 declares pmd_init() but doesn't use, just remove it to avoid build
errors.

Link: https://lkml.kernel.org/r/20221027125253.3458989-1-chenhuacai@loongson.cn
Link: https://lkml.kernel.org/r/20221027125253.3458989-2-chenhuacai@loongson.cn


Signed-off-by: default avatarFeiyang Chen <chenfeiyang@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Reviewed-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Will Deacon <will@kernel.org>
Cc: Xuefeng Li <lixuefeng@loongson.cn>
Cc: Xuerui Wang <kernel@xen0n.name>
Cc: Min Zhou <zhoumin@loongson.cn>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 85716a80

arch/loongarch/include/asm/pgalloc.h

+2 −11
Original line number Original line Diff line number Diff line
@@ -42,15 +42,6 @@ static inline void p4d_populate(struct mm_struct *mm, p4d_t *p4d, pud_t *pud) 




extern void pagetable_init(void);

extern void pagetable_init(void);





/*

 * Initialize a new pmd table with invalid pointers.

 */

extern void pmd_init(unsigned long page, unsigned long pagetable);



/*

 * Initialize a new pgd / pmd table with invalid pointers.

 */

extern void pgd_init(unsigned long page);

extern pgd_t *pgd_alloc(struct mm_struct *mm);

extern pgd_t *pgd_alloc(struct mm_struct *mm);





#define __pte_free_tlb(tlb, pte, address)			\

#define __pte_free_tlb(tlb, pte, address)			\
@@ -76,7 +67,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) 
	}

	}





	pmd = (pmd_t *)page_address(pg);

	pmd = (pmd_t *)page_address(pg);

	pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);

	pmd_init(pmd);

	return pmd;

	return pmd;

}

}
@@ -92,7 +83,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address) 




	pud = (pud_t *) __get_free_page(GFP_KERNEL);

	pud = (pud_t *) __get_free_page(GFP_KERNEL);

	if (pud)

	if (pud)

		pud_init((unsigned long)pud, (unsigned long)invalid_pmd_table);

		pud_init(pud);

	return pud;

	return pud;

}

}

arch/loongarch/include/asm/pgtable.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -237,11 +237,11 @@ extern void set_pmd_at(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, pm 
#define pfn_pmd(pfn, prot)	__pmd(((pfn) << _PFN_SHIFT) | pgprot_val(prot))

#define pfn_pmd(pfn, prot)	__pmd(((pfn) << _PFN_SHIFT) | pgprot_val(prot))





/*

/*

 * Initialize a new pgd / pmd table with invalid pointers.

 * Initialize a new pgd / pud / pmd table with invalid pointers.

 */

 */

extern void pgd_init(unsigned long page);

extern void pgd_init(void *addr);

extern void pud_init(unsigned long page, unsigned long pagetable);

extern void pud_init(void *addr);

extern void pmd_init(unsigned long page, unsigned long pagetable);

extern void pmd_init(void *addr);





/*

/*

 * Non-present pages:  high 40 bits are offset, next 8 bits type,

 * Non-present pages:  high 40 bits are offset, next 8 bits type,

arch/loongarch/kernel/numa.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ void __init pcpu_populate_pte(unsigned long addr) 
		new = memblock_alloc(PAGE_SIZE, PAGE_SIZE);

		new = memblock_alloc(PAGE_SIZE, PAGE_SIZE);

		pgd_populate(&init_mm, pgd, new);

		pgd_populate(&init_mm, pgd, new);

#ifndef __PAGETABLE_PUD_FOLDED

#ifndef __PAGETABLE_PUD_FOLDED

		pud_init((unsigned long)new, (unsigned long)invalid_pmd_table);

		pud_init(new);

#endif

#endif

	}

	}
@@ -89,7 +89,7 @@ void __init pcpu_populate_pte(unsigned long addr) 
		new = memblock_alloc(PAGE_SIZE, PAGE_SIZE);

		new = memblock_alloc(PAGE_SIZE, PAGE_SIZE);

		pud_populate(&init_mm, pud, new);

		pud_populate(&init_mm, pud, new);

#ifndef __PAGETABLE_PMD_FOLDED

#ifndef __PAGETABLE_PMD_FOLDED

		pmd_init((unsigned long)new, (unsigned long)invalid_pte_table);

		pmd_init(new);

#endif

#endif

	}

	}

arch/loongarch/mm/pgtable.c

+13 −10
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) 
	ret = (pgd_t *) __get_free_page(GFP_KERNEL);

	ret = (pgd_t *) __get_free_page(GFP_KERNEL);

	if (ret) {

	if (ret) {

		init = pgd_offset(&init_mm, 0UL);

		init = pgd_offset(&init_mm, 0UL);

		pgd_init((unsigned long)ret);

		pgd_init(ret);

		memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD,

		memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD,

		       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));

		       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));

	}

	}
@@ -25,7 +25,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) 
}

}

EXPORT_SYMBOL_GPL(pgd_alloc);

EXPORT_SYMBOL_GPL(pgd_alloc);





void pgd_init(unsigned long page)

void pgd_init(void *addr)

{

{

	unsigned long *p, *end;

	unsigned long *p, *end;

	unsigned long entry;

	unsigned long entry;
@@ -38,7 +38,7 @@ void pgd_init(unsigned long page) 
	entry = (unsigned long)invalid_pte_table;

	entry = (unsigned long)invalid_pte_table;

#endif

#endif





	p = (unsigned long *) page;

	p = (unsigned long *)addr;

	end = p + PTRS_PER_PGD;

	end = p + PTRS_PER_PGD;





	do {

	do {
@@ -56,9 +56,10 @@ void pgd_init(unsigned long page) 
EXPORT_SYMBOL_GPL(pgd_init);

EXPORT_SYMBOL_GPL(pgd_init);





#ifndef __PAGETABLE_PMD_FOLDED

#ifndef __PAGETABLE_PMD_FOLDED

void pmd_init(unsigned long addr, unsigned long pagetable)

void pmd_init(void *addr)

{

{

	unsigned long *p, *end;

	unsigned long *p, *end;

	unsigned long pagetable = (unsigned long)invalid_pte_table;





	p = (unsigned long *)addr;

	p = (unsigned long *)addr;

	end = p + PTRS_PER_PMD;

	end = p + PTRS_PER_PMD;
@@ -79,9 +80,10 @@ EXPORT_SYMBOL_GPL(pmd_init); 
#endif

#endif





#ifndef __PAGETABLE_PUD_FOLDED

#ifndef __PAGETABLE_PUD_FOLDED

void pud_init(unsigned long addr, unsigned long pagetable)

void pud_init(void *addr)

{

{

	unsigned long *p, *end;

	unsigned long *p, *end;

	unsigned long pagetable = (unsigned long)invalid_pmd_table;





	p = (unsigned long *)addr;

	p = (unsigned long *)addr;

	end = p + PTRS_PER_PUD;

	end = p + PTRS_PER_PUD;
@@ -98,6 +100,7 @@ void pud_init(unsigned long addr, unsigned long pagetable) 
		p[-1] = pagetable;

		p[-1] = pagetable;

	} while (p != end);

	} while (p != end);

}

}

EXPORT_SYMBOL_GPL(pud_init);

#endif

#endif





pmd_t mk_pmd(struct page *page, pgprot_t prot)

pmd_t mk_pmd(struct page *page, pgprot_t prot)
@@ -119,12 +122,12 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr, 
void __init pagetable_init(void)

void __init pagetable_init(void)

{

{

	/* Initialize the entire pgd.  */

	/* Initialize the entire pgd.  */

	pgd_init((unsigned long)swapper_pg_dir);

	pgd_init(swapper_pg_dir);

	pgd_init((unsigned long)invalid_pg_dir);

	pgd_init(invalid_pg_dir);

#ifndef __PAGETABLE_PUD_FOLDED

#ifndef __PAGETABLE_PUD_FOLDED

	pud_init((unsigned long)invalid_pud_table, (unsigned long)invalid_pmd_table);

	pud_init(invalid_pud_table);

#endif

#endif

#ifndef __PAGETABLE_PMD_FOLDED

#ifndef __PAGETABLE_PMD_FOLDED

	pmd_init((unsigned long)invalid_pmd_table, (unsigned long)invalid_pte_table);

	pmd_init(invalid_pmd_table);

#endif

#endif

}
 
}

arch/mips/include/asm/pgalloc.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, 
/*

/*

 * Initialize a new pmd table with invalid pointers.

 * Initialize a new pmd table with invalid pointers.

 */

 */

extern void pmd_init(unsigned long page, unsigned long pagetable);

extern void pmd_init(void *addr);





#ifndef __PAGETABLE_PMD_FOLDED

#ifndef __PAGETABLE_PMD_FOLDED
@@ -44,9 +44,9 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) 
#endif

#endif





/*

/*

 * Initialize a new pgd / pmd table with invalid pointers.

 * Initialize a new pgd table with invalid pointers.

 */

 */

extern void pgd_init(unsigned long page);

extern void pgd_init(void *addr);

extern pgd_t *pgd_alloc(struct mm_struct *mm);

extern pgd_t *pgd_alloc(struct mm_struct *mm);





static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)

static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
@@ -77,7 +77,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) 
	}

	}





	pmd = (pmd_t *)page_address(pg);

	pmd = (pmd_t *)page_address(pg);

	pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);

	pmd_init(pmd);

	return pmd;

	return pmd;

}

}
@@ -93,7 +93,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address) 




	pud = (pud_t *) __get_free_pages(GFP_KERNEL, PUD_TABLE_ORDER);

	pud = (pud_t *) __get_free_pages(GFP_KERNEL, PUD_TABLE_ORDER);

	if (pud)

	if (pud)

		pud_init((unsigned long)pud, (unsigned long)invalid_pmd_table);

		pud_init(pud);

	return pud;

	return pud;

}

}