vfio/mdev: Simplify driver registration
[linux-2.6-microblaze.git] / mm / debug_vm_pgtable.c
index 086309f..a9bd6ce 100644 (file)
@@ -28,6 +28,7 @@
 #include <linux/swapops.h>
 #include <linux/start_kernel.h>
 #include <linux/sched/mm.h>
+#include <linux/io.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
  * entry type. But these bits might affect the ability to clear entries with
  * pxx_clear() because of how dynamic page table folding works on s390. So
  * while loading up the entries do not change the lower 4 bits. It does not
- * have affect any other platform.
+ * have affect any other platform. Also avoid the 62nd bit on ppc64 that is
+ * used to mark a pte entry.
  */
-#define S390_MASK_BITS 4
-#define RANDOM_ORVALUE GENMASK(BITS_PER_LONG - 1, S390_MASK_BITS)
+#define S390_SKIP_MASK         GENMASK(3, 0)
+#if __BITS_PER_LONG == 64
+#define PPC64_SKIP_MASK                GENMASK(62, 62)
+#else
+#define PPC64_SKIP_MASK                0x0
+#endif
+#define ARCH_SKIP_MASK (S390_SKIP_MASK | PPC64_SKIP_MASK)
+#define RANDOM_ORVALUE (GENMASK(BITS_PER_LONG - 1, 0) & ~ARCH_SKIP_MASK)
 #define RANDOM_NZVALUE GENMASK(7, 0)
 
