linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
To: maple-tree@lists.infradead.org, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@google.com>, Song Liu <songliubraving@fb.com>,
	Davidlohr Bueso <dave@stgolabs.net>,
	"Paul E . McKenney" <paulmck@kernel.org>,
	Matthew Wilcox <willy@infradead.org>,
	Jerome Glisse <jglisse@redhat.com>,
	David Rientjes <rientjes@google.com>,
	Axel Rasmussen <axelrasmussen@google.com>,
	Suren Baghdasaryan <surenb@google.com>,
	Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH 26/28] mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap()
Date: Thu, 10 Dec 2020 12:04:00 -0500	[thread overview]
Message-ID: <20201210170402.3468568-27-Liam.Howlett@Oracle.com> (raw)
In-Reply-To: <20201210170402.3468568-1-Liam.Howlett@Oracle.com>

do_brk_munmap() already has aligned addresses.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
 mm/mmap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 36a6b03193eb3..284c90504b44c 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2992,12 +2992,13 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma,
 	struct mm_struct *mm = vma->vm_mm;
 	struct vm_area_struct unmap;
 	unsigned long unmap_pages;
-	int ret = 1;
+	int ret;
 
 	arch_unmap(mm, newbrk, oldbrk);
 
 	if (likely(vma->vm_start >= newbrk)) { // remove entire mapping(s)
-		ret = do_mas_munmap(mas, mm, newbrk, oldbrk-newbrk, uf, true);
+		ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf,
+					  true);
 		goto munmap_full_vma;
 	}
 
-- 
2.28.0


  parent reply	other threads:[~2020-12-10 17:08 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-10 17:03 [PATCH 00/28] RFC mm: Introducing the Maple Tree Liam R. Howlett
2020-12-10 17:03 ` [PATCH 01/28] radix tree test suite: Enhancements for " Liam R. Howlett
2020-12-10 17:03 ` [PATCH 02/28] radix tree test suite: Add support for fallthrough attribute Liam R. Howlett
2020-12-10 17:03 ` [PATCH 03/28] radix tree test suite: Add support for kmem_cache_free_bulk Liam R. Howlett
2020-12-10 17:03 ` [PATCH 04/28] radix tree test suite: Add keme_cache_alloc_bulk() support Liam R. Howlett
2020-12-10 17:03 ` [PATCH 05/28] Maple Tree: Add new data structure Liam R. Howlett
2020-12-10 17:03 ` [PATCH 06/28] mm: Start tracking VMAs with maple tree Liam R. Howlett
2020-12-11 19:30   ` kernel test robot
2020-12-10 17:03 ` [PATCH 07/28] mm/mmap: Introduce unlock_range() for code cleanup Liam R. Howlett
2020-12-10 17:03 ` [PATCH 08/28] mm/mmap: Change find_vma() to use the maple tree Liam R. Howlett
2020-12-10 17:03 ` [PATCH 09/28] mm/mmap: Change find_vma_prev() to use " Liam R. Howlett
2020-12-10 17:03 ` [PATCH 10/28] mm/mmap: Change unmapped_area and unmapped_area_topdown " Liam R. Howlett
2020-12-10 17:03 ` [PATCH 11/28] kernel/fork: Convert dup_mmap " Liam R. Howlett
2020-12-10 17:03 ` [PATCH 12/28] mm: Remove rb tree Liam R. Howlett
2020-12-10 17:03 ` [PATCH 13/28] mm/gup: Expose mm_populate_vma() for use when the vma is known Liam R. Howlett
2020-12-10 21:03   ` kernel test robot
2020-12-10 17:03 ` [PATCH 14/28] mm/mmap: Change do_brk_flags() to expand existing VMA and add do_brk_munmap() Liam R. Howlett
2020-12-10 17:03 ` [PATCH 15/28] mm/mmap: Change vm_brk_flags() to use mm_populate_vma() Liam R. Howlett
2020-12-10 17:03 ` [PATCH 16/28] mm: Move find_vma_intersection to mmap.c and change implementation to maple tree Liam R. Howlett
2020-12-10 17:03 ` [PATCH 17/28] mm/mmap: Change mmap_region to use maple tree state Liam R. Howlett
2020-12-10 17:03 ` [PATCH 18/28] mm/mmap: Drop munmap_vma_range() Liam R. Howlett
2020-12-10 17:03 ` [PATCH 19/28] mm: Remove vmacache Liam R. Howlett
2020-12-10 17:03 ` [PATCH 20/28] mm/mmap: Change __do_munmap() to avoid unnecessary lookups Liam R. Howlett
2020-12-10 17:03 ` [PATCH 21/28] mm/mmap: Change __do_munmap() to use a ma_state Liam R. Howlett
2020-12-10 17:03 ` [PATCH 22/28] mm/mmap: Move mmap_region() below do_munmap() Liam R. Howlett
2020-12-10 17:03 ` [PATCH 23/28] mm/mmap: Add do_mas_munmap() and wraper for __do_munmap() Liam R. Howlett
2020-12-10 17:03 ` [PATCH 24/28] mmap: Use find_vma_intersection in do_mmap() for overlap Liam R. Howlett
2020-12-10 17:03 ` [PATCH 25/28] mmap: Remove __do_munmap() in favour of do_mas_munmap() Liam R. Howlett
2020-12-10 17:04 ` Liam R. Howlett [this message]
2020-12-10 17:04 ` [PATCH 27/28] mmap: Update count_vma_pages_range() to only use one ma_state Liam R. Howlett
2020-12-10 17:04 ` [PATCH 28/28] mmap: make remove_vma_list() inline Liam R. Howlett

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=20201210170402.3468568-27-Liam.Howlett@Oracle.com \
    --to=liam.howlett@oracle.com \
    --cc=akpm@google.com \
    --cc=axelrasmussen@google.com \
    --cc=dave@stgolabs.net \
    --cc=jglisse@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=maple-tree@lists.infradead.org \
    --cc=paulmck@kernel.org \
    --cc=rientjes@google.com \
    --cc=songliubraving@fb.com \
    --cc=surenb@google.com \
    --cc=vbabka@suse.cz \
    --cc=willy@infradead.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).