The patch titled
Subject: mm/mmap/vma_merge: set next to NULL if not applicable
has been added to the -mm mm-unstable branch. Its filename is
mm-mmap-vma_merge-set-next-to-null-if-not-applicable.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-mmap-vma_merge-set-next-to-null-if-not-applicable.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Lorenzo Stoakes <lstoakes@xxxxxxxxx>
Subject: mm/mmap/vma_merge: set next to NULL if not applicable
Date: Sat, 18 Mar 2023 11:13:19 +0000
We are only interested in next if end == next->vm_start (in which case we
check to see if we can set merge_next), so perform this check alongside
checking whether curr should be set.
This groups all of the simple range checks together and establishes the
invariant that, if prev, curr or next are non-NULL then their positions
are as expected.
Additionally, use the abstract 'vma' object to look up the possible curr
or next VMA in order to avoid any confusion as to what these variables
represent - now curr and next are assigned once and only once.
This has no functional impact.
Link: https://lkml.kernel.org/r/4d717269303d8a6fe1d837968c252eeb6ff1d7e5.1679137163.git.lstoakes@xxxxxxxxx
Signed-off-by: Lorenzo Stoakes <lstoakes@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/mm/mmap.c~mm-mmap-vma_merge-set-next-to-null-if-not-applicable
+++ a/mm/mmap.c
@@ -930,15 +930,53 @@ struct vm_area_struct *vma_merge(struct
if (vm_flags & VM_SPECIAL)
return NULL;
- curr = find_vma(mm, prev ? prev->vm_end : 0);
- if (curr && curr->vm_end == end) /* cases 6, 7, 8 */
- next = find_vma(mm, curr->vm_end);
- else
- next = curr;
+ /*
+ * If there is a previous VMA specified, find the next, otherwise find
+ * the first.
+ */
+ vma = find_vma(mm, prev ? prev->vm_end : 0);
+
+ /*
+ * Does the input range span an existing VMA? If so, we designate this
+ * VMA 'curr'. The caller will have ensured that curr->vm_start == addr.
+ *
+ * Cases 5 - 8.
+ */
+ if (vma && end > vma->vm_start) {
+ curr = vma;
- /* In cases 1 - 4 there's no CCCC vma */
- if (curr && end <= curr->vm_start)
+ /*
+ * If the addr - end range spans this VMA entirely, then we
+ * check to see if another VMA follows it.
+ *
+ * If it is _immediately_ adjacent (checked below), then we
+ * designate it 'next' (cases 6 - 8).
+ */
+ if (curr->vm_end == end)
+ vma = find_vma(mm, curr->vm_end);
+ else
+ /* Case 5. */
+ vma = NULL;
+ } else {
+ /*
+ * The addr - end range either spans the end of prev or spans no
+ * VMA at all - in either case we dispense with 'curr' and
+ * maintain only 'prev' and (possibly) 'next'.
+ *
+ * Cases 1 - 4.
+ */
curr = NULL;
+ }
+
+ /*
+ * We only actually examine the next VMA if it is immediately adjacent
+ * to end which sits either at the end of a hole (cases 1 - 3), PPPP
+ * (case 4) or CCCC (cases 6 - 8).
+ */
+ if (vma && end == vma->vm_start)
+ next = vma;
+ else
+ next = NULL;
/* verify some invariant that must be enforced by the caller */
VM_WARN_ON(prev && addr <= prev->vm_start);
@@ -959,11 +997,10 @@ struct vm_area_struct *vma_merge(struct
}
}
/* Can we merge the successor? */
- if (next && end == next->vm_start &&
- mpol_equal(policy, vma_policy(next)) &&
- can_vma_merge_before(next, vm_flags,
- anon_vma, file, pgoff+pglen,
- vm_userfaultfd_ctx, anon_name)) {
+ if (next && mpol_equal(policy, vma_policy(next)) &&
+ can_vma_merge_before(next, vm_flags,
+ anon_vma, file, pgoff+pglen,
+ vm_userfaultfd_ctx, anon_name)) {
merge_next = true;
}
_
Patches currently in -mm which might be from lstoakes@xxxxxxxxx are
mm-remove-unused-vmf_insert_mixed_prot.patch
mm-remove-vmf_insert_pfn_xxx_prot-for-huge-page-table-entries.patch
drm-ttm-remove-comment-referencing-now-removed-vmf_insert_mixed_prot.patch
mm-prefer-xxx_page-alloc-free-functions-for-order-0-pages.patch
mm-refactor-do_fault_around.patch
mm-pefer-fault_around_pages-to-fault_around_bytes.patch
mm-mmap-vma_merge-further-improve-prev-next-vma-naming.patch
mm-mmap-vma_merge-set-next-to-null-if-not-applicable.patch
mm-mmap-vma_merge-extend-invariants-avoid-invalid-res-vma.patch
mm-mmap-vma_merge-be-explicit-about-the-non-mergeable-case.patch
fs-proc-kcore-avoid-bounce-buffer-for-ktext-data.patch
mm-vmalloc-use-rwsem-mutex-for-vmap_area_lock-and-vmap_block-lock.patch
fs-proc-kcore-convert-read_kcore-to-read_kcore_iter.patch
mm-vmalloc-convert-vread-to-vread_iter.patch