-static void __init pte_basic_tests(unsigned long pfn, pgprot_t prot)
+static void __init pte_basic_tests(unsigned long pfn, int idx)
 {
+       pgprot_t prot = protection_map[idx];
        pte_t pte = pfn_pte(pfn, prot);
+       unsigned long val = idx, *ptr = &val;
+
+       pr_debug("Validating PTE basic (%pGv)\n", ptr);
+
+       /*
+        * This test needs to be executed after the given page table entry
+        * is created with pfn_pte() to make sure that protection_map[idx]
+        * does not have the dirty bit enabled from the beginning. This is
+        * important for platforms like arm64 where (!PTE_RDONLY) indicate
+        * dirty bit being set.
+        */
+       WARN_ON(pte_dirty(pte_wrprotect(pte)));
 
-       pr_debug("Validating PTE basic\n");
        WARN_ON(!pte_same(pte, pte));
        WARN_ON(!pte_young(pte_mkyoung(pte_mkold(pte))));
        WARN_ON(!pte_dirty(pte_mkdirty(pte_mkclean(pte))));
@@ -62,6 +82,8 @@ static void __init pte_basic_tests(unsigned long pfn, pgprot_t prot)
        WARN_ON(pte_young(pte_mkold(pte_mkyoung(pte))));
        WARN_ON(pte_dirty(pte_mkclean(pte_mkdirty(pte))));
        WARN_ON(pte_write(pte_wrprotect(pte_mkwrite(pte))));
+       WARN_ON(pte_dirty(pte_wrprotect(pte_mkclean(pte))));
+       WARN_ON(!pte_dirty(pte_wrprotect(pte_mkdirty(pte))));
 }
 
 static void __init pte_advanced_tests(struct mm_struct *mm,
@@ -71,15 +93,18 @@ static void __init pte_advanced_tests(struct mm_struct *mm,
 {
        pte_t pte = pfn_pte(pfn, prot);
 
+       /*
+        * Architectures optimize set_pte_at by avoiding TLB flush.
+        * This requires set_pte_at to be not used to update an
+        * existing pte entry. Clear pte before we do set_pte_at
+        */
+
        pr_debug("Validating PTE advanced\n");
        pte = pfn_pte(pfn, prot);
        set_pte_at(mm, vaddr, ptep, pte);
        ptep_set_wrprotect(mm, vaddr, ptep);
        pte = ptep_get(ptep);
        WARN_ON(pte_write(pte));
-
-       pte = pfn_pte(pfn, prot);
-       set_pte_at(mm, vaddr, ptep, pte);
        ptep_get_and_clear(mm, vaddr, ptep);
        pte = ptep_get(ptep);
        WARN_ON(!pte_none(pte));
@@ -93,13 +118,11 @@ static void __init pte_advanced_tests(struct mm_struct *mm,
        ptep_set_access_flags(vma, vaddr, ptep, pte, 1);
        pte = ptep_get(ptep);
        WARN_ON(!(pte_write(pte) && pte_dirty(pte)));
-
-       pte = pfn_pte(pfn, prot);
-       set_pte_at(mm, vaddr, ptep, pte);
        ptep_get_and_clear_full(mm, vaddr, ptep, 1);
        pte = ptep_get(ptep);
        WARN_ON(!pte_none(pte));
 
+       pte = pfn_pte(pfn, prot);
        pte = pte_mkyoung(pte);
        set_pte_at(mm, vaddr, ptep, pte);
        ptep_test_and_clear_young(vma, vaddr, ptep);
@@ -111,19 +134,36 @@ static void __init pte_savedwrite_tests(unsigned long pfn, pgprot_t prot)
 {
        pte_t pte = pfn_pte(pfn, prot);
 
+       if (!IS_ENABLED(CONFIG_NUMA_BALANCING))
+               return;
+
        pr_debug("Validating PTE saved write\n");
        WARN_ON(!pte_savedwrite(pte_mk_savedwrite(pte_clear_savedwrite(pte))));
        WARN_ON(pte_savedwrite(pte_clear_savedwrite(pte_mk_savedwrite(pte))));
 }
+
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-static void __init pmd_basic_tests(unsigned long pfn, pgprot_t prot)
+static void __init pmd_basic_tests(unsigned long pfn, int idx)
 {
+       pgprot_t prot = protection_map[idx];
        pmd_t pmd = pfn_pmd(pfn, prot);
+       unsigned long val = idx, *ptr = &val;
 
        if (!has_transparent_hugepage())
                return;
 
-       pr_debug("Validating PMD basic\n");
+       pr_debug("Validating PMD basic (%pGv)\n", ptr);
+
+       /*
+        * This test needs to be executed after the given page table entry
+        * is created with pfn_pmd() to make sure that protection_map[idx]
+        * does not have the dirty bit enabled from the beginning. This is
+        * important for platforms like arm64 where (!PTE_RDONLY) indicate
+        * dirty bit being set.
+        */
+       WARN_ON(pmd_dirty(pmd_wrprotect(pmd)));
+
+
        WARN_ON(!pmd_same(pmd, pmd));
        WARN_ON(!pmd_young(pmd_mkyoung(pmd_mkold(pmd))));
        WARN_ON(!pmd_dirty(pmd_mkdirty(pmd_mkclean(pmd))));
@@ -131,6 +171,8 @@ static void __init pmd_basic_tests(unsigned long pfn, pgprot_t prot)
        WARN_ON(pmd_young(pmd_mkold(pmd_mkyoung(pmd))));
        WARN_ON(pmd_dirty(pmd_mkclean(pmd_mkdirty(pmd))));
        WARN_ON(pmd_write(pmd_wrprotect(pmd_mkwrite(pmd))));
+       WARN_ON(pmd_dirty(pmd_wrprotect(pmd_mkclean(pmd))));
+       WARN_ON(!pmd_dirty(pmd_wrprotect(pmd_mkdirty(pmd))));
        /*
         * A huge page does not point to next level page table
         * entry. Hence this must qualify as pmd_bad().
@@ -141,7 +183,7 @@ static void __init pmd_basic_tests(unsigned long pfn, pgprot_t prot)
 static void __init pmd_advanced_tests(struct mm_struct *mm,
                                      struct vm_area_struct *vma, pmd_t *pmdp,
                                      unsigned long pfn, unsigned long vaddr,
-                                     pgprot_t prot)
+                                     pgprot_t prot, pgtable_t pgtable)
 {
        pmd_t pmd = pfn_pmd(pfn, prot);
 
@@ -152,14 +194,13 @@ static void __init pmd_advanced_tests(struct mm_struct *mm,
        /* Align the address wrt HPAGE_PMD_SIZE */
        vaddr = (vaddr & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE;
 
+       pgtable_trans_huge_deposit(mm, pmdp, pgtable);
+
        pmd = pfn_pmd(pfn, prot);
        set_pmd_at(mm, vaddr, pmdp, pmd);
        pmdp_set_wrprotect(mm, vaddr, pmdp);
        pmd = READ_ONCE(*pmdp);
        WARN_ON(pmd_write(pmd));
-
-       pmd = pfn_pmd(pfn, prot);
-       set_pmd_at(mm, vaddr, pmdp, pmd);
        pmdp_huge_get_and_clear(mm, vaddr, pmdp);
        pmd = READ_ONCE(*pmdp);
        WARN_ON(!pmd_none(pmd));
@@ -173,18 +214,20 @@ static void __init pmd_advanced_tests(struct mm_struct *mm,
        pmdp_set_access_flags(vma, vaddr, pmdp, pmd, 1);
        pmd = READ_ONCE(*pmdp);
        WARN_ON(!(pmd_write(pmd) && pmd_dirty(pmd)));
-
-       pmd = pmd_mkhuge(pfn_pmd(pfn, prot));
-       set_pmd_at(mm, vaddr, pmdp, pmd);
        pmdp_huge_get_and_clear_full(vma, vaddr, pmdp, 1);
        pmd = READ_ONCE(*pmdp);
        WARN_ON(!pmd_none(pmd));
 
+       pmd = pmd_mkhuge(pfn_pmd(pfn, prot));
        pmd = pmd_mkyoung(pmd);
        set_pmd_at(mm, vaddr, pmdp, pmd);
        pmdp_test_and_clear_young(vma, vaddr, pmdp);
        pmd = READ_ONCE(*pmdp);
        WARN_ON(pmd_young(pmd));
+
+       /*  Clear the pte entries  */
+       pmdp_huge_get_and_clear(mm, vaddr, pmdp);
+       pgtable = pgtable_trans_huge_withdraw(mm, pmdp);
 }
 
 static void __init pmd_leaf_tests(unsigned long pfn, pgprot_t prot)
@@ -199,11 +242,12 @@ static void __init pmd_leaf_tests(unsigned long pfn, pgprot_t prot)
        WARN_ON(!pmd_leaf(pmd));
 }
 
+#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
 static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot)
 {
        pmd_t pmd;
 
-       if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP))
+       if (!arch_ioremap_pmd_supported())
                return;
 
        pr_debug("Validating PMD huge\n");
@@ -217,30 +261,52 @@ static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot)
        pmd = READ_ONCE(*pmdp);
        WARN_ON(!pmd_none(pmd));
 }
+#else /* CONFIG_HAVE_ARCH_HUGE_VMAP */
+static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot) { }
+#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */
 
 static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot)
 {
        pmd_t pmd = pfn_pmd(pfn, prot);
 
+       if (!IS_ENABLED(CONFIG_NUMA_BALANCING))
+               return;
+
        pr_debug("Validating PMD saved write\n");
        WARN_ON(!pmd_savedwrite(pmd_mk_savedwrite(pmd_clear_savedwrite(pmd))));
        WARN_ON(pmd_savedwrite(pmd_clear_savedwrite(pmd_mk_savedwrite(pmd))));
 }
 
 #ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD
