powerpc: add support for TIF_NOTIFY_SIGNAL

[linux-2.6-microblaze.git] / mm / debug_vm_pgtable.c

diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c
index cbf6e00..c05d9dc 100644 (file)
--- a/mm/debug_vm_pgtable.c
+++ b/mm/debug_vm_pgtable.c
@@ -196,6 +196,8 @@ static void __init pmd_advanced_tests(struct mm_struct *mm,
        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);
 }
 
@@ -317,6 +319,8 @@ static void __init pud_advanced_tests(struct mm_struct *mm,
        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)
@@ -440,8 +444,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));
@@ -538,12 +540,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);
@@ -573,7 +578,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));
@@ -807,57 +811,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
@@ -988,7 +943,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(mm, pmdp, vaddr);
+       /*
+        * 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
@@ -1042,9 +1003,8 @@ static int __init debug_vm_pgtable(void)
         * proper page table lock.
         */
 
-       ptl = pte_lockptr(mm, pmdp);
-       spin_lock(ptl);
-       pte_clear_tests(mm, ptep, vaddr);
+       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);
 
@@ -1062,8 +1022,6 @@ static int __init debug_vm_pgtable(void)
        pud_populate_tests(mm, pudp, saved_pmdp);
        spin_unlock(ptl);
 
-       hugetlb_advanced_tests(mm, vma, ptep, pte_aligned, vaddr, prot);
-
        spin_lock(&mm->page_table_lock);
        p4d_clear_tests(mm, p4dp);
        pgd_clear_tests(mm, pgdp);