[PATCH v4 08/13] mm/debug_vm_pgtable/locks: Move non page table modifying test together

[Aneesh Kumar K.V]

This will help in adding proper locks in a later patch

Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
---
 mm/debug_vm_pgtable.c | 51 ++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c
index de333871f407..f59cf6a9b05e 100644
--- a/mm/debug_vm_pgtable.c
+++ b/mm/debug_vm_pgtable.c
@@ -986,7 +986,7 @@ 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);
+       ptep = pte_alloc_map(mm, pmdp, vaddr);
 
        /*
         * Save all the page table page addresses as the page table
@@ -1006,33 +1006,12 @@ static int __init debug_vm_pgtable(void)
        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, protnone);
        pmd_savedwrite_tests(pmd_aligned, protnone);
 
-       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_special_tests(pte_aligned, prot);
        pte_protnone_tests(pte_aligned, protnone);
        pmd_protnone_tests(pmd_aligned, protnone);
@@ -1050,11 +1029,37 @@ 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);
+
+       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);
+
+       ptl = pte_lockptr(mm, pmdp);
+       spin_lock(ptl);
+
+       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_huge_tests(pmdp, pmd_aligned, prot);
+       pud_huge_tests(pudp, pud_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);
+
        p4d_free(mm, saved_p4dp);
        pud_free(mm, saved_pudp);
        pmd_free(mm, saved_pmdp);
-- 
2.26.2