From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Mon, 4 Jan 2021 19:56:20 +0000 (-0500)
Subject: mm/gup: Use maple tree navigation instead of linked list
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fc6b85485304f46f09b6762883edd53b39aab910;p=users%2Fwilly%2Flinux.git

mm/gup: Use maple tree navigation instead of linked list

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

diff --git a/mm/gup.c b/mm/gup.c
index 886d6148d3d0..f9710e475899 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1568,7 +1568,6 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)
 	long ret = 0;
 
 	end = start + len;
-
 	for (nstart = start; nstart < end; nstart = nend) {
 		/*
 		 * We want to fault in pages for [nstart; end) address range.
@@ -1577,10 +1576,10 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)
 		if (!locked) {
 			locked = 1;
 			mmap_read_lock(mm);
-			vma = find_vma(mm, nstart);
+			vma = find_vma_intersection(mm, start, end);
 		} else if (nstart >= vma->vm_end)
-			vma = vma->vm_next;
-		if (!vma || vma->vm_start >= end)
+			vma = vma_next(mm, vma);
+		if (!vma)
 			break;
 		/*
 		 * Set [nstart; nend) to intersection of desired address