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 v7 44/70] fs/proc/task_mmu: Stop using linked list and highest_vm_end
Date: Mon, 4 Apr 2022 14:35:50 +0000 [thread overview]
Message-ID: <20220404143501.2016403-45-Liam.Howlett@oracle.com> (raw)
In-Reply-To: <20220404143501.2016403-1-Liam.Howlett@oracle.com>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Remove references to mm_struct linked list and highest_vm_end for when
they are removed
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
fs/proc/internal.h | 2 +-
fs/proc/task_mmu.c | 73 ++++++++++++++++++++++++++--------------------
2 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 06a80f78433d..f03000764ce5 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -285,7 +285,7 @@ struct proc_maps_private {
struct task_struct *task;
struct mm_struct *mm;
#ifdef CONFIG_MMU
- struct vm_area_struct *tail_vma;
+ struct vma_iterator iter;
#endif
#ifdef CONFIG_NUMA
struct mempolicy *task_mempolicy;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index f025c8496cb7..7a14939c6c62 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -123,12 +123,26 @@ static void release_task_mempolicy(struct proc_maps_private *priv)
}
#endif
+static struct vm_area_struct *proc_get_vma(struct proc_maps_private *priv,
+ loff_t *ppos)
+{
+ struct vm_area_struct *vma = vma_next(&priv->iter);
+
+ if (vma) {
+ *ppos = vma->vm_start;
+ } else {
+ *ppos = -2UL;
+ vma = get_gate_vma(priv->mm);
+ }
+
+ return vma;
+}
+
static void *m_start(struct seq_file *m, loff_t *ppos)
{
struct proc_maps_private *priv = m->private;
unsigned long last_addr = *ppos;
struct mm_struct *mm;
- struct vm_area_struct *vma;
/* See m_next(). Zero at the start or after lseek. */
if (last_addr == -1UL)
@@ -152,31 +166,21 @@ static void *m_start(struct seq_file *m, loff_t *ppos)
return ERR_PTR(-EINTR);
}
+ vma_iter_init(&priv->iter, mm, last_addr);
hold_task_mempolicy(priv);
- priv->tail_vma = get_gate_vma(mm);
-
- vma = find_vma(mm, last_addr);
- if (vma)
- return vma;
+ if (last_addr == -2UL)
+ return get_gate_vma(mm);
- return priv->tail_vma;
+ return proc_get_vma(priv, ppos);
}
static void *m_next(struct seq_file *m, void *v, loff_t *ppos)
{
- struct proc_maps_private *priv = m->private;
- struct vm_area_struct *next, *vma = v;
-
- if (vma == priv->tail_vma)
- next = NULL;
- else if (vma->vm_next)
- next = vma->vm_next;
- else
- next = priv->tail_vma;
-
- *ppos = next ? next->vm_start : -1UL;
-
- return next;
+ if (*ppos == -2UL) {
+ *ppos = -1UL;
+ return NULL;
+ }
+ return proc_get_vma(m->private, ppos);
}
static void m_stop(struct seq_file *m, void *v)
@@ -872,16 +876,16 @@ static int show_smaps_rollup(struct seq_file *m, void *v)
{
struct proc_maps_private *priv = m->private;
struct mem_size_stats mss;
- struct mm_struct *mm;
+ struct mm_struct *mm = priv->mm;
struct vm_area_struct *vma;
- unsigned long last_vma_end = 0;
+ unsigned long vma_start = 0, last_vma_end = 0;
int ret = 0;
+ MA_STATE(mas, &mm->mm_mt, 0, 0);
priv->task = get_proc_task(priv->inode);
if (!priv->task)
return -ESRCH;
- mm = priv->mm;
if (!mm || !mmget_not_zero(mm)) {
ret = -ESRCH;
goto out_put_task;
@@ -894,8 +898,13 @@ static int show_smaps_rollup(struct seq_file *m, void *v)
goto out_put_mm;
hold_task_mempolicy(priv);
+ vma = mas_find(&mas, 0);
+
+ if (unlikely(!vma))
+ goto empty_set;
- for (vma = priv->mm->mmap; vma;) {
+ vma_start = vma->vm_start;
+ do {
smap_gather_stats(vma, &mss, 0);
last_vma_end = vma->vm_end;
@@ -904,6 +913,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v)
* access it for write request.
*/
if (mmap_lock_is_contended(mm)) {
+ mas_pause(&mas);
mmap_read_unlock(mm);
ret = mmap_read_lock_killable(mm);
if (ret) {
@@ -947,7 +957,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v)
* contains last_vma_end.
* Iterate VMA' from last_vma_end.
*/
- vma = find_vma(mm, last_vma_end - 1);
+ vma = mas_find(&mas, ULONG_MAX);
/* Case 3 above */
if (!vma)
break;
@@ -961,11 +971,10 @@ static int show_smaps_rollup(struct seq_file *m, void *v)
smap_gather_stats(vma, &mss, last_vma_end);
}
/* Case 2 above */
- vma = vma->vm_next;
- }
+ } while ((vma = mas_find(&mas, ULONG_MAX)) != NULL);
- show_vma_header_prefix(m, priv->mm->mmap->vm_start,
- last_vma_end, 0, 0, 0, 0);
+empty_set:
+ show_vma_header_prefix(m, vma_start, last_vma_end, 0, 0, 0, 0);
seq_pad(m, ' ');
seq_puts(m, "[rollup]\n");
@@ -1258,6 +1267,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
return -ESRCH;
mm = get_task_mm(task);
if (mm) {
+ MA_STATE(mas, &mm->mm_mt, 0, 0);
struct mmu_notifier_range range;
struct clear_refs_private cp = {
.type = type,
@@ -1277,7 +1287,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
}
if (type == CLEAR_REFS_SOFT_DIRTY) {
- for (vma = mm->mmap; vma; vma = vma->vm_next) {
+ mas_for_each(&mas, vma, ULONG_MAX) {
if (!(vma->vm_flags & VM_SOFTDIRTY))
continue;
vma->vm_flags &= ~VM_SOFTDIRTY;
@@ -1289,8 +1299,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
0, NULL, mm, 0, -1UL);
mmu_notifier_invalidate_range_start(&range);
}
- walk_page_range(mm, 0, mm->highest_vm_end, &clear_refs_walk_ops,
- &cp);
+ walk_page_range(mm, 0, -1, &clear_refs_walk_ops, &cp);
if (type == CLEAR_REFS_SOFT_DIRTY) {
mmu_notifier_invalidate_range_end(&range);
flush_tlb_mm(mm);
--
2.34.1
next prev parent reply other threads:[~2022-04-04 15:08 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 14:35 [PATCH v7 00/70] Introducing the Maple Tree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 01/70] radix tree test suite: Add pr_err define Liam Howlett
2022-04-04 14:35 ` [PATCH v7 02/70] radix tree test suite: Add kmem_cache_set_non_kernel() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 03/70] radix tree test suite: Add allocation counts and size to kmem_cache Liam Howlett
2022-04-04 14:35 ` [PATCH v7 05/70] radix tree test suite: Add lockdep_is_held to header Liam Howlett
2022-04-04 14:35 ` [PATCH v7 04/70] radix tree test suite: Add support for slab bulk APIs Liam Howlett
2022-04-04 14:35 ` [PATCH v7 06/70] mips: Rename mt_init to mips_mt_init Liam Howlett
2022-04-04 14:35 ` [PATCH v7 07/70] Maple Tree: Add new data structure Liam Howlett
2022-04-20 13:47 ` Liam Howlett
2022-04-04 14:35 ` [PATCH v7 08/70] lib/test_maple_tree: Add testing for maple tree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 11/70] arch/arm64: Remove the merge workaround for VMA_ITERATOR Liam Howlett
2022-04-05 9:24 ` Will Deacon
2022-04-05 14:12 ` Liam Howlett
2022-04-04 14:35 ` [PATCH v7 09/70] mm: Start tracking VMAs with maple tree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 10/70] mm: Add VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 13/70] mm/mmap: Use the maple tree in find_vma() instead of the rbtree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 12/70] mmap: Use the VMA iterator in count_vma_pages_range() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 15/70] mm/mmap: Use maple tree for unmapped_area{_topdown} Liam Howlett
2022-04-04 14:35 ` [PATCH v7 14/70] mm/mmap: Use the maple tree for find_vma_prev() instead of the rbtree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 16/70] kernel/fork: Use maple tree for dup_mmap() during forking Liam Howlett
2022-04-04 14:35 ` [PATCH v7 17/70] damon: Convert __damon_va_three_regions to use the VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 18/70] proc: Remove VMA rbtree use from nommu Liam Howlett
2022-04-04 14:35 ` [PATCH v7 19/70] mm: Remove rb tree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 20/70] mmap: Change zeroing of maple tree in __vma_adjust() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 22/70] mm: Optimize find_exact_vma() to use vma_lookup() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 21/70] xen: Use vma_lookup() in privcmd_ioctl_mmap() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 23/70] mm/khugepaged: Optimize collapse_pte_mapped_thp() by using vma_lookup() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 24/70] mm/mmap: Change do_brk_flags() to expand existing VMA and add do_brk_munmap() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 25/70] mm: Use maple tree operations for find_vma_intersection() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 26/70] mm/mmap: Use advanced maple tree API for mmap_region() Liam Howlett
2022-04-14 6:51 ` Andrew Morton
2022-04-19 17:57 ` Liam Howlett
2022-04-04 14:35 ` [PATCH v7 27/70] mm: Remove vmacache Liam Howlett
2022-04-04 14:35 ` [PATCH v7 29/70] mm/mmap: Move mmap_region() below do_munmap() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 28/70] mm: Convert vma_lookup() to use mtree_load() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 30/70] mm/mmap: Reorganize munmap to use maple states Liam Howlett
2022-04-04 14:35 ` [PATCH v7 32/70] arm64: Remove mmap linked list from vdso Liam Howlett
2022-04-04 14:35 ` [PATCH v7 31/70] mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 33/70] parisc: Remove mmap linked list from cache handling Liam Howlett
2022-04-04 14:35 ` [PATCH v7 34/70] powerpc: Remove mmap linked list walks Liam Howlett
2022-04-04 14:35 ` [PATCH v7 36/70] x86: Remove vma " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 37/70] xtensa: " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 35/70] s390: " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 39/70] optee: Remove vma linked list walk Liam Howlett
2022-04-04 14:35 ` [PATCH v7 38/70] cxl: " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 40/70] um: " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 42/70] exec: Use VMA iterator instead of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 41/70] coredump: Remove vma linked list walk Liam Howlett
2022-04-04 14:35 ` [PATCH v7 43/70] fs/proc/base: Use maple tree iterators in place of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 45/70] userfaultfd: Use maple tree iterator to iterate VMAs Liam Howlett
2022-04-04 14:35 ` Liam Howlett [this message]
2022-04-04 14:35 ` [PATCH v7 46/70] ipc/shm: Use VMA iterator instead of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 48/70] perf: Use VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 47/70] acct: Use VMA iterator instead of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 51/70] bpf: Remove VMA " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 50/70] fork: Use VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 49/70] sched: Use maple tree iterator to walk VMAs Liam Howlett
2022-04-04 14:35 ` [PATCH v7 52/70] mm/gup: Use maple tree navigation instead of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 53/70] mm/khugepaged: Stop using vma " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 54/70] mm/ksm: Use vma iterators instead of " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 55/70] mm/madvise: Use vma_find() " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 57/70] mm/mempolicy: Use vma iterator & maple state " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 56/70] mm/memcontrol: Stop using mm->highest_vm_end Liam Howlett
2022-04-04 14:35 ` [PATCH v7 59/70] mm/mprotect: Use maple tree navigation instead of vma linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 58/70] mm/mlock: Use vma iterator and " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 61/70] mm/msync: Use vma_find() " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 62/70] mm/oom_kill: Use maple tree iterators " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 60/70] mm/mremap: Use vma_find_intersection() " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 63/70] mm/pagewalk: Use vma_find() " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 65/70] i915: Use the VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 64/70] mm/swapfile: Use vma iterator instead of vma linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 66/70] nommu: Remove uses of VMA " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 67/70] riscv: Use vma iterator for vdso Liam Howlett
2022-04-04 14:35 ` [PATCH v7 69/70] mm/mmap: Drop range_has_overlap() function Liam Howlett
2022-04-04 14:35 ` [PATCH v7 68/70] mm: Remove the vma linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 70/70] mm/mmap.c: Pass in mapping to __vma_link_file() Liam Howlett
2022-04-14 6:50 ` [PATCH v7 00/70] Introducing the Maple Tree Andrew Morton
2022-04-14 7:39 ` Yu Zhao
2022-04-14 13:55 ` Matthew Wilcox
2022-04-14 13:57 ` Liam Howlett
2022-04-14 16:42 ` Liam Howlett
2022-04-14 16:57 ` Yu Zhao
2022-04-14 17:15 ` Liam Howlett
2022-04-14 19:19 ` Andrew Morton
2022-04-15 7:11 ` Yu Zhao
2022-04-16 1:03 ` Liam Howlett
2022-04-16 4:10 ` Yu Zhao
2022-04-16 15:19 ` Liam Howlett
2022-04-16 19:30 ` Yu Zhao
2022-04-19 15:51 ` Liam Howlett
2022-04-19 21:58 ` Yu Zhao
2022-04-19 23:18 ` Liam Howlett
2022-04-19 23:22 ` Yu Zhao
2022-04-20 13:43 ` Liam Howlett
2022-04-25 18:05 ` Yu Zhao
2022-04-25 19:58 ` Liam Howlett
2022-04-25 20:01 ` Yu Zhao
2022-04-19 19:22 ` Liam Howlett
2022-04-19 17:50 ` 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=20220404143501.2016403-45-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).