mm: pgtable: convert some architectures to use tlb_remove_ptdesc()

Now, the nine architectures of csky, hexagon, loongarch, m68k, mips,
nios2, openrisc, sh and um do not select CONFIG_MMU_GATHER_RCU_TABLE_FREE,
and just call pagetable_dtor() + tlb_remove_page_ptdesc() (the wrapper of
tlb_remove_page()).  This is the same as the implementation of
tlb_remove_{ptdesc|table}() under !CONFIG_MMU_GATHER_TABLE_FREE, so
convert these architectures to use tlb_remove_ptdesc().

The ultimate goal is to make the architecture only use tlb_remove_ptdesc()
or tlb_remove_table() for page table pages.

[zhengqi.arch@bytedance.com: v2]
Link: https://lkml.kernel.org/r/20250303072603.45423-1-zhengqi.arch@bytedance.com
[akpm@linux-foundation.org: remove trailing semi in arch/loongarch/include/asm/pgalloc.h]
Link: https://lkml.kernel.org/r/19db3e8673b67bad2f1df1ab37f1c89d99eacfea.1740454179.git.zhengqi.arch@bytedance.com
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Suggested-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kevin Brodsky <kevin.brodsky@arm.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>	[m68k]
Cc: Alexandre Ghiti <alexghiti@rivosinc.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickens <hughd@google.com>
Cc: Jann Horn <jannh@google.com>
Cc: Matthew Wilcow (Oracle) <willy@infradead.org>
Cc: "Mike Rapoport (IBM)" <rppt@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yu Zhao <yuzhao@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/csky/include/asm/pgalloc.h b/arch/csky/include/asm/pgalloc.h
index bf8400c28b5a3cc04b101af2b50c86f1d68a54ae..11055c5749686c8a551b582d5ed7f55bdac203b7 100644 (file)
--- a/arch/csky/include/asm/pgalloc.h
+++ b/arch/csky/include/asm/pgalloc.h
@@ -61,11 +61,8 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
        return ret;
 }
 
-#define __pte_free_tlb(tlb, pte, address)              \
-do {                                                   \
-       pagetable_dtor(page_ptdesc(pte));               \
-       tlb_remove_page_ptdesc(tlb, page_ptdesc(pte));  \
-} while (0)
+#define __pte_free_tlb(tlb, pte, address)      \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 extern void pagetable_init(void);
 extern void mmu_init(unsigned long min_pfn, unsigned long max_pfn);

diff --git a/arch/hexagon/include/asm/pgalloc.h b/arch/hexagon/include/asm/pgalloc.h
index 1ee5f5f157ca75a2bc5b7d80694d0ed632ad7702..937a11ef4c33c8250b35856bfb9cadccbf9c7f48 100644 (file)
--- a/arch/hexagon/include/asm/pgalloc.h
+++ b/arch/hexagon/include/asm/pgalloc.h
@@ -87,10 +87,7 @@ static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
                max_kernel_seg = pmdindex;
 }
 
-#define __pte_free_tlb(tlb, pte, addr)                         \
-do {                                                           \
-       pagetable_dtor((page_ptdesc(pte)));                     \
-       tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte)));      \
-} while (0)
+#define __pte_free_tlb(tlb, pte, addr) \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 #endif

diff --git a/arch/loongarch/include/asm/pgalloc.h b/arch/loongarch/include/asm/pgalloc.h
index 7211dff8c969e8cc2a60af451ddff95243c8b2c4..b58f587f0f0adadcc6329468900e3ccd472196f9 100644 (file)
--- a/arch/loongarch/include/asm/pgalloc.h
+++ b/arch/loongarch/include/asm/pgalloc.h
@@ -55,11 +55,8 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
        return pte;
 }
 
-#define __pte_free_tlb(tlb, pte, address)                      \
-do {                                                           \
-       pagetable_dtor(page_ptdesc(pte));                       \
-       tlb_remove_page_ptdesc((tlb), page_ptdesc(pte));        \
-} while (0)
+#define __pte_free_tlb(tlb, pte, address)      \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 #ifndef __PAGETABLE_PMD_FOLDED
 

diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h
index 80afc3a187249f9b490819ee9ac55819b4f46005..1e21c758b774e75869537cb894c7023f4d494204 100644 (file)
--- a/arch/m68k/include/asm/sun3_pgalloc.h
+++ b/arch/m68k/include/asm/sun3_pgalloc.h
@@ -17,11 +17,8 @@
 
 extern const char bad_pmd_string[];
 