-static void __init pud_basic_tests(unsigned long pfn, pgprot_t prot)
+static void __init pud_basic_tests(struct mm_struct *mm, unsigned long pfn, int idx)
 {
+       pgprot_t prot = protection_map[idx];
        pud_t pud = pfn_pud(pfn, prot);
+       unsigned long val = idx, *ptr = &val;
 
        if (!has_transparent_hugepage())
                return;
 
-       pr_debug("Validating PUD basic\n");
+       pr_debug("Validating PUD basic (%pGv)\n", ptr);
+
+       /*
+        * This test needs to be executed after the given page table entry
+        * is created with pfn_pud() to make sure that protection_map[idx]
+        * does not have the dirty bit enabled from the beginning. This is
+        * important for platforms like arm64 where (!PTE_RDONLY) indicate
+        * dirty bit being set.
+        */
+       WARN_ON(pud_dirty(pud_wrprotect(pud)));
+
        WARN_ON(!pud_same(pud, pud));
        WARN_ON(!pud_young(pud_mkyoung(pud_mkold(pud))));
+       WARN_ON(!pud_dirty(pud_mkdirty(pud_mkclean(pud))));
+       WARN_ON(pud_dirty(pud_mkclean(pud_mkdirty(pud))));
        WARN_ON(!pud_write(pud_mkwrite(pud_wrprotect(pud))));
        WARN_ON(pud_write(pud_wrprotect(pud_mkwrite(pud))));
        WARN_ON(pud_young(pud_mkold(pud_mkyoung(pud))));
+       WARN_ON(pud_dirty(pud_wrprotect(pud_mkclean(pud))));
+       WARN_ON(!pud_dirty(pud_wrprotect(pud_mkdirty(pud))));
 
        if (mm_pmd_folded(mm))
                return;
@@ -272,17 +338,9 @@ static void __init pud_advanced_tests(struct mm_struct *mm,
        WARN_ON(pud_write(pud));
 
 #ifndef __PAGETABLE_PMD_FOLDED
-       pud = pfn_pud(pfn, prot);
-       set_pud_at(mm, vaddr, pudp, pud);
        pudp_huge_get_and_clear(mm, vaddr, pudp);
        pud = READ_ONCE(*pudp);
        WARN_ON(!pud_none(pud));
-
-       pud = pfn_pud(pfn, prot);
-       set_pud_at(mm, vaddr, pudp, pud);
-       pudp_huge_get_and_clear_full(mm, vaddr, pudp, 1);
-       pud = READ_ONCE(*pudp);
-       WARN_ON(!pud_none(pud));
 #endif /* __PAGETABLE_PMD_FOLDED */
        pud = pfn_pud(pfn, prot);
        pud = pud_wrprotect(pud);
@@ -294,11 +352,20 @@ static void __init pud_advanced_tests(struct mm_struct *mm,
        pud = READ_ONCE(*pudp);
        WARN_ON(!(pud_write(pud) && pud_dirty(pud)));
 
+#ifndef __PAGETABLE_PMD_FOLDED
+       pudp_huge_get_and_clear_full(mm, vaddr, pudp, 1);
+       pud = READ_ONCE(*pudp);
+       WARN_ON(!pud_none(pud));
+#endif /* __PAGETABLE_PMD_FOLDED */
+
+       pud = pfn_pud(pfn, prot);
        pud = pud_mkyoung(pud);
        set_pud_at(mm, vaddr, pudp, pud);
        pudp_test_and_clear_young(vma, vaddr, pudp);
        pud = READ_ONCE(*pudp);
        WARN_ON(pud_young(pud));
+
+       pudp_huge_get_and_clear(mm, vaddr, pudp);
 }
 
 static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot)
@@ -313,11 +380,12 @@ static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot)
        WARN_ON(!pud_leaf(pud));
 }
 
