mm-remove-re-walk-from-mmap_region.patch removed from -mm tree
The quilt patch titled
Subject: mm: remove re-walk from mmap_region()
has been removed from the -mm tree. Its filename was
mm-remove-re-walk-from-mmap_region.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: "Liam R. Howlett" <[email protected]>
Subject: mm: remove re-walk from mmap_region()
Date: Mon, 24 Jul 2023 14:31:48 -0400
Using vma_iter_set() will reset the tree and cause a re-walk. Use vmi_iter_config() to set the write to a sub-set of the range. Change the file case to also use vmi_iter_config() so that the end is correctly set.
---
mm/internal.h | 8 ++++++++ mm/mmap.c | 15 ++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-)
mm/internal.h renamed from mm/internal.h~mm-remove-re-walk-from-mmap_region +8 -0
@@ -1041,6 +1041,14 @@ static inline bool vma_soft_dirty_enablereturn !(vma->vm_flags &VM_SOFTDIRTY ); } +static inline void vma_iter_config (struct vma_iterator *vmi, +unsigned long index,unsigned long last) +{ +MAS_BUG_ON (&vmi->mas, vmi->mas.node !=MAS_START && + (vmi->mas.index > index || vmi->mas.last < index)); +__mas_set_range (&vmi->mas, index, last -1 ); +} +/* * VMA Iterator functions shared between nommu and mmap */
mm/mmap.c renamed from mm/mmap.c~mm-remove-re-walk-from-mmap_region +10 -5
@@ -2676,8 +2676,11 @@ unsigned long mmap_region(struct file *f next =vma_next (&vmi); prev =vma_prev (&vmi); -if (vm_flags &VM_SPECIAL ) +if (vm_flags &VM_SPECIAL ) { +if (prev) +vma_iter_next_range (&vmi); goto cannot_expand; + }/* Attempt to expand an old mapping */ /* Check next */
@@ -2698,6 +2701,8 @@ unsigned long mmap_region(struct file *f merge_start = prev->vm_start; vma = prev; vm_pgoff = prev->vm_pgoff; + }else if (prev) { +vma_iter_next_range (&vmi); }
@@ -2708,9 +2713,9 @@ unsigned long mmap_region(struct file *f goto expanded; } +if (vma == prev) +vma_iter_set (&vmi, addr); cannot_expand: -if (prev) -vma_iter_next_range (&vmi);/* * Determine the object being mapped and call the appropriate
@@ -2723,7 +2728,7 @@ cannot_expand: goto unacct_error; } -vma_iter_set (&vmi, addr); +vma_iter_config (&vmi, addr, end); vma->vm_start = addr; vma->vm_end = end;vm_flags_init (vma, vm_flags);
@@ -2750,7 +2755,7 @@ cannot_expand:if (WARN_ON ((addr != vma->vm_start))) goto close_and_free_vma; -vma_iter_set (&vmi, addr); +vma_iter_config (&vmi, addr, end);/* * If vm_flags changed after call_mmap(), we should try merge * vma again as we may succeed this time.
_
Patches currently in -mm which might be from [email protected] are
maple_tree-add-hex-output-to-maple_arange64-dump.patch maple_tree-reorder-replacement-of-nodes-to-avoid-live-lock.patch maple_tree-introduce-mas_put_in_tree.patch maple_tree-introduce-mas_tree_parent-definition.patch maple_tree-change-mas_adopt_children-parent-usage.patch maple_tree-replace-data-before-marking-dead-in-split-and-spanning-store.patch