mm/page_table_check: reinstate address parameter in [__]page_table_check_pte_clear()

This reverts commit aa232204c468 ("mm/page_table_check: remove unused
parameter in [__]page_table_check_pte_clear").

Reinstate previously unused parameters for the purpose of supporting
powerpc platforms, as many do not encode user/kernel ownership of the page
in the pte, but instead in the address of the access.

[ajd@linux.ibm.com: rebase, fix additional occurrence and loop handling]
Link: https://lkml.kernel.org/r/20250813062614.51759-9-ajd@linux.ibm.com
Signed-off-by: Rohan McLure <rmclure@linux.ibm.com>
Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com>
Reviewed-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: Ingo Molnar <mingo@kernel.org>		[x86]
Acked-by: Alexandre Ghiti <alexghiti@rivosinc.com>	[riscv]
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Nicholas Miehlbradt <nicholas@linux.ibm.com>
Cc: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index dfcdf051b1145ef6f7aa18a790b2009f1dd20d0a..2203ebac81d9f938ed026b332846a58103e1e77e 100644 (file)
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -1367,7 +1367,7 @@ static inline pte_t __ptep_get_and_clear_anysz(struct mm_struct *mm,
 
        switch (pgsize) {
        case PAGE_SIZE:
-               page_table_check_pte_clear(mm, pte);
+               page_table_check_pte_clear(mm, address, pte);
                break;
        case PMD_SIZE:
                page_table_check_pmd_clear(mm, address, pte_pmd(pte));

diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 2ed56151c0f1452a9f24e225b369ecd0b3de67ea..31728fa3b8b3c4291425dbcfe2789f99d70ce016 100644 (file)
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -591,7 +591,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
 {
        pte_t pte = __pte(atomic_long_xchg((atomic_long_t *)ptep, 0));
 
-       page_table_check_pte_clear(mm, pte);
+       page_table_check_pte_clear(mm, address, pte);
 
        return pte;
 }

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index b68bea15f32df90cea6a3e740bdfa16a93f6a00d..63350b76c0c61cb6869e729e431eafac9e7d6d5e 100644 (file)
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -1251,7 +1251,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
                                       pte_t *ptep)
 {
        pte_t pte = native_ptep_get_and_clear(ptep);
-       page_table_check_pte_clear(mm, pte);
+       page_table_check_pte_clear(mm, addr, pte);
        return pte;
 }
 
@@ -1267,7 +1267,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
                 * care about updates and native needs no locking
                 */
                pte = native_local_ptep_get_and_clear(ptep);
-               page_table_check_pte_clear(mm, pte);
+               page_table_check_pte_clear(mm, addr, pte);
        } else {
                pte = ptep_get_and_clear(mm, addr, ptep);
        }

diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h
index 3973b69ae294e501a9c6c3140bc462d6d9b7d203..12268a32e8be151f66f2787ce87096f10d4fa744 100644 (file)
--- a/include/linux/page_table_check.h
+++ b/include/linux/page_table_check.h
@@ -14,7 +14,8 @@ extern struct static_key_true page_table_check_disabled;
 extern struct page_ext_operations page_table_check_ops;
 
 void __page_table_check_zero(struct page *page, unsigned int order);
-void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte);
+void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr,
+                                 pte_t pte);
 void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr,
                                  pmd_t pmd);
 void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
@@ -45,12 +46,13 @@ static inline void page_table_check_free(struct page *page, unsigned int order)
        __page_table_check_zero(page, order);
 }
 
-static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)
+static inline void page_table_check_pte_clear(struct mm_struct *mm,
+                                             unsigned long addr, pte_t pte)
 {
        if (static_branch_likely(&page_table_check_disabled))
                return;
 
-       __page_table_check_pte_clear(mm, pte);
+       __page_table_check_pte_clear(mm, addr, pte);
 }
 
 static inline void page_table_check_pmd_clear(struct mm_struct *mm,
@@ -119,7 +121,8 @@ static inline void page_table_check_free(struct page *page, unsigned int order)
 {
 }
 
-static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)
+static inline void page_table_check_pte_clear(struct mm_struct *mm,
+                                             unsigned long addr, pte_t pte)
 {
 }
 

diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index cfa1a100c30f0c342d59df3e99ea06e44936c560..080bf02678d4c23abb75a9752798a1e5fae316f0 100644 (file)
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h
@@ -494,7 +494,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
 {
        pte_t pte = ptep_get(ptep);
        pte_clear(mm, address, ptep);
-       page_table_check_pte_clear(mm, pte);
+       page_table_check_pte_clear(mm, address, pte);
        return pte;
 }
 #endif
@@ -553,7 +553,7 @@ static inline void ptep_clear(struct mm_struct *mm, unsigned long addr,
         * No need for ptep_get_and_clear(): page table check doesn't care about
         * any bits that could have been set by HW concurrently.
         */
-       page_table_check_pte_clear(mm, pte);
+       page_table_check_pte_clear(mm, addr, pte);
 }
 
 #ifdef CONFIG_GUP_GET_PXX_LOW_HIGH

diff --git a/mm/page_table_check.c b/mm/page_table_check.c
index e8c26b616aed227be92dc636b266f6ebd5e38933..1c33439b9c0b73fb0302a885beaf83fce90e3972 100644 (file)
--- a/mm/page_table_check.c
+++ b/mm/page_table_check.c
@@ -145,7 +145,8 @@ void __page_table_check_zero(struct page *page, unsigned int order)
        rcu_read_unlock();
 }
 
-void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)
+void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr,
+                                 pte_t pte)
 {
        if (&init_mm == mm)
                return;
@@ -206,7 +207,7 @@ void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr,
        page_table_check_pte_flags(pte);
 
        for (i = 0; i < nr; i++)
-               __page_table_check_pte_clear(mm, ptep_get(ptep + i));
+               __page_table_check_pte_clear(mm, addr + PAGE_SIZE * i, ptep_get(ptep + i));
        if (pte_user_accessible_page(pte))
                page_table_check_set(pte_pfn(pte), nr, pte_write(pte));
 }
@@ -268,7 +269,7 @@ void __page_table_check_pte_clear_range(struct mm_struct *mm,
                if (WARN_ON(!ptep))
                        return;
                for (i = 0; i < PTRS_PER_PTE; i++) {
-                       __page_table_check_pte_clear(mm, ptep_get(ptep));
+                       __page_table_check_pte_clear(mm, addr, ptep_get(ptep));
                        addr += PAGE_SIZE;
                        ptep++;
                }