Merge tag 'mm-hotfixes-stable-2022-05-27' of git://git.kernel.org/pub/scm/linux/kerne...

[platform/kernel/linux-rpi.git] / mm / page_table_check.c

diff --git a/mm/page_table_check.c b/mm/page_table_check.c
index bc55be2..e206274 100644 (file)
--- a/mm/page_table_check.c
+++ b/mm/page_table_check.c
@@ -52,23 +52,6 @@ static struct page_table_check *get_page_table_check(struct page_ext *page_ext)
        return (void *)(page_ext) + page_table_check_ops.offset;
 }
 
-static inline bool pte_user_accessible_page(pte_t pte)
-{
-       return (pte_val(pte) & _PAGE_PRESENT) && (pte_val(pte) & _PAGE_USER);
-}
-
-static inline bool pmd_user_accessible_page(pmd_t pmd)
-{
-       return pmd_leaf(pmd) && (pmd_val(pmd) & _PAGE_PRESENT) &&
-               (pmd_val(pmd) & _PAGE_USER);
-}
-
-static inline bool pud_user_accessible_page(pud_t pud)
-{
-       return pud_leaf(pud) && (pud_val(pud) & _PAGE_PRESENT) &&
-               (pud_val(pud) & _PAGE_USER);
-}
-
 /*
  * An enty is removed from the page table, decrement the counters for that page
  * verify that it is of correct type and counters do not become negative.
@@ -177,7 +160,7 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr,
 
        if (pmd_user_accessible_page(pmd)) {
                page_table_check_clear(mm, addr, pmd_pfn(pmd),
-                                      PMD_PAGE_SIZE >> PAGE_SHIFT);
+                                      PMD_SIZE >> PAGE_SHIFT);
        }
 }
 EXPORT_SYMBOL(__page_table_check_pmd_clear);
@@ -190,7 +173,7 @@ void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
 
        if (pud_user_accessible_page(pud)) {
                page_table_check_clear(mm, addr, pud_pfn(pud),
-                                      PUD_PAGE_SIZE >> PAGE_SHIFT);
+                                      PUD_SIZE >> PAGE_SHIFT);
        }
 }
 EXPORT_SYMBOL(__page_table_check_pud_clear);
@@ -219,7 +202,7 @@ void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr,
        __page_table_check_pmd_clear(mm, addr, *pmdp);
        if (pmd_user_accessible_page(pmd)) {
                page_table_check_set(mm, addr, pmd_pfn(pmd),
-                                    PMD_PAGE_SIZE >> PAGE_SHIFT,
+                                    PMD_SIZE >> PAGE_SHIFT,
                                     pmd_write(pmd));
        }
 }
@@ -234,7 +217,7 @@ void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr,
        __page_table_check_pud_clear(mm, addr, *pudp);
        if (pud_user_accessible_page(pud)) {
                page_table_check_set(mm, addr, pud_pfn(pud),
-                                    PUD_PAGE_SIZE >> PAGE_SHIFT,
+                                    PUD_SIZE >> PAGE_SHIFT,
                                     pud_write(pud));
        }
 }