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 40/69] coredump: remove vma linked list walk
Date: Wed, 4 May 2022 01:13:58 +0000 [thread overview]
Message-ID: <20220504011345.662299-25-Liam.Howlett@oracle.com> (raw)
In-Reply-To: <20220504011345.662299-1-Liam.Howlett@oracle.com>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Use the Maple Tree iterator instead. This is too complicated for the VMA
iterator to handle, so let's open-code it for now. If this turns out to
be a common pattern, we can migrate it to common code.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
fs/coredump.c | 34 ++++++++++++----------------------
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/fs/coredump.c b/fs/coredump.c
index ebc43f960b64..3a0022c1ca36 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -1072,30 +1072,20 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
return vma->vm_end - vma->vm_start;
}
-static struct vm_area_struct *first_vma(struct task_struct *tsk,
- struct vm_area_struct *gate_vma)
-{
- struct vm_area_struct *ret = tsk->mm->mmap;
-
- if (ret)
- return ret;
- return gate_vma;
-}
-
/*
* Helper function for iterating across a vma list. It ensures that the caller
* will visit `gate_vma' prior to terminating the search.
*/
-static struct vm_area_struct *next_vma(struct vm_area_struct *this_vma,
+static struct vm_area_struct *coredump_next_vma(struct ma_state *mas,
+ struct vm_area_struct *vma,
struct vm_area_struct *gate_vma)
{
- struct vm_area_struct *ret;
-
- ret = this_vma->vm_next;
- if (ret)
- return ret;
- if (this_vma == gate_vma)
+ if (gate_vma && (vma == gate_vma))
return NULL;
+
+ vma = mas_next(mas, ULONG_MAX);
+ if (vma)
+ return vma;
return gate_vma;
}
@@ -1119,9 +1109,10 @@ static void free_vma_snapshot(struct coredump_params *cprm)
*/
static bool dump_vma_snapshot(struct coredump_params *cprm)
{
- struct vm_area_struct *vma, *gate_vma;
+ struct vm_area_struct *gate_vma, *vma = NULL;
struct mm_struct *mm = current->mm;
- int i;
+ MA_STATE(mas, &mm->mm_mt, 0, 0);
+ int i = 0;
/*
* Once the stack expansion code is fixed to not change VMA bounds
@@ -1141,8 +1132,7 @@ static bool dump_vma_snapshot(struct coredump_params *cprm)
return false;
}
- for (i = 0, vma = first_vma(current, gate_vma); vma != NULL;
- vma = next_vma(vma, gate_vma), i++) {
+ while ((vma = coredump_next_vma(&mas, vma, gate_vma)) != NULL) {
struct core_vma_metadata *m = cprm->vma_meta + i;
m->start = vma->vm_start;
@@ -1150,10 +1140,10 @@ static bool dump_vma_snapshot(struct coredump_params *cprm)
m->flags = vma->vm_flags;
m->dump_size = vma_dump_size(vma, cprm->mm_flags);
m->pgoff = vma->vm_pgoff;
-
m->file = vma->vm_file;
if (m->file)
get_file(m->file);
+ i++;
}
mmap_write_unlock(mm);
--
2.35.1
next prev parent reply other threads:[~2022-05-04 1:17 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 0:26 [PATCH 0/1] Prepare for maple tree Liam Howlett
2022-05-04 0:26 ` [PATCH 1/1] mips: rename mt_init to mips_mt_init Liam Howlett
2022-05-12 9:54 ` David Hildenbrand
2022-05-04 1:12 ` [PATCH v9 15/69] damon: Convert __damon_va_three_regions to use the VMA iterator Liam Howlett
2022-05-10 10:44 ` SeongJae Park
2022-05-10 16:27 ` Liam Howlett
2022-05-10 19:13 ` Andrew Morton
2022-05-04 1:13 ` [PATCH v9 16/69] proc: remove VMA rbtree use from nommu Liam Howlett
2022-05-04 1:13 ` [PATCH v9 17/69] mm: remove rb tree Liam Howlett
2022-05-04 1:13 ` [PATCH v9 19/69] xen: use vma_lookup() in privcmd_ioctl_mmap() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 20/69] mm: optimize find_exact_vma() to use vma_lookup() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 18/69] mmap: change zeroing of maple tree in __vma_adjust() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 23/69] mm: use maple tree operations for find_vma_intersection() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 21/69] mm/khugepaged: optimize collapse_pte_mapped_thp() by using vma_lookup() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 22/69] mm/mmap: change do_brk_flags() to expand existing VMA and add do_brk_munmap() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 24/69] mm/mmap: use advanced maple tree API for mmap_region() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 25/69] mm: remove vmacache Liam Howlett
2022-05-04 1:13 ` [PATCH v9 27/69] mm/mmap: move mmap_region() below do_munmap() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 26/69] mm: convert vma_lookup() to use mtree_load() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 28/69] mm/mmap: reorganize munmap to use maple states Liam Howlett
2022-06-06 12:09 ` Qian Cai
2022-06-06 16:19 ` Liam Howlett
2022-06-06 16:40 ` Qian Cai
2022-06-11 20:11 ` Yu Zhao
2022-06-11 21:49 ` Yu Zhao
2022-06-12 1:09 ` Liam Howlett
2022-06-15 14:25 ` Liam Howlett
2022-06-15 18:07 ` Yu Zhao
2022-06-15 18:55 ` Liam Howlett
2022-06-15 19:05 ` Yu Zhao
2022-06-15 21:16 ` Yu Zhao
2022-06-16 1:50 ` Liam Howlett
2022-06-16 1:58 ` Yu Zhao
2022-06-16 2:56 ` Liam Howlett
2022-06-16 3:02 ` Yu Zhao
2022-06-16 5:45 ` Yu Zhao
2022-06-16 5:55 ` Yu Zhao
2022-06-16 18:26 ` Liam Howlett
2022-06-16 18:34 ` Yu Zhao
2022-06-17 13:49 ` Liam Howlett
2022-05-04 1:13 ` [PATCH v9 29/69] mm/mmap: change do_brk_munmap() to use do_mas_align_munmap() Liam Howlett
2022-05-04 1:13 ` [PATCH v9 30/69] arm64: remove mmap linked list from vdso Liam Howlett
2022-05-04 1:13 ` [PATCH v9 31/69] arm64: Change elfcore for_each_mte_vma() to use VMA iterator Liam Howlett
2022-05-04 1:13 ` [PATCH v9 33/69] powerpc: remove mmap linked list walks Liam Howlett
2022-05-04 1:13 ` [PATCH v9 32/69] parisc: remove mmap linked list from cache handling Liam Howlett
2022-05-04 1:13 ` [PATCH v9 35/69] x86: remove vma linked list walks Liam Howlett
2022-05-04 1:13 ` [PATCH v9 36/69] xtensa: " Liam Howlett
2022-05-04 1:13 ` [PATCH v9 34/69] s390: " Liam Howlett
2022-05-04 1:13 ` [PATCH v9 38/69] optee: remove vma linked list walk Liam Howlett
2022-05-04 1:13 ` [PATCH v9 39/69] um: " Liam Howlett
2022-05-04 1:13 ` [PATCH v9 37/69] cxl: " Liam Howlett
2022-05-04 1:13 ` Liam Howlett [this message]
2022-05-04 1:13 ` [PATCH v9 41/69] exec: use VMA iterator instead of linked list Liam Howlett
2022-05-04 1:13 ` [PATCH v9 42/69] fs/proc/base: use maple tree iterators in place " Liam Howlett
2022-05-04 1:13 ` [PATCH v9 43/69] fs/proc/task_mmu: stop using linked list and highest_vm_end Liam Howlett
2022-05-04 1:13 ` [PATCH v9 45/69] ipc/shm: use VMA iterator instead of linked list Liam Howlett
2022-05-04 1:13 ` [PATCH v9 44/69] userfaultfd: use maple tree iterator to iterate VMAs Liam Howlett
2022-05-04 1:14 ` [PATCH v9 47/69] perf: use VMA iterator Liam Howlett
2022-05-04 1:14 ` [PATCH v9 46/69] acct: use VMA iterator instead of linked list Liam Howlett
2022-05-04 1:14 ` [PATCH v9 48/69] sched: use maple tree iterator to walk VMAs Liam Howlett
2022-05-04 1:14 ` [PATCH v9 50/69] bpf: remove VMA linked list Liam Howlett
2022-05-04 1:14 ` [PATCH v9 49/69] fork: use VMA iterator Liam Howlett
2022-05-04 1:14 ` [PATCH v9 52/69] mm/khugepaged: stop using vma linked list Liam Howlett
2022-05-04 1:14 ` [PATCH v9 51/69] mm/gup: use maple tree navigation instead of " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 53/69] mm/ksm: use vma iterators instead of vma " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 54/69] mm/madvise: use vma_find() " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 55/69] mm/memcontrol: stop using mm->highest_vm_end Liam Howlett
2022-05-04 1:14 ` [PATCH v9 56/69] mm/mempolicy: use vma iterator & maple state instead of vma linked list Liam Howlett
2022-05-04 1:14 ` [PATCH v9 59/69] mm/mremap: use vma_find_intersection() " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 57/69] mm/mlock: use vma iterator and maple state " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 58/69] mm/mprotect: use maple tree navigation " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 60/69] mm/msync: use vma_find() " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 61/69] mm/oom_kill: use maple tree iterators " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 62/69] mm/pagewalk: use vma_find() " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 63/69] mm/swapfile: use vma iterator " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 65/69] nommu: remove uses of VMA " Liam Howlett
2022-05-04 1:14 ` [PATCH v9 64/69] i915: use the VMA iterator Liam Howlett
2022-05-04 1:14 ` [PATCH v9 66/69] riscv: use vma iterator for vdso Liam Howlett
2022-05-04 1:14 ` [PATCH v9 68/69] mm/mmap: drop range_has_overlap() function Liam Howlett
2022-05-04 1:14 ` [PATCH v9 67/69] mm: remove the vma linked list Liam Howlett
2022-05-13 13:30 ` Qian Cai
2022-05-13 14:17 ` Liam Howlett
2022-05-04 1:14 ` [PATCH v9 69/69] mm/mmap.c: pass in mapping to __vma_link_file() Liam 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=20220504011345.662299-25-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).