-#define __pte_free_tlb(tlb, pte, addr)                         \
-do {                                                           \
-       pagetable_dtor(page_ptdesc(pte));                       \
-       tlb_remove_page_ptdesc((tlb), page_ptdesc(pte));        \
-} while (0)
+#define __pte_free_tlb(tlb, pte, addr) \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)
 {

diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
index 26c7a6ede983c706b4ce2edfcafbc698b6d8b6f5..bbca420c96d3c096171976853a99d1e3b171b421 100644 (file)
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -48,11 +48,8 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
 extern void pgd_init(void *addr);
 extern pgd_t *pgd_alloc(struct mm_struct *mm);
 
-#define __pte_free_tlb(tlb, pte, address)                      \
-do {                                                           \
-       pagetable_dtor(page_ptdesc(pte));                       \
-       tlb_remove_page_ptdesc((tlb), page_ptdesc(pte));        \
-} while (0)
+#define __pte_free_tlb(tlb, pte, address)      \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 #ifndef __PAGETABLE_PMD_FOLDED
 

diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h
index 12a536b7bfbd41aa76295b276925ac221cbc8e06..db122b093a8bed73103be6fc738bd6105014e792 100644 (file)
--- a/arch/nios2/include/asm/pgalloc.h
+++ b/arch/nios2/include/asm/pgalloc.h
@@ -28,10 +28,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 
 extern pgd_t *pgd_alloc(struct mm_struct *mm);
 
-#define __pte_free_tlb(tlb, pte, addr)                                 \
-       do {                                                            \
-               pagetable_dtor(page_ptdesc(pte));                       \
-               tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte)));      \
-       } while (0)
+#define __pte_free_tlb(tlb, pte, addr) \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 #endif /* _ASM_NIOS2_PGALLOC_H */

diff --git a/arch/openrisc/include/asm/pgalloc.h b/arch/openrisc/include/asm/pgalloc.h
index 3372f4e6ab4b557e00365886eaf49264e79f230d..3f110931d8f6ef1406dfbc46931acba5b6e315f9 100644 (file)
--- a/arch/openrisc/include/asm/pgalloc.h
+++ b/arch/openrisc/include/asm/pgalloc.h
@@ -64,10 +64,7 @@ extern inline pgd_t *pgd_alloc(struct mm_struct *mm)
 
 extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm);
 
-#define __pte_free_tlb(tlb, pte, addr)                         \
-do {                                                           \
-       pagetable_dtor(page_ptdesc(pte));                       \
-       tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte)));      \
-} while (0)
+#define __pte_free_tlb(tlb, pte, addr) \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 #endif

diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
index 96d938fdf2244dcb8b650c8e3643ead48ee0efd5..6fe7123d38fa9e35b314cb1e6eacc8655eb24a81 100644 (file)
--- a/arch/sh/include/asm/pgalloc.h
+++ b/arch/sh/include/asm/pgalloc.h
@@ -32,10 +32,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
        set_pmd(pmd, __pmd((unsigned long)page_address(pte)));
 }
 
-#define __pte_free_tlb(tlb, pte, addr)                         \
-do {                                                           \
-       pagetable_dtor(page_ptdesc(pte));                       \
-       tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte)));      \
-} while (0)
+#define __pte_free_tlb(tlb, pte, addr) \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 #endif /* __ASM_SH_PGALLOC_H */

diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h
index f0af23c3aeb2b5e92e24bdc0a22c185765a8b2e2..826ec44b58cdb546c2901b699a7fbdf4cf4c53e8 100644 (file)
--- a/arch/um/include/asm/pgalloc.h
+++ b/arch/um/include/asm/pgalloc.h
@@ -25,27 +25,18 @@
  */
 extern pgd_t *pgd_alloc(struct mm_struct *);
 
-#define __pte_free_tlb(tlb, pte, address)                      \
-do {                                                           \
-       pagetable_dtor(page_ptdesc(pte));                       \
-       tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte)));      \
-} while (0)
+#define __pte_free_tlb(tlb, pte, address)      \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte))
 
 #if CONFIG_PGTABLE_LEVELS > 2
 
-#define __pmd_free_tlb(tlb, pmd, address)                      \
-do {                                                           \
-       pagetable_dtor(virt_to_ptdesc(pmd));                    \
-       tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pmd));     \
-} while (0)
+#define __pmd_free_tlb(tlb, pmd, address)      \
+       tlb_remove_ptdesc((tlb), virt_to_ptdesc(pmd))
 
 #if CONFIG_PGTABLE_LEVELS > 3
 
-#define __pud_free_tlb(tlb, pud, address)                      \
-do {                                                           \
-       pagetable_dtor(virt_to_ptdesc(pud));            \
-       tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pud));     \
-} while (0)
+#define __pud_free_tlb(tlb, pud, address)      \
+       tlb_remove_ptdesc((tlb), virt_to_ptdesc(pud))
 
 #endif
 #endif