mm/khugepaged: Use maple tree iterators instead of vma linked list

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 63ed6b25deaabf693e0d40fa530ec32564c7ea96..cf05049afb1b6fb3764c3dbd97b924e67b1b1caf 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2325,11 +2325,11 @@ void vma_adjust_trans_huge(struct vm_area_struct *vma,
        split_huge_pmd_if_needed(vma, end);
 
        /*
-        * If we're also updating the vma->vm_next->vm_start,
+        * If we're also updating the vma_next(vma)->vm_start,
         * check if we need to split it.
         */
        if (adjust_next > 0) {
-               struct vm_area_struct *next = vma->vm_next;
+               struct vm_area_struct *next = vma_next(vma->vm_mm, vma);
                unsigned long nstart = next->vm_start;
                nstart += adjust_next;
                split_huge_pmd_if_needed(next, nstart);

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 33cf91529f0b27cdcf1f98554874fbc1d09b65e6..7bf9023815e819b3a2cc0b3907147ec452cf3dd9 100644 (file)
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -2063,6 +2063,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
        struct mm_struct *mm;
        struct vm_area_struct *vma;
        int progress = 0;
+       unsigned long address;
 
        VM_BUG_ON(!pages);
        lockdep_assert_held(&khugepaged_mm_lock);
@@ -2086,11 +2087,13 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
        vma = NULL;
        if (unlikely(!mmap_read_trylock(mm)))
                goto breakouterloop_mmap_lock;
-       if (likely(!khugepaged_test_exit(mm)))
-               vma = find_vma(mm, khugepaged_scan.address);
 
        progress++;
-       for (; vma; vma = vma->vm_next) {
+       if (unlikely(khugepaged_test_exit(mm)))
+               goto breakouterloop_mmap_lock;
+
+       address = khugepaged_scan.address;
+       mt_for_each(&mm->mm_mt, vma, address, ULONG_MAX) {
                unsigned long hstart, hend;
 
                cond_resched();