mmap: use the VMA iterator in count_vma_pages_range()

This simplifies the implementation and is faster than using the linked
list.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>

diff --git a/mm/mmap.c b/mm/mmap.c
index 20718645d82f2da5b78a31f3d5e1a1cca724ebcd..f1b07751a1e416686868b74ac2c16abfc402ae50 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -629,29 +629,19 @@ munmap_vma_range(struct mm_struct *mm, unsigned long start, unsigned long len,
 
        return 0;
 }
+
 static unsigned long count_vma_pages_range(struct mm_struct *mm,
                unsigned long addr, unsigned long end)
 {
-       unsigned long nr_pages = 0;
+       VMA_ITERATOR(vmi, mm, addr);
        struct vm_area_struct *vma;
+       unsigned long nr_pages = 0;
 
-       /* Find first overlapping mapping */
-       vma = find_vma_intersection(mm, addr, end);
-       if (!vma)
-               return 0;
-
-       nr_pages = (min(end, vma->vm_end) -
-               max(addr, vma->vm_start)) >> PAGE_SHIFT;
-
-       /* Iterate over the rest of the overlaps */
-       for (vma = vma->vm_next; vma; vma = vma->vm_next) {
-               unsigned long overlap_len;
-
-               if (vma->vm_start > end)
-                       break;
+       for_each_vma_range(vmi, vma, end) {
+               unsigned long vm_start = max(addr, vma->vm_start);
+               unsigned long vm_end = min(end, vma->vm_end);
 
-               overlap_len = min(end, vma->vm_end) - vma->vm_start;
-               nr_pages += overlap_len >> PAGE_SHIFT;
+               nr_pages += PHYS_PFN(vm_end - vm_start);
        }
 
        return nr_pages;