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.

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..9d2b50265a8d82fb1fcd55142ea74d98600fded0 100644 (file)
--- a/arch/csky/include/asm/pgalloc.h
+++ b/arch/csky/include/asm/pgalloc.h
@@ -63,8 +63,7 @@ static inline 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));  \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte));     \
 } while (0)
 
 extern void pagetable_init(void);

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

diff --git a/arch/loongarch/include/asm/pgalloc.h b/arch/loongarch/include/asm/pgalloc.h
index 7211dff8c969e8cc2a60af451ddff95243c8b2c4..ac026146e7e9588f8152053616429d8a669f4744 100644 (file)
--- a/arch/loongarch/include/asm/pgalloc.h
+++ b/arch/loongarch/include/asm/pgalloc.h
@@ -57,8 +57,7 @@ static inline pte_t *pte_alloc_one_kernel(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));        \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte));             \
 } while (0)
 
 #ifndef __PAGETABLE_PMD_FOLDED

diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h
index 80afc3a187249f9b490819ee9ac55819b4f46005..ddc24812f18329ac109835f1be74c41155348e57 100644 (file)
--- a/arch/m68k/include/asm/sun3_pgalloc.h
+++ b/arch/m68k/include/asm/sun3_pgalloc.h
@@ -19,8 +19,7 @@ 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));        \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte));             \
 } while (0)
 
 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..7e73d2f913dd49a7223df57840a3eab8b1385b5b 100644 (file)
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -50,8 +50,7 @@ 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));        \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte));             \
 } while (0)
 
 #ifndef __PAGETABLE_PMD_FOLDED

diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h
index 12a536b7bfbd41aa76295b276925ac221cbc8e06..4b4a1766e2cc71c2de8b148d2974c996e563e105 100644 (file)
--- a/arch/nios2/include/asm/pgalloc.h
+++ b/arch/nios2/include/asm/pgalloc.h
@@ -28,10 +28,9 @@ 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)                         \
+do {                                                           \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte));             \
+} while (0)
 
 #endif /* _ASM_NIOS2_PGALLOC_H */

diff --git a/arch/openrisc/include/asm/pgalloc.h b/arch/openrisc/include/asm/pgalloc.h
index 3372f4e6ab4b557e00365886eaf49264e79f230d..2964e26980a188993d48ca8f9e9d5e2c65c59eb8 100644 (file)
--- a/arch/openrisc/include/asm/pgalloc.h
+++ b/arch/openrisc/include/asm/pgalloc.h
@@ -66,8 +66,7 @@ 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)));      \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte));             \
 } while (0)
 
 #endif

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

diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h
index f0af23c3aeb2b5e92e24bdc0a22c185765a8b2e2..a70151cfd11c9a98ad3d2fc292a2557e0e2d8509 100644 (file)
--- a/arch/um/include/asm/pgalloc.h
+++ b/arch/um/include/asm/pgalloc.h
@@ -27,24 +27,21 @@ 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)));      \
+       tlb_remove_ptdesc((tlb), page_ptdesc(pte));             \
 } while (0)
 
 #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));     \
+       tlb_remove_ptdesc((tlb), virt_to_ptdesc(pmd));          \
 } while (0)
 
 #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));     \
+       tlb_remove_ptdesc((tlb), virt_to_ptdesc(pud));          \
 } while (0)
 
 #endif