mm-eliminate-adj_start-parameter-from-commit_merge.patch removed from -mm tree
The quilt patch titled
Subject: mm: eliminate adj_start parameter from commit_merge()
has been removed from the -mm tree. Its filename was
mm-eliminate-adj_start-parameter-from-commit_merge.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: eliminate adj_start parameter from commit_merge()
Date: Fri, 31 Jan 2025 12:31:51 +0000
Introduce internal vmg->__adjust_middle_start and vmg->__adjust_next_start merge flags, enabling us to indicate to commit_merge() that we are performing a merge which either spans only part of vmg->middle, or part of vmg->next respectively.
In the former instance, we change the start of vmg->middle to match the attributes of vmg->prev, without spanning all of vmg->middle.
This implies that vmg->prev->vm_end and vmg->middle->vm_start are both increased to form the new merged VMA (vmg->prev) and the new subsequent VMA (vmg->middle).
In the latter case, we change the end of vmg->middle to match the attributes of vmg->next, without spanning all of vmg->next.
This implies that vmg->middle->vm_end and vmg->next->vm_start are both decreased to form the new merged VMA (vmg->next) and the new prior VMA (vmg->middle).
Since we now have a stable set of prev, middle, next VMAs threaded through vmg and with these flags set know what is happening, we can perform the calculation in commit_merge() instead.
This allows us to drop the confusing adj_start parameter and instead pass semantic information to commit_merge().
In the latter case the -(middle->vm_end - start) calculation becomes -(middle->vm-end - vmg->end), however this is correct as vmg->end is set to the start parameter.
This is because in this case (rather confusingly), we manipulate vmg->middle, but ultimately return vmg->next, whose range will be correctly specified. At this point vmg->start, end is the new range for the prior VMA rather than the merged one.
This patch has no change in functional behaviour.
---
mm/debug.c | 8 ++++-- mm/vma.c | 50 ++++++++++++++++++++++---------------- mm/vma.h | 10 +++++++ tools/testing/vma/vma.c | 2 + 4 files changed, 48 insertions(+), 22 deletions(-)
mm/debug.c renamed from mm/debug.c~mm-eliminate-adj_start-parameter-from-commit_merge +6 -2
@@ -267,7 +267,9 @@ void dump_vmg(const struct vma_merge_str"uffd_ctx %px\n" "anon_name %px\n" "state %x\n" -"just_expand %d __remove_middle %d __remove_next %d\n" , +"just_expand %d\n" +"__adjust_middle_start %d __adjust_next_start %d\n" +"__remove_middle %d __remove_next %d\n" , vmg, vmg->mm, vmg->pgoff, vmg->vmi, vmg->vmi ?vma_iter_addr (vmg->vmi) :0 , vmg->vmi ? vma_iter_end(vmg->vmi) : 0,
@@ -281,7 +283,9 @@ void dump_vmg(const struct vma_merge_str#endif vmg->anon_name, (int )vmg->state, - vmg->just_expand, vmg->__remove_middle, vmg->__remove_next); + vmg->just_expand, + vmg->__adjust_middle_start, vmg->__adjust_next_start, + vmg->__remove_middle, vmg->__remove_next);if (vmg->mm) {pr_warn ("vmg %px mm:\n" , vmg);
mm/vma.c renamed from mm/vma.c~mm-eliminate-adj_start-parameter-from-commit_merge +30 -20
103 lines not on this page · raw message
mm/vma.h renamed from mm/vma.h~mm-eliminate-adj_start-parameter-from-commit_merge +10 -0
@@ -121,6 +121,16 @@ struct vma_merge_struct {/* Internal flags set during merge process: */ /* +* Internal flag indicating the merge increases vmg->middle->vm_start +* (and thereby, vmg->prev->vm_end). +*/ + bool __adjust_middle_start :1; +/* +* Internal flag indicating the merge decreases vmg->next->vm_start +* (and thereby, vmg->middle->vm_end). +*/ + bool __adjust_next_start :1; +/* * Internal flag used during the merge operation to indicate we will * remove vmg->middle. */
tools/testing/vma/vma.c renamed from tools/testing/vma/vma.c~mm-eliminate-adj_start-parameter-from-commit_merge +2 -0
@@ -159,6 +159,8 @@ static void vmg_set_range(struct vma_mer vmg->just_expand = false; vmg->__remove_middle = false; vmg->__remove_next = false; + vmg->__adjust_middle_start = false; + vmg->__adjust_next_start = false; }/*
_
Patches currently in -mm which might be from [email protected] are
mm-mremap-correctly-handle-partial-mremap-of-vma-starting-at-0.patch mm-mremap-refactor-mremap-system-call-implementation.patch mm-mremap-introduce-and-use-vma_remap_struct-threaded-state.patch mm-mremap-initial-refactor-of-move_vma.patch mm-mremap-complete-refactor-of-move_vma.patch mm-mremap-refactor-move_page_tables-abstracting-state.patch mm-mremap-thread-state-through-move-page-table-operation.patch