From: linmiaohe <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>, <richardw.yang@linux.intel.com>,
<sfr@canb.auug.org.au>, <rppt@linux.ibm.com>, <jannh@google.com>,
<steve.capper@arm.com>, <catalin.marinas@arm.com>,
<aarcange@redhat.com>, <walken@google.com>,
<dave.hansen@linux.intel.com>, <tiny.windzz@gmail.com>,
<jhubbard@nvidia.com>, <david@redhat.com>
Cc: <linmiaohe@huawei.com>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v4] mm: get rid of odd jump labels in find_mergeable_anon_vma()
Date: Mon, 18 Nov 2019 20:24:04 +0800 [thread overview]
Message-ID: <1574079844-17493-1-git-send-email-linmiaohe@huawei.com> (raw)
From: Miaohe Lin <linmiaohe@huawei.com>
The jump labels try_prev and none are not really needed
in find_mergeable_anon_vma(), eliminate them to improve
readability.
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
-v2:
Fix commit descriptions and further simplify the code
as suggested by David Hildenbrand and John Hubbard.
-v3:
Rewrite patch version info. Don't show this in commit log.
-v4:
Get rid of var near completely as well.
---
mm/mmap.c | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/mm/mmap.c b/mm/mmap.c
index 91d5e097a4ed..4d93bda30eac 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1273,26 +1273,22 @@ static struct anon_vma *reusable_anon_vma(struct vm_area_struct *old, struct vm_
*/
struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *vma)
{
- struct anon_vma *anon_vma;
- struct vm_area_struct *near;
-
- near = vma->vm_next;
- if (!near)
- goto try_prev;
-
- anon_vma = reusable_anon_vma(near, vma, near);
- if (anon_vma)
- return anon_vma;
-try_prev:
- near = vma->vm_prev;
- if (!near)
- goto none;
-
- anon_vma = reusable_anon_vma(near, near, vma);
- if (anon_vma)
- return anon_vma;
-none:
+ struct anon_vma *anon_vma = NULL;
+
+ /* Try next first. */
+ if (vma->vm_next) {
+ anon_vma = reusable_anon_vma(vma->vm_next, vma, vma->vm_next);
+ if (anon_vma)
+ return anon_vma;
+ }
+
+ /* Try prev next. */
+ if (vma->vm_prev)
+ anon_vma = reusable_anon_vma(vma->vm_prev, vma->vm_prev, vma);
+
/*
+ * We might reach here with anon_vma == NULL if we can't find
+ * any reusable anon_vma.
* There's no absolute need to look only at touching neighbours:
* we could search further afield for "compatible" anon_vmas.
* But it would probably just be a waste of time searching,
@@ -1300,7 +1296,7 @@ struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *vma)
* We're trying to allow mprotect remerging later on,
* not trying to minimize memory used for anon_vmas.
*/
- return NULL;
+ return anon_vma;
}
/*
--
2.21.GIT
next reply other threads:[~2019-11-18 12:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 12:24 linmiaohe [this message]
2019-11-18 13:22 ` [PATCH v4] mm: get rid of odd jump labels in find_mergeable_anon_vma() Wei Yang
2019-11-18 13:48 ` David Hildenbrand
2019-11-18 21:22 ` David Rientjes
2019-11-30 7:23 linmiaohe
2019-11-30 8:12 ` David Hildenbrand
2019-11-30 8:38 linmiaohe
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=1574079844-17493-1-git-send-email-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=jannh@google.com \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=richardw.yang@linux.intel.com \
--cc=rppt@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=steve.capper@arm.com \
--cc=tiny.windzz@gmail.com \
--cc=walken@google.com \
/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).