From: Liam Howlett <liam.howlett@oracle.com>
To: "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v9 14/69] kernel/fork: use maple tree for dup_mmap() during forking
Date: Wed, 4 May 2022 01:07:54 +0000 [thread overview]
Message-ID: <20220504010716.661115-16-Liam.Howlett@oracle.com> (raw)
In-Reply-To: <20220504010716.661115-1-Liam.Howlett@oracle.com>
From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
The maple tree was already tracking VMAs in this function by an earlier
commit, but the rbtree iterator was being used to iterate the list.
Change the iterator to use a maple tree native iterator and switch to the
maple tree advanced API to avoid multiple walks of the tree during insert
operations. Unexport the now-unused vma_store() function.
For performance reasons we bulk allocate the maple tree nodes. The node
calculations are done internally to the tree and use the VMA count and
assume the worst-case node requirements. The VM_DONT_COPY flag does not
allow for the most efficient copy method of the tree and so a bulk loading
algorithm is used.
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
---
include/linux/mm.h | 2 --
kernel/fork.c | 12 +++++++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9d9b0d96433a..c259f15c58ac 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2605,8 +2605,6 @@ extern bool arch_has_descending_max_zone_pfns(void);
/* nommu.c */
extern atomic_long_t mmap_pages_allocated;
extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t);
-/* mmap.c */
-void vma_mas_store(struct vm_area_struct *vma, struct ma_state *mas);
/* interval_tree.c */
void vma_interval_tree_insert(struct vm_area_struct *node,
diff --git a/kernel/fork.c b/kernel/fork.c
index bb985cc624fd..79af6e908539 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -583,9 +583,10 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
struct rb_node **rb_link, *rb_parent;
int retval;
- unsigned long charge;
- LIST_HEAD(uf);
+ unsigned long charge = 0;
+ MA_STATE(old_mas, &oldmm->mm_mt, 0, 0);
MA_STATE(mas, &mm->mm_mt, 0, 0);
+ LIST_HEAD(uf);
uprobe_start_dup_mmap();
if (mmap_write_lock_killable(oldmm)) {
@@ -622,7 +623,12 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
goto out;
prev = NULL;
- for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
+
+ retval = mas_expected_entries(&mas, oldmm->map_count);
+ if (retval)
+ goto out;
+
+ mas_for_each(&old_mas, mpnt, ULONG_MAX) {
struct file *file;
if (mpnt->vm_flags & VM_DONTCOPY) {
--
2.35.1
next prev parent reply other threads:[~2022-05-04 1:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 1:07 [PATCH v9 00/69] Maple Tree v9 Liam Howlett
2022-05-04 1:07 ` Liam Howlett
2022-05-04 1:07 ` [PATCH v9 01/69] Maple Tree: add new data structure Liam Howlett
2022-05-04 1:07 ` [PATCH v9 02/69] radix tree test suite: add pr_err define Liam Howlett
2022-05-04 1:07 ` [PATCH v9 03/69] radix tree test suite: add kmem_cache_set_non_kernel() Liam Howlett
2022-05-04 1:07 ` [PATCH v9 04/69] radix tree test suite: add allocation counts and size to kmem_cache Liam Howlett
2022-05-04 1:07 ` [PATCH v9 06/69] radix tree test suite: add lockdep_is_held to header Liam Howlett
2022-05-04 1:07 ` [PATCH v9 05/69] radix tree test suite: add support for slab bulk APIs Liam Howlett
2022-05-04 1:07 ` [PATCH v9 07/69] lib/test_maple_tree: add testing for maple tree Liam Howlett
2022-05-04 1:07 ` [PATCH v9 09/69] mm: add VMA iterator Liam Howlett
2022-05-04 1:07 ` [PATCH v9 08/69] mm: start tracking VMAs with maple tree Liam Howlett
2022-05-10 10:37 ` SeongJae Park
2022-05-10 15:51 ` Liam Howlett
2022-05-10 16:58 ` Liam Howlett
2022-05-12 17:01 ` Qian Cai
2022-05-12 17:50 ` Liam Howlett
2022-06-06 12:26 ` Qian Cai
2022-06-06 16:16 ` Liam Howlett
2022-06-06 16:42 ` Qian Cai
2022-05-04 1:07 ` [PATCH v9 10/69] mmap: use the VMA iterator in count_vma_pages_range() Liam Howlett
2022-05-04 1:07 ` [PATCH v9 12/69] mm/mmap: use the maple tree for find_vma_prev() instead of the rbtree Liam Howlett
2022-05-04 1:07 ` [PATCH v9 11/69] mm/mmap: use the maple tree in find_vma() " Liam Howlett
2022-05-04 1:07 ` [PATCH v9 13/69] mm/mmap: use maple tree for unmapped_area{_topdown} Liam Howlett
2022-05-04 1:07 ` Liam Howlett [this message]
2022-05-06 2:25 ` [PATCH v9 00/69] Maple Tree v9 Andrew Morton
2022-05-09 18:55 ` Liam Howlett
2022-05-09 20:02 ` 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=20220504010716.661115-16-Liam.Howlett@oracle.com \
--to=liam.howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.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).