mm: convert page_table_check_pte_set() to page_table_check_ptes_set()

Tell the page table check how many PTEs & PFNs we want it to check.

Link: https://lkml.kernel.org/r/20230802151406.3735276-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Acked-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
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 fe4b913589eed4e23e2c9f65f5c6bf2fdf273f54..445b18d7a47c465ca1f496c2c33522cf2ae9cb55 100644 (file)
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -348,7 +348,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,
 static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
                              pte_t *ptep, pte_t pte)
 {
-       page_table_check_pte_set(mm, ptep, pte);
+       page_table_check_ptes_set(mm, ptep, pte, 1);
        return __set_pte_at(mm, addr, ptep, pte);
 }
 

diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 44377f0d7c35e70d4688266d3f80b46c19798e0b..01e4aabc88984e6fae395b60f96e0c37abd226ab 100644 (file)
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -499,7 +499,7 @@ static inline void __set_pte_at(struct mm_struct *mm,
 static inline void set_pte_at(struct mm_struct *mm,
        unsigned long addr, pte_t *ptep, pte_t pteval)
 {
-       page_table_check_pte_set(mm, ptep, pteval);
+       page_table_check_ptes_set(mm, ptep, pteval, 1);
        __set_pte_at(mm, addr, ptep, pteval);
 }
 

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index ada1bbf129612986eaf13a3fbf8af8e162347e16..cd0b6337d03cea8730eee8e90b2f6c7cd20d1289 100644 (file)
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -1023,7 +1023,7 @@ static inline pud_t native_local_pudp_get_and_clear(pud_t *pudp)
 static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
                              pte_t *ptep, pte_t pte)
 {
-       page_table_check_pte_set(mm, ptep, pte);
+       page_table_check_ptes_set(mm, ptep, pte, 1);
        set_pte(ptep, pte);
 }
 

diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h
index 7f6b9bf926c5d879b50f7b4eba6df10e5c712fee..6722941c7cb8a6b3d5a4549d972f767db820f18d 100644 (file)
--- a/include/linux/page_table_check.h
+++ b/include/linux/page_table_check.h
@@ -17,7 +17,8 @@ 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_pmd_clear(struct mm_struct *mm, pmd_t pmd);
 void __page_table_check_pud_clear(struct mm_struct *mm, pud_t pud);
-void __page_table_check_pte_set(struct mm_struct *mm, pte_t *ptep, pte_t pte);
+void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte,
+               unsigned int nr);
 void __page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd);
 void __page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, pud_t pud);
 void __page_table_check_pte_clear_range(struct mm_struct *mm,
@@ -64,13 +65,13 @@ static inline void page_table_check_pud_clear(struct mm_struct *mm, pud_t pud)
        __page_table_check_pud_clear(mm, pud);
 }
 
-static inline void page_table_check_pte_set(struct mm_struct *mm, pte_t *ptep,
-                                           pte_t pte)
+static inline void page_table_check_ptes_set(struct mm_struct *mm,
+               pte_t *ptep, pte_t pte, unsigned int nr)
 {
        if (static_branch_likely(&page_table_check_disabled))
                return;
 
-       __page_table_check_pte_set(mm, ptep, pte);
+       __page_table_check_ptes_set(mm, ptep, pte, nr);
 }
 
 static inline void page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp,
@@ -123,8 +124,8 @@ static inline void page_table_check_pud_clear(struct mm_struct *mm, pud_t pud)
 {
 }
 
-static inline void page_table_check_pte_set(struct mm_struct *mm, pte_t *ptep,
-                                           pte_t pte)
+static inline void page_table_check_ptes_set(struct mm_struct *mm,
+               pte_t *ptep, pte_t pte, unsigned int nr)
 {
 }
 

diff --git a/mm/page_table_check.c b/mm/page_table_check.c
index 46e77c12c81ecf32488f5c8171bebb200c37726e..af69c3c8f7c2d52d3b1e6bd82c72054ec147acf5 100644 (file)
--- a/mm/page_table_check.c
+++ b/mm/page_table_check.c
@@ -182,18 +182,20 @@ void __page_table_check_pud_clear(struct mm_struct *mm, pud_t pud)
 }
 EXPORT_SYMBOL(__page_table_check_pud_clear);
 
-void __page_table_check_pte_set(struct mm_struct *mm, pte_t *ptep, pte_t pte)
+void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte,
+               unsigned int nr)
 {
+       unsigned int i;
+
        if (&init_mm == mm)
                return;
 
-       __page_table_check_pte_clear(mm, ptep_get(ptep));
-       if (pte_user_accessible_page(pte)) {
-               page_table_check_set(pte_pfn(pte), PAGE_SIZE >> PAGE_SHIFT,
-                                    pte_write(pte));
-       }
+       for (i = 0; i < nr; i++)
+               __page_table_check_pte_clear(mm, ptep_get(ptep + i));
+       if (pte_user_accessible_page(pte))
+               page_table_check_set(pte_pfn(pte), nr, pte_write(pte));
 }
-EXPORT_SYMBOL(__page_table_check_pte_set);
+EXPORT_SYMBOL(__page_table_check_ptes_set);
 
 void __page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd)
 {