Reviewed-by: Huacai Chen <chenhuacai@xxxxxxxxxxx>
On Wed, Oct 30, 2024 at 2:39 PM Bibo Mao <maobibo@xxxxxxxxxxx> wrote:
>
> Function pud_init(), pmd_init() and kernel_pte_init() are duplicated
> defined in file kasan.c and sparse-vmemmap.c as weak functions. Move
> them to generic header file pgtable.h, architecture can redefine them.
>
> Signed-off-by: Bibo Mao <maobibo@xxxxxxxxxxx>
> ---
> v1 ... v2:
> 1. Add general function definition about kernel_pte_init().
> ---
> arch/loongarch/include/asm/pgtable.h | 3 +++
> arch/mips/include/asm/pgtable-64.h | 2 ++
> include/linux/mm.h | 3 ---
> include/linux/pgtable.h | 21 +++++++++++++++++++++
> mm/kasan/init.c | 12 ------------
> mm/sparse-vmemmap.c | 12 ------------
> 6 files changed, 26 insertions(+), 27 deletions(-)
>
> diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h
> index 20714b73f14c..df5889d995f9 100644
> --- a/arch/loongarch/include/asm/pgtable.h
> +++ b/arch/loongarch/include/asm/pgtable.h
> @@ -267,8 +267,11 @@ extern void set_pmd_at(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, pm
> * Initialize a new pgd / pud / pmd table with invalid pointers.
> */
> extern void pgd_init(void *addr);
> +#define pud_init pud_init
> extern void pud_init(void *addr);
> +#define pmd_init pmd_init
> extern void pmd_init(void *addr);
> +#define kernel_pte_init kernel_pte_init
> extern void kernel_pte_init(void *addr);
>
> /*
> diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
> index 401c1d9e4409..45c8572a0462 100644
> --- a/arch/mips/include/asm/pgtable-64.h
> +++ b/arch/mips/include/asm/pgtable-64.h
> @@ -316,7 +316,9 @@ static inline pmd_t *pud_pgtable(pud_t pud)
> * Initialize a new pgd / pud / pmd table with invalid pointers.
> */
> extern void pgd_init(void *addr);
> +#define pud_init pud_init
> extern void pud_init(void *addr);
> +#define pmd_init pmd_init
> extern void pmd_init(void *addr);
>
> /*
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 61fff5d34ed5..651bdc1bef48 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -3818,9 +3818,6 @@ void *sparse_buffer_alloc(unsigned long size);
> struct page * __populate_section_memmap(unsigned long pfn,
> unsigned long nr_pages, int nid, struct vmem_altmap *altmap,
> struct dev_pagemap *pgmap);
> -void pud_init(void *addr);
> -void pmd_init(void *addr);
> -void kernel_pte_init(void *addr);
> pgd_t *vmemmap_pgd_populate(unsigned long addr, int node);
> p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node);
> pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node);
> diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
> index e8b2ac6bd2ae..adee214c21f8 100644
> --- a/include/linux/pgtable.h
> +++ b/include/linux/pgtable.h
> @@ -90,6 +90,27 @@ static inline unsigned long pud_index(unsigned long address)
> #define pgd_index(a) (((a) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
> #endif
>
> +#ifndef kernel_pte_init
> +static inline void kernel_pte_init(void *addr)
> +{
> +}
> +#define kernel_pte_init kernel_pte_init
> +#endif
> +
> +#ifndef pmd_init
> +static inline void pmd_init(void *addr)
> +{
> +}
> +#define pmd_init pmd_init
> +#endif
> +
> +#ifndef pud_init
> +static inline void pud_init(void *addr)
> +{
> +}
> +#define pud_init pud_init
> +#endif
> +
> #ifndef pte_offset_kernel
> static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)
> {
> diff --git a/mm/kasan/init.c b/mm/kasan/init.c
> index ac607c306292..ced6b29fcf76 100644
> --- a/mm/kasan/init.c
> +++ b/mm/kasan/init.c
> @@ -106,10 +106,6 @@ static void __ref zero_pte_populate(pmd_t *pmd, unsigned long addr,
> }
> }
>
> -void __weak __meminit kernel_pte_init(void *addr)
> -{
> -}
> -
> static int __ref zero_pmd_populate(pud_t *pud, unsigned long addr,
> unsigned long end)
> {
> @@ -145,10 +141,6 @@ static int __ref zero_pmd_populate(pud_t *pud, unsigned long addr,
> return 0;
> }
>
> -void __weak __meminit pmd_init(void *addr)
> -{
> -}
> -
> static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr,
> unsigned long end)
> {
> @@ -187,10 +179,6 @@ static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr,
> return 0;
> }
>
> -void __weak __meminit pud_init(void *addr)
> -{
> -}
> -
> static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr,
> unsigned long end)
> {
> diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
> index c0388b2e959d..cec67c5f37d8 100644
> --- a/mm/sparse-vmemmap.c
> +++ b/mm/sparse-vmemmap.c
> @@ -184,10 +184,6 @@ static void * __meminit vmemmap_alloc_block_zero(unsigned long size, int node)
> return p;
> }
>
> -void __weak __meminit kernel_pte_init(void *addr)
> -{
> -}
> -
> pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node)
> {
> pmd_t *pmd = pmd_offset(pud, addr);
> @@ -201,10 +197,6 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node)
> return pmd;
> }
>
> -void __weak __meminit pmd_init(void *addr)
> -{
> -}
> -
> pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node)
> {
> pud_t *pud = pud_offset(p4d, addr);
> @@ -218,10 +210,6 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node)
> return pud;
> }
>
> -void __weak __meminit pud_init(void *addr)
> -{
> -}
> -
> p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node)
> {
> p4d_t *p4d = p4d_offset(pgd, addr);
>
> base-commit: 81983758430957d9a5cb3333fe324fd70cf63e7e
> --
> 2.39.3
>
