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 57/70] mm/mempolicy: Use vma iterator & maple state instead of vma linked list
Date: Mon, 4 Apr 2022 14:35:54 +0000 [thread overview]
Message-ID: <20220404143501.2016403-58-Liam.Howlett@oracle.com> (raw)
In-Reply-To: <20220404143501.2016403-1-Liam.Howlett@oracle.com>
From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
Reworked the way mbind_range() finds the first VMA to reuse the maple
state and limit the number of tree walks needed.
Note, this drops the VM_BUG_ON(!vma) call, which would catch a start
address higher than the last VMA. The code was written in a way that
allowed no VMA updates to occur and still return success. There should
be no functional change to this scenario with the new code.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
mm/mempolicy.c | 55 ++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 24 deletions(-)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index a2516d31db6c..a8f07b60dc6d 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -380,9 +380,10 @@ void mpol_rebind_task(struct task_struct *tsk, const nodemask_t *new)
void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new)
{
struct vm_area_struct *vma;
+ VMA_ITERATOR(vmi, mm, 0);
mmap_write_lock(mm);
- for (vma = mm->mmap; vma; vma = vma->vm_next)
+ for_each_vma(vmi, vma)
mpol_rebind_policy(vma->vm_policy, new);
mmap_write_unlock(mm);
}
@@ -655,7 +656,7 @@ static unsigned long change_prot_numa(struct vm_area_struct *vma,
static int queue_pages_test_walk(unsigned long start, unsigned long end,
struct mm_walk *walk)
{
- struct vm_area_struct *vma = walk->vma;
+ struct vm_area_struct *next, *vma = walk->vma;
struct queue_pages *qp = walk->private;
unsigned long endvma = vma->vm_end;
unsigned long flags = qp->flags;
@@ -670,9 +671,10 @@ static int queue_pages_test_walk(unsigned long start, unsigned long end,
/* hole at head side of range */
return -EFAULT;
}
+ next = find_vma(vma->vm_mm, vma->vm_end);
if (!(flags & MPOL_MF_DISCONTIG_OK) &&
((vma->vm_end < qp->end) &&
- (!vma->vm_next || vma->vm_end < vma->vm_next->vm_start)))
+ (!next || vma->vm_end < next->vm_start)))
/* hole at middle or tail of range */
return -EFAULT;
@@ -786,26 +788,24 @@ static int vma_replace_policy(struct vm_area_struct *vma,
static int mbind_range(struct mm_struct *mm, unsigned long start,
unsigned long end, struct mempolicy *new_pol)
{
+ MA_STATE(mas, &mm->mm_mt, start - 1, start - 1);
struct vm_area_struct *prev;
struct vm_area_struct *vma;
int err = 0;
pgoff_t pgoff;
- unsigned long vmstart;
- unsigned long vmend;
-
- vma = find_vma(mm, start);
- VM_BUG_ON(!vma);
- prev = vma->vm_prev;
- if (start > vma->vm_start)
- prev = vma;
+ prev = mas_find_rev(&mas, 0);
+ if (prev && (start < prev->vm_end))
+ vma = prev;
+ else
+ vma = mas_next(&mas, end - 1);
- for (; vma && vma->vm_start < end; prev = vma, vma = vma->vm_next) {
- vmstart = max(start, vma->vm_start);
- vmend = min(end, vma->vm_end);
+ for (; vma; vma = mas_next(&mas, end - 1)) {
+ unsigned long vmstart = max(start, vma->vm_start);
+ unsigned long vmend = min(end, vma->vm_end);
if (mpol_equal(vma_policy(vma), new_pol))
- continue;
+ goto next;
pgoff = vma->vm_pgoff +
((vmstart - vma->vm_start) >> PAGE_SHIFT);
@@ -814,6 +814,8 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
new_pol, vma->vm_userfaultfd_ctx,
anon_vma_name(vma));
if (prev) {
+ /* vma_merge() invalidated the mas */
+ mas_pause(&mas);
vma = prev;
goto replace;
}
@@ -821,19 +823,24 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
err = split_vma(vma->vm_mm, vma, vmstart, 1);
if (err)
goto out;
+ /* split_vma() invalidated the mas */
+ mas_pause(&mas);
}
if (vma->vm_end != vmend) {
err = split_vma(vma->vm_mm, vma, vmend, 0);
if (err)
goto out;
+ /* mas_pause() unnecessary as the loop is ending */
}
- replace:
+replace:
err = vma_replace_policy(vma, new_pol);
if (err)
goto out;
+next:
+ prev = vma;
}
- out:
+out:
return err;
}
@@ -1048,6 +1055,7 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
int flags)
{
nodemask_t nmask;
+ struct vm_area_struct *vma;
LIST_HEAD(pagelist);
int err = 0;
struct migration_target_control mtc = {
@@ -1063,8 +1071,9 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
* need migration. Between passing in the full user address
* space range and MPOL_MF_DISCONTIG_OK, this call can not fail.
*/
+ vma = find_vma(mm, 0);
VM_BUG_ON(!(flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)));
- queue_pages_range(mm, mm->mmap->vm_start, mm->task_size, &nmask,
+ queue_pages_range(mm, vma->vm_start, mm->task_size, &nmask,
flags | MPOL_MF_DISCONTIG_OK, &pagelist);
if (!list_empty(&pagelist)) {
@@ -1193,13 +1202,12 @@ static struct page *new_page(struct page *page, unsigned long start)
{
struct vm_area_struct *vma;
unsigned long address;
+ VMA_ITERATOR(vmi, current->mm, start);
- vma = find_vma(current->mm, start);
- while (vma) {
+ for_each_vma(vmi, vma) {
address = page_address_in_vma(page, vma);
if (address != -EFAULT)
break;
- vma = vma->vm_next;
}
if (PageHuge(page)) {
@@ -1482,6 +1490,7 @@ SYSCALL_DEFINE4(set_mempolicy_home_node, unsigned long, start, unsigned long, le
unsigned long vmend;
unsigned long end;
int err = -ENOENT;
+ VMA_ITERATOR(vmi, mm, start);
start = untagged_addr(start);
if (start & ~PAGE_MASK)
@@ -1507,9 +1516,7 @@ SYSCALL_DEFINE4(set_mempolicy_home_node, unsigned long, start, unsigned long, le
if (end == start)
return 0;
mmap_write_lock(mm);
- vma = find_vma(mm, start);
- for (; vma && vma->vm_start < end; vma = vma->vm_next) {
-
+ for_each_vma_range(vmi, vma, end) {
vmstart = max(start, vma->vm_start);
vmend = min(end, vma->vm_end);
new = mpol_dup(vma_policy(vma));
--
2.34.1
next prev parent reply other threads:[~2022-04-04 14:40 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 ` [PATCH v7 44/70] fs/proc/task_mmu: Stop using linked list and highest_vm_end Liam Howlett
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 49/70] sched: Use maple tree iterator to walk VMAs Liam Howlett
2022-04-04 14:35 ` [PATCH v7 50/70] fork: Use VMA iterator 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 ` Liam Howlett [this message]
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 58/70] mm/mlock: Use vma iterator and instead of vma linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 59/70] mm/mprotect: Use maple tree navigation " 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-58-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).