From 152bbb1dd2b4476a7a496b4e404ca06e64471b27 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Fri, 24 Jul 2020 11:48:08 -0400 Subject: [PATCH] mm/mmap: Change find_vma_prev() to use maple tree Change the implementation of find_vma_prev to use the new maple tree data structure. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 42 ++++++------------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 9b205930c1af..ee381efd1f77 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2588,7 +2588,7 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) EXPORT_SYMBOL(find_vma); /** - * mt_find_vma_prev() - Find the VMA for a given address, or the next vma and + * find_vma_prev() - Find the VMA for a given address, or the next vma and * sets %pprev to the previous VMA, if any. * @mm The mm_struct to check * @addr: The address @@ -2598,52 +2598,22 @@ EXPORT_SYMBOL(find_vma); * May return NULL in the case of no vma at addr or above. */ struct vm_area_struct * -mt_find_vma_prev(struct mm_struct *mm, unsigned long addr, - struct vm_area_struct **pprev) +find_vma_prev(struct mm_struct *mm, unsigned long addr, + struct vm_area_struct **pprev) { struct vm_area_struct *vma; MA_STATE(mas, &mm->mm_mt, addr, addr); rcu_read_lock(); vma = mas_find(&mas, ULONG_MAX); + if (!vma) + mas_reset(&mas); + *pprev = mas_prev(&mas, 0); rcu_read_unlock(); return vma; } -/* - * Same as find_vma, but also return a pointer to the previous VMA in *pprev. - */ -struct vm_area_struct * -rb_find_vma_prev(struct mm_struct *mm, unsigned long addr, - struct vm_area_struct **pprev) -{ - struct vm_area_struct *vma; - - vma = find_vma(mm, addr); - if (vma) { - *pprev = vma->vm_prev; - } else { - struct rb_node *rb_node = rb_last(&mm->mm_rb); - - *pprev = rb_node ? rb_entry(rb_node, struct vm_area_struct, vm_rb) : NULL; - } - return vma; -} - -struct vm_area_struct * -find_vma_prev(struct mm_struct *mm, unsigned long addr, - struct vm_area_struct **pprev) -{ - struct vm_area_struct *mt_prev; - struct vm_area_struct *ret = rb_find_vma_prev(mm, addr, pprev); - VM_BUG_ON_VMA((unsigned long)ret != - (unsigned long)mt_find_vma_prev(mm, addr, &mt_prev), - ret); - VM_BUG_ON_VMA(mt_prev != *pprev, *pprev); - return ret; -} - /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -- 2.50.1