[122/192] mm/ksm: use vma_lookup() in find_mergeable_vma()

Commit Message

Andrew Morton June 29, 2021, 2:39 a.m. UTC

From: Liam Howlett <[e-mail]>
Subject: mm/ksm: use vma_lookup() in find_mergeable_vma()

Use vma_lookup() to find the VMA at a specific address.  As vma_lookup()
will return NULL if the address is not within any VMA, the start address
no longer needs to be validated.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Liam R. Howlett <[e-mail]>
Reviewed-by: Laurent Dufour <[e-mail]>
Acked-by: David Hildenbrand <[e-mail]>
Acked-by: Davidlohr Bueso <[e-mail]>
Cc: Geert Uytterhoeven <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/ksm.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Patch

--- a/mm/ksm.c~mm-ksm-use-vma_lookup-in-find_mergeable_vma
+++ a/mm/ksm.c
@@ -521,10 +521,8 @@  static struct vm_area_struct *find_merge
 	struct vm_area_struct *vma;
 	if (ksm_test_exit(mm))
 		return NULL;
-	vma = find_vma(mm, addr);
-	if (!vma || vma->vm_start > addr)
-		return NULL;
-	if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
+	vma = vma_lookup(mm, addr);
+	if (!vma || !(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
 		return NULL;
 	return vma;
 }