[PATCHv2] mm/mmap.c: lines in __do_munmap repeat logic of inlined find_vma_intersection

[PATCHv2] mm/mmap.c: lines in __do_munmap repeat logic of inlined find_vma_intersection

[Gonzalo Matias Juarez Tello]

Some lines in __do_munmap used the same logic as find_vma_intersection
(which is inlined) instead of directly using that function.

(Can't believe I made a typo in the first one, compiled this one,
sorry first patch kinda nervous for some reason)

Signed-off-by: Gonzalo Matias Juarez Tello <gmjuareztello@gmail.com>
---
 mm/mmap.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 3f287599a7a3..1b29f8bf8344 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2823,15 +2823,10 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len,
 	arch_unmap(mm, start, end);
 
 	/* Find the first overlapping VMA */
-	vma = find_vma(mm, start);
+	vma = find_vma_intersection(mm, start, end);
 	if (!vma)
 		return 0;
 	prev = vma->vm_prev;
-	/* we have  start < vma->vm_end  */
-
-	/* if it doesn't overlap, we have nothing.. */
-	if (vma->vm_start >= end)
-		return 0;
 
 	/*
 	 * If we need to split any vma, do it now to save pain later.
-- 
2.31.1

Re: [PATCHv2] mm/mmap.c: lines in __do_munmap repeat logic of inlined find_vma_intersection

[David Hildenbrand]

On 08.04.21 05:46, Gonzalo Matias Juarez Tello wrote:
> Some lines in __do_munmap used the same logic as find_vma_intersection
> (which is inlined) instead of directly using that function.
> 
> (Can't believe I made a typo in the first one, compiled this one,
> sorry first patch kinda nervous for some reason)
> 
> Signed-off-by: Gonzalo Matias Juarez Tello <gmjuareztello@gmail.com>
> ---
>   mm/mmap.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/mm/mmap.c b/mm/mmap.c
> index 3f287599a7a3..1b29f8bf8344 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -2823,15 +2823,10 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len,
>   	arch_unmap(mm, start, end);
>   
>   	/* Find the first overlapping VMA */
> -	vma = find_vma(mm, start);
> +	vma = find_vma_intersection(mm, start, end);
>   	if (!vma)
>   		return 0;
>   	prev = vma->vm_prev;
> -	/* we have  start < vma->vm_end  */
> -
> -	/* if it doesn't overlap, we have nothing.. */
> -	if (vma->vm_start >= end)
> -		return 0;
>   
>   	/*
>   	 * If we need to split any vma, do it now to save pain later.
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb