| Message ID | 20200902114222.181353-13-aneesh.kumar@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm/debug_vm_pgtable fixes | expand |
On 09/02/2020 05:12 PM, Aneesh Kumar K.V wrote: > The seems to be missing quite a lot of details w.r.t allocating > the correct pgtable_t page (huge_pte_alloc()), holding the right > lock (huge_pte_lock()) etc. The vma used is also not a hugetlb VMA. > > ppc64 do have runtime checks within CONFIG_DEBUG_VM for most of these. > Hence disable the test on ppc64. > > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> > --- > mm/debug_vm_pgtable.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c > index b53903fdee85..9afa1354326b 100644 > --- a/mm/debug_vm_pgtable.c > +++ b/mm/debug_vm_pgtable.c > @@ -811,6 +811,7 @@ static void __init hugetlb_basic_tests(unsigned long pfn, pgprot_t prot) > #endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */ > } > > +#ifndef CONFIG_PPC_BOOK3S_64 > static void __init hugetlb_advanced_tests(struct mm_struct *mm, > struct vm_area_struct *vma, > pte_t *ptep, unsigned long pfn, > @@ -853,6 +854,7 @@ static void __init hugetlb_advanced_tests(struct mm_struct *mm, > pte = huge_ptep_get(ptep); > WARN_ON(!(huge_pte_write(pte) && huge_pte_dirty(pte))); > } > +#endif > #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, > @@ -1065,7 +1067,9 @@ static int __init debug_vm_pgtable(void) > pud_populate_tests(mm, pudp, saved_pmdp); > spin_unlock(ptl); > > +#ifndef CONFIG_PPC_BOOK3S_64 > hugetlb_advanced_tests(mm, vma, ptep, pte_aligned, vaddr, prot); > +#endif > > spin_lock(&mm->page_table_lock); > p4d_clear_tests(mm, p4dp); > Is it still required now that DEBUG_VM_PGTABLE has been dropped from powerpc or you would like to re-enabled it back ? https://lore.kernel.org/linuxppc-dev/159913592797.5893.5829441560236719450.b4-ty@ellerman.id.au/T/#m6d890e2fe84cf180cb875fae5f791e9c83db8d30
diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c index b53903fdee85..9afa1354326b 100644 --- a/mm/debug_vm_pgtable.c +++ b/mm/debug_vm_pgtable.c @@ -811,6 +811,7 @@ static void __init hugetlb_basic_tests(unsigned long pfn, pgprot_t prot) #endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */ } +#ifndef CONFIG_PPC_BOOK3S_64 static void __init hugetlb_advanced_tests(struct mm_struct *mm, struct vm_area_struct *vma, pte_t *ptep, unsigned long pfn, @@ -853,6 +854,7 @@ static void __init hugetlb_advanced_tests(struct mm_struct *mm, pte = huge_ptep_get(ptep); WARN_ON(!(huge_pte_write(pte) && huge_pte_dirty(pte))); } +#endif #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, @@ -1065,7 +1067,9 @@ static int __init debug_vm_pgtable(void) pud_populate_tests(mm, pudp, saved_pmdp); spin_unlock(ptl); +#ifndef CONFIG_PPC_BOOK3S_64 hugetlb_advanced_tests(mm, vma, ptep, pte_aligned, vaddr, prot); +#endif spin_lock(&mm->page_table_lock); p4d_clear_tests(mm, p4dp);
The seems to be missing quite a lot of details w.r.t allocating the correct pgtable_t page (huge_pte_alloc()), holding the right lock (huge_pte_lock()) etc. The vma used is also not a hugetlb VMA. ppc64 do have runtime checks within CONFIG_DEBUG_VM for most of these. Hence disable the test on ppc64. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> --- mm/debug_vm_pgtable.c | 4 ++++ 1 file changed, 4 insertions(+)