On Mon, Dec 30, 2024 at 05:07:50PM +0800, Qi Zheng wrote:
> The pte_free(), pmd_free(), __pud_free() and __p4d_free() in
> asm-generic/pgalloc.h and the generic __tlb_remove_table() are basically
> the same, so let's introduce pagetable_dtor_free() to deduplicate them.
>
> In addition, the pagetable_dtor_free() in s390 does the same thing, so
> let's s390 also calls generic pagetable_dtor_free().
>
> Signed-off-by: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>
> Suggested-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
> ---
> arch/s390/mm/pgalloc.c | 6 ------
> include/asm-generic/pgalloc.h | 12 ++++--------
> include/asm-generic/tlb.h | 3 +--
> include/linux/mm.h | 6 ++++++
> 4 files changed, 11 insertions(+), 16 deletions(-)
>
> diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
> index 3e002dea6278f..a4e7619020931 100644
> --- a/arch/s390/mm/pgalloc.c
> +++ b/arch/s390/mm/pgalloc.c
> @@ -180,12 +180,6 @@ unsigned long *page_table_alloc(struct mm_struct *mm)
> return table;
> }
>
> -static void pagetable_dtor_free(struct ptdesc *ptdesc)
> -{
> - pagetable_dtor(ptdesc);
> - pagetable_free(ptdesc);
> -}
> -
> void page_table_free(struct mm_struct *mm, unsigned long *table)
> {
> struct ptdesc *ptdesc = virt_to_ptdesc(table);
> diff --git a/include/asm-generic/pgalloc.h b/include/asm-generic/pgalloc.h
> index 4afb346eae255..e3977ddca15e4 100644
> --- a/include/asm-generic/pgalloc.h
> +++ b/include/asm-generic/pgalloc.h
> @@ -109,8 +109,7 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte_page)
> {
> struct ptdesc *ptdesc = page_ptdesc(pte_page);
>
> - pagetable_dtor(ptdesc);
> - pagetable_free(ptdesc);
> + pagetable_dtor_free(ptdesc);
> }
>
>
> @@ -153,8 +152,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
> struct ptdesc *ptdesc = virt_to_ptdesc(pmd);
>
> BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));
> - pagetable_dtor(ptdesc);
> - pagetable_free(ptdesc);
> + pagetable_dtor_free(ptdesc);
> }
> #endif
>
> @@ -202,8 +200,7 @@ static inline void __pud_free(struct mm_struct *mm, pud_t *pud)
> struct ptdesc *ptdesc = virt_to_ptdesc(pud);
>
> BUG_ON((unsigned long)pud & (PAGE_SIZE-1));
> - pagetable_dtor(ptdesc);
> - pagetable_free(ptdesc);
> + pagetable_dtor_free(ptdesc);
> }
>
> #ifndef __HAVE_ARCH_PUD_FREE
> @@ -248,8 +245,7 @@ static inline void __p4d_free(struct mm_struct *mm, p4d_t *p4d)
> struct ptdesc *ptdesc = virt_to_ptdesc(p4d);
>
> BUG_ON((unsigned long)p4d & (PAGE_SIZE-1));
> - pagetable_dtor(ptdesc);
> - pagetable_free(ptdesc);
> + pagetable_dtor_free(ptdesc);
> }
>
> #ifndef __HAVE_ARCH_P4D_FREE
> diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
> index 69de47c7ef3c5..a96d4b440f3da 100644
> --- a/include/asm-generic/tlb.h
> +++ b/include/asm-generic/tlb.h
> @@ -213,8 +213,7 @@ static inline void __tlb_remove_table(void *table)
> {
> struct ptdesc *ptdesc = (struct ptdesc *)table;
>
> - pagetable_dtor(ptdesc);
> - pagetable_free(ptdesc);
> + pagetable_dtor_free(ptdesc);
> }
> #endif
>
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index cad11fa10c192..94078c488e904 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -3001,6 +3001,12 @@ static inline void pagetable_dtor(struct ptdesc *ptdesc)
> lruvec_stat_sub_folio(folio, NR_PAGETABLE);
> }
>
> +static inline void pagetable_dtor_free(struct ptdesc *ptdesc)
> +{
> + pagetable_dtor(ptdesc);
> + pagetable_free(ptdesc);
> +}
> +
> static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc)
> {
> struct folio *folio = ptdesc_folio(ptdesc);
For s390:
Acked-by: Alexander Gordeev <agordeev@xxxxxxxxxxxxx>
Thanks!
