mm-mmap-vma_merge-fold-curr-next-assignment-logic.patch removed from -mm tree
The quilt patch titled
Subject: mm/mmap/vma_merge: fold curr, next assignment logic
has been removed from the -mm tree. Its filename was
mm-mmap-vma_merge-fold-curr-next-assignment-logic.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: mm/mmap/vma_merge: fold curr, next assignment logic
Date: Wed, 22 Mar 2023 20:18:58 +0000
Use find_vma_intersection() and vma_lookup() to both simplify the logic and to fold the end == next->vm_start condition into one block.
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.
This has no functional impact.
---
mm/mmap.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
mm/mmap.c renamed from mm/mmap.c~mm-mmap-vma_merge-fold-curr-next-assignment-logic +11 -13
@@ -917,15 +917,14 @@ struct vm_area_struct *vma_merge(structif (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; +/* Does the input range span an existing VMA? (cases 5 - 8) */ + curr =find_vma_intersection (mm, prev ? prev->vm_end :0 , end); -/* In cases 1 - 4 there's no CCCC vma */ -if (curr && end <= curr->vm_start) - curr =NULL ; +if (!curr ||/* cases 1 - 4 */ + end == curr->vm_end)/* cases 6 - 8, adjacent VMA */ + next =vma_lookup (mm, end); +else + next =NULL ;/* case 5 */ /* verify some invariant that must be enforced by the caller */ VM_WARN_ON (prev && addr <= prev->vm_start);
@@ -946,11 +945,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 [email protected] are