+#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
 static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot)
 {
        pud_t pud;
 
-       if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP))
+       if (!arch_ioremap_pud_supported())
                return;
 
        pr_debug("Validating PUD huge\n");
@@ -331,8 +399,12 @@ static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot)
        pud = READ_ONCE(*pudp);
        WARN_ON(!pud_none(pud));
 }
+#else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */
+static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot) { }
+#endif /* !CONFIG_HAVE_ARCH_HUGE_VMAP */
+
 #else  /* !CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
-static void __init pud_basic_tests(unsigned long pfn, pgprot_t prot) { }
+static void __init pud_basic_tests(struct mm_struct *mm, unsigned long pfn, int idx) { }
 static void __init pud_advanced_tests(struct mm_struct *mm,
                                      struct vm_area_struct *vma, pud_t *pudp,
                                      unsigned long pfn, unsigned long vaddr,
@@ -345,12 +417,12 @@ static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot)
 }
 #endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
 #else  /* !CONFIG_TRANSPARENT_HUGEPAGE */
-static void __init pmd_basic_tests(unsigned long pfn, pgprot_t prot) { }
-static void __init pud_basic_tests(unsigned long pfn, pgprot_t prot) { }
+static void __init pmd_basic_tests(unsigned long pfn, int idx) { }
+static void __init pud_basic_tests(struct mm_struct *mm, unsigned long pfn, int idx) { }
 static void __init pmd_advanced_tests(struct mm_struct *mm,
                                      struct vm_area_struct *vma, pmd_t *pmdp,
                                      unsigned long pfn, unsigned long vaddr,
-                                     pgprot_t prot)
+                                     pgprot_t prot, pgtable_t pgtable)
 {
 }
 static void __init pud_advanced_tests(struct mm_struct *mm,
@@ -417,8 +489,6 @@ static void __init pud_populate_tests(struct mm_struct *mm, pud_t *pudp,
         * This entry points to next level page table page.
         * Hence this must not qualify as pud_bad().
         */
-       pmd_clear(pmdp);
-       pud_clear(pudp);
        pud_populate(mm, pudp, pmdp);
        pud = READ_ONCE(*pudp);
        WARN_ON(pud_bad(pud));
@@ -515,12 +585,15 @@ static void __init pgd_populate_tests(struct mm_struct *mm, pgd_t *pgdp,
 #endif /* PAGETABLE_P4D_FOLDED */
 
 static void __init pte_clear_tests(struct mm_struct *mm, pte_t *ptep,
-                                  unsigned long vaddr)
+                                  unsigned long pfn, unsigned long vaddr,
+                                  pgprot_t prot)
 {
-       pte_t pte = ptep_get(ptep);
+       pte_t pte = pfn_pte(pfn, prot);
 
        pr_debug("Validating PTE clear\n");
+#ifndef CONFIG_RISCV
        pte = __pte(pte_val(pte) | RANDOM_ORVALUE);
+#endif
        set_pte_at(mm, vaddr, ptep, pte);
        barrier();
        pte_clear(mm, vaddr, ptep);
@@ -550,7 +623,6 @@ static void __init pmd_populate_tests(struct mm_struct *mm, pmd_t *pmdp,
         * This entry points to next level page table page.
         * Hence this must not qualify as pmd_bad().
         */
-       pmd_clear(pmdp);
        pmd_populate(mm, pmdp, pgtable);
        pmd = READ_ONCE(*pmdp);
        WARN_ON(pmd_bad(pmd));
@@ -784,57 +856,8 @@ static void __init hugetlb_basic_tests(unsigned long pfn, pgprot_t prot)
        WARN_ON(!pte_huge(pte_mkhuge(pte)));
 #endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */
 }
-
-static void __init hugetlb_advanced_tests(struct mm_struct *mm,
-                                         struct vm_area_struct *vma,
-                                         pte_t *ptep, unsigned long pfn,
-                                         unsigned long vaddr, pgprot_t prot)
-{
-       struct page *page = pfn_to_page(pfn);
-       pte_t pte = ptep_get(ptep);
-       unsigned long paddr = __pfn_to_phys(pfn) & PMD_MASK;
-
-       pr_debug("Validating HugeTLB advanced\n");
-       pte = pte_mkhuge(mk_pte(pfn_to_page(PHYS_PFN(paddr)), prot));
-       set_huge_pte_at(mm, vaddr, ptep, pte);
-       barrier();
-       WARN_ON(!pte_same(pte, huge_ptep_get(ptep)));
-       huge_pte_clear(mm, vaddr, ptep, PMD_SIZE);
-       pte = huge_ptep_get(ptep);
-       WARN_ON(!huge_pte_none(pte));
-
-       pte = mk_huge_pte(page, prot);
-       set_huge_pte_at(mm, vaddr, ptep, pte);
-       barrier();
-       huge_ptep_set_wrprotect(mm, vaddr, ptep);
-       pte = huge_ptep_get(ptep);
-       WARN_ON(huge_pte_write(pte));
-
-       pte = mk_huge_pte(page, prot);
-       set_huge_pte_at(mm, vaddr, ptep, pte);
-       barrier();
-       huge_ptep_get_and_clear(mm, vaddr, ptep);
-       pte = huge_ptep_get(ptep);
-       WARN_ON(!huge_pte_none(pte));
-
-       pte = mk_huge_pte(page, prot);
-       pte = huge_pte_wrprotect(pte);
-       set_huge_pte_at(mm, vaddr, ptep, pte);
-       barrier();
-       pte = huge_pte_mkwrite(pte);
-       pte = huge_pte_mkdirty(pte);
-       huge_ptep_set_access_flags(vma, vaddr, ptep, pte, 1);
-       pte = huge_ptep_get(ptep);
-       WARN_ON(!(huge_pte_write(pte) && huge_pte_dirty(pte)));
-}
 #else  /* !CONFIG_HUGETLB_PAGE */
 static void __init hugetlb_basic_tests(unsigned long pfn, pgprot_t prot) { }
-static void __init hugetlb_advanced_tests(struct mm_struct *mm,
-                                         struct vm_area_struct *vma,
-                                         pte_t *ptep, unsigned long pfn,
-                                         unsigned long vaddr, pgprot_t prot)
-{
-}
 #endif /* CONFIG_HUGETLB_PAGE */
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -921,6 +944,7 @@ static int __init debug_vm_pgtable(void)
        unsigned long vaddr, pte_aligned, pmd_aligned;
        unsigned long pud_aligned, p4d_aligned, pgd_aligned;
        spinlock_t *ptl = NULL;
+       int idx;
 
        pr_info("Validating architecture page table helpers\n");
        prot = vm_get_page_prot(VMFLAGS);
@@ -965,7 +989,13 @@ static int __init debug_vm_pgtable(void)
        p4dp = p4d_alloc(mm, pgdp, vaddr);
        pudp = pud_alloc(mm, p4dp, vaddr);
        pmdp = pmd_alloc(mm, pudp, vaddr);
-       ptep = pte_alloc_map_lock(mm, pmdp, vaddr, &ptl);
+       /*
+        * Allocate pgtable_t
+        */
+       if (pte_alloc(mm, pmdp)) {
+               pr_err("pgtable allocation failed\n");
+               return 1;
+       }
 
        /*
         * Save all the page table page addresses as the page table
@@ -979,38 +1009,33 @@ static int __init debug_vm_pgtable(void)
        saved_pmdp = pmd_offset(pudp, 0UL);
        saved_ptep = pmd_pgtable(pmd);
 
-       pte_basic_tests(pte_aligned, prot);
-       pmd_basic_tests(pmd_aligned, prot);
-       pud_basic_tests(pud_aligned, prot);
+       /*
+        * Iterate over the protection_map[] to make sure that all
+        * the basic page table transformation validations just hold
+        * true irrespective of the starting protection value for a
+        * given page table entry.
+        */
+       for (idx = 0; idx < ARRAY_SIZE(protection_map); idx++) {
+               pte_basic_tests(pte_aligned, idx);
+               pmd_basic_tests(pmd_aligned, idx);
+               pud_basic_tests(mm, pud_aligned, idx);
+       }
+
+       /*
+        * Both P4D and PGD level tests are very basic which do not
+        * involve creating page table entries from the protection
+        * value and the given pfn. Hence just keep them out from
+        * the above iteration for now to save some test execution
+        * time.
+        */
        p4d_basic_tests(p4d_aligned, prot);
        pgd_basic_tests(pgd_aligned, prot);
 
-       pte_clear_tests(mm, ptep, vaddr);
-       pmd_clear_tests(mm, pmdp);
-       pud_clear_tests(mm, pudp);
-       p4d_clear_tests(mm, p4dp);
-       pgd_clear_tests(mm, pgdp);
-
-       pte_advanced_tests(mm, vma, ptep, pte_aligned, vaddr, prot);
-       pmd_advanced_tests(mm, vma, pmdp, pmd_aligned, vaddr, prot);
-       pud_advanced_tests(mm, vma, pudp, pud_aligned, vaddr, prot);
-       hugetlb_advanced_tests(mm, vma, ptep, pte_aligned, vaddr, prot);
-
        pmd_leaf_tests(pmd_aligned, prot);
        pud_leaf_tests(pud_aligned, prot);
 
-       pmd_huge_tests(pmdp, pmd_aligned, prot);
-       pud_huge_tests(pudp, pud_aligned, prot);
-
-       pte_savedwrite_tests(pte_aligned, prot);
-       pmd_savedwrite_tests(pmd_aligned, prot);
-
-       pte_unmap_unlock(ptep, ptl);
-
-       pmd_populate_tests(mm, pmdp, saved_ptep);
-       pud_populate_tests(mm, pudp, saved_pmdp);
-       p4d_populate_tests(mm, p4dp, saved_pudp);
-       pgd_populate_tests(mm, pgdp, saved_p4dp);
+       pte_savedwrite_tests(pte_aligned, protnone);
+       pmd_savedwrite_tests(pmd_aligned, protnone);
 
        pte_special_tests(pte_aligned, prot);
        pte_protnone_tests(pte_aligned, protnone);
@@ -1029,11 +1054,43 @@ static int __init debug_vm_pgtable(void)
        pmd_swap_tests(pmd_aligned, prot);
 
        swap_migration_tests();
-       hugetlb_basic_tests(pte_aligned, prot);
 
        pmd_thp_tests(pmd_aligned, prot);
        pud_thp_tests(pud_aligned, prot);
 
+       hugetlb_basic_tests(pte_aligned, prot);
+
+       /*
+        * Page table modifying tests. They need to hold
+        * proper page table lock.
+        */
+
+       ptep = pte_offset_map_lock(mm, pmdp, vaddr, &ptl);
+       pte_clear_tests(mm, ptep, pte_aligned, vaddr, prot);
+       pte_advanced_tests(mm, vma, ptep, pte_aligned, vaddr, prot);
+       pte_unmap_unlock(ptep, ptl);
+
+       ptl = pmd_lock(mm, pmdp);
+       pmd_clear_tests(mm, pmdp);
+       pmd_advanced_tests(mm, vma, pmdp, pmd_aligned, vaddr, prot, saved_ptep);
+       pmd_huge_tests(pmdp, pmd_aligned, prot);
+       pmd_populate_tests(mm, pmdp, saved_ptep);
+       spin_unlock(ptl);
+
+       ptl = pud_lock(mm, pudp);
+       pud_clear_tests(mm, pudp);
+       pud_advanced_tests(mm, vma, pudp, pud_aligned, vaddr, prot);
+       pud_huge_tests(pudp, pud_aligned, prot);
+       pud_populate_tests(mm, pudp, saved_pmdp);
+       spin_unlock(ptl);
+
+       spin_lock(&mm->page_table_lock);
+       p4d_clear_tests(mm, p4dp);
+       pgd_clear_tests(mm, pgdp);
+       p4d_populate_tests(mm, p4dp, saved_pudp);
+       pgd_populate_tests(mm, pgdp, saved_p4dp);
+       spin_unlock(&mm->page_table_lock);
+
        p4d_free(mm, saved_p4dp);
        pud_free(mm, saved_pudp);
        pmd_free(mm, saved_pmdp);