Re: [PATCH v4 12/15] s390: pgtable: also move pagetable_dtor() of PxD to __tlb_remove_table()

[Qi Zheng]

On 2025/1/6 18:36, Alexander Gordeev wrote:

On Mon, Dec 30, 2024 at 05:07:47PM +0800, Qi Zheng wrote:

To unify the PxD and PTE TLB free path, also move the pagetable_dtor() of
PMD|PUD|P4D to __tlb_remove_table().

The above and Subject are still incorrect: pagetable_dtor() is
called from pagetable_dtor_free(), not from __tlb_remove_table().

Hmm, __tlb_remove_table() calls pagetable_dtor_free(), so moving to
pagetable_dtor_free() means moving to __tlb_remove_table(). Right?
And the main purpose of this patch is also to move pagetable_dtor()
to __tlb_remove_table(). So I think this description makes sense?

...

diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index 569de24d33761..c73b89811a264 100644
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -180,7 +180,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm)
        return table;
  }

-static void pagetable_pte_dtor_free(struct ptdesc *ptdesc)

+static void pagetable_dtor_free(struct ptdesc *ptdesc)
  {
        pagetable_dtor(ptdesc);
        pagetable_free(ptdesc);
@@ -190,20 +190,14 @@ void page_table_free(struct mm_struct *mm, unsigned long 
*table)
  {
        struct ptdesc *ptdesc = virt_to_ptdesc(table);

- pagetable_pte_dtor_free(ptdesc);

+       pagetable_dtor_free(ptdesc);
  }

void __tlb_remove_table(void *table)

  {
        struct ptdesc *ptdesc = virt_to_ptdesc(table);
-       struct page *page = ptdesc_page(ptdesc);

- if (compound_order(page) == CRST_ALLOC_ORDER) {

-               /* pmd, pud, or p4d */
-               pagetable_free(ptdesc);
-               return;
-       }
-       pagetable_pte_dtor_free(ptdesc);
+       pagetable_dtor_free(ptdesc);
  }