The quilt patch titled
Subject: mm/mmap/vma_merge: use the proper vma pointer in case 3
has been removed from the -mm tree. Its filename was
mm-mmap-vma_merge-use-the-proper-vma-pointer-in-case-3.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: Vlastimil Babka <vbabka@xxxxxxx>
Subject: mm/mmap/vma_merge: use the proper vma pointer in case 3
Date: Thu, 9 Mar 2023 12:12:50 +0100
In case 3 we we use 'next' for everything but vma_pgoff. So use 'next'
for that as well, instead of 'mid', for consistency. Then in case 8 we
have to use 'mid' explicitly, which should also make the intent more
obvious.
Adjust the diagram for cases 1-3 in the comment to match the code - we are
using 'next' for case 3 so mark the range with XXXX instead of NNNN. For
case 2 that's a no-op as the code doesn't touch 'next' or 'mid'. For case
1 it's now wrong but that will be fixed next.
No functional change.
Link: https://lkml.kernel.org/r/20230309111258.24079-3-vbabka@xxxxxxx
Signed-off-by: Vlastimil Babka <vbabka@xxxxxxx>
Reviewed-by: Lorenzo Stoakes <lstoakes@xxxxxxxxx>
Reviewed-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: Suren Baghdasaryan <surenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mmap.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- a/mm/mmap.c~mm-mmap-vma_merge-use-the-proper-vma-pointer-in-case-3
+++ a/mm/mmap.c
@@ -857,11 +857,11 @@ can_vma_merge_after(struct vm_area_struc
* mmap, brk or case 4 below case 5 below
* mremap move:
* AAAA AAAA
- * PPPP NNNN PPPPNNNNXXXX
+ * PPPP XXXX PPPPNNNNXXXX
* might become might become
* PPPPPPPPPPPP 1 or PPPPPPPPPPPP 6 or
- * PPPPPPPPNNNN 2 or PPPPPPPPXXXX 7 or
- * PPPPNNNNNNNN 3 PPPPXXXXXXXX 8
+ * PPPPPPPPXXXX 2 or PPPPPPPPXXXX 7 or
+ * PPPPXXXXXXXX 3 PPPPXXXXXXXX 8
*
* It is important for case 8 that the vma NNNN overlapping the
* region AAAA is never going to extended over XXXX. Instead XXXX must
@@ -978,9 +978,10 @@ struct vm_area_struct *vma_merge(struct
vma = next; /* case 3 */
vma_start = addr;
vma_end = next->vm_end;
- vma_pgoff = mid->vm_pgoff;
+ vma_pgoff = next->vm_pgoff;
err = 0;
if (mid != next) { /* case 8 */
+ vma_pgoff = mid->vm_pgoff;
remove = mid;
err = dup_anon_vma(next, mid);
}
_
Patches currently in -mm which might be from vbabka@xxxxxxx are
mm-page_alloc-use-check_pages_enabled-static-key-to-check-tail-pages.patch
