From: Gonzalo Matias Juarez Tello <gmjuareztello@gmail.com>
To: linux-mm@kvack.org
Cc: Gonzalo Matias Juarez Tello <gmjuareztello@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH] mm/mmap.c: logic of find_vma_intersection repeated in __do_munmap
Date: Fri, 9 Apr 2021 13:21:26 -0300 [thread overview]
Message-ID: <20210409162129.18313-1-gmjuareztello@gmail.com> (raw)
Logic of find_vma_intersection() (which is an inline fc) is
repeated in __do_munmap().
Besides, prev is assigned a value before checking vma->vm_start >= end
which might end up on a return statement making that assignment useless.
Calling find_vma_intersection() checks that condition and returns NULL if
no vma is found, hence only the !vma check is needed in __do_munmap().
Signed-off-by: Gonzalo Matias Juarez Tello <gmjuareztello@gmail.com>
---
mm/mmap.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/mm/mmap.c b/mm/mmap.c
index 3f287599a7a3..59ceaa474a00 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2822,16 +2822,11 @@ 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);
+ /* Find the first overlapping VMA where start < vma->vm_end */
+ 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
next reply other threads:[~2021-04-09 16:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 16:21 Gonzalo Matias Juarez Tello [this message]
2021-05-10 5:08 ` [PATCH] mm/mmap.c: logic of find_vma_intersection repeated in __do_munmap Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210409162129.18313-1-gmjuareztello@gmail.com \
--to=gmjuareztello@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).