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/khugepaged.c b/mm/khugepaged.c
index 8369d9620f6d7aafa2d7424492afb072ce1c5d74..1e22a5a2e25d6b732629bdca365a0e59d71bb328 100644 (file)
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -2073,6 +2073,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
        struct mm_struct *mm;
        struct vm_area_struct *vma;
        int progress = 0;
+       MA_STATE(mas, NULL, 0, 0);
 
        VM_BUG_ON(!pages);
        lockdep_assert_held(&khugepaged_mm_lock);
@@ -2089,18 +2090,20 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
        khugepaged_collapse_pte_mapped_thps(mm_slot);
 
        mm = mm_slot->mm;
+       mas.tree = &mm->mm_mt;
        /*
         * Don't wait for semaphore (to avoid long wait times).  Just move to
         * the next mm on the list.
         */
        vma = NULL;
+       mas_set(&mas, khugepaged_scan.address);
        if (unlikely(!mmap_read_trylock(mm)))
                goto breakouterloop_mmap_lock;
        if (likely(!khugepaged_test_exit(mm)))
-               vma = find_vma(mm, khugepaged_scan.address);
+               vma = mas_find(&mas, ULONG_MAX);
 
        progress++;
-       for (; vma; vma = vma->vm_next) {
+       mas_for_each(&mas, vma, ULONG_MAX) {
                unsigned long hstart, hend;
 
                cond_resched();