mm-introduce-vma_iter_store_attached-to-use-with-attached-vmas.patch removed from -mm tree
The quilt patch titled
Subject: mm: introduce vma_iter_store_attached() to use with attached vmas
has been removed from the -mm tree. Its filename was
mm-introduce-vma_iter_store_attached-to-use-with-attached-vmas.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: Suren Baghdasaryan <[email protected]>
Subject: mm: introduce vma_iter_store_attached() to use with attached vmas
Date: Thu, 13 Feb 2025 14:46:41 -0800
vma_iter_store() functions can be used both when adding a new vma and when updating an existing one. However for existing ones we do not need to mark them attached as they are already marked that way. With vma->detached being a separate flag, double-marking a vmas as attached or detached is not an issue because the flag will simply be overwritten with the same value. However once we fold this flag into the refcount later in this series, re-attaching or re-detaching a vma becomes an issue since these operations will be incrementing/decrementing a refcount.
Introduce vma_iter_store_new() and vma_iter_store_overwrite() to replace vma_iter_store() and avoid re-attaching a vma during vma update. Add assertions in vma_mark_attached()/vma_mark_detached() to catch invalid usage. Update vma tests to check for vma detached state correctness.
---
include/linux/mm.h | 14 +++++++++ mm/nommu.c | 4 +- mm/vma.c | 12 ++++---- mm/vma.h | 11 ++++++- tools/testing/vma/vma.c | 42 ++++++++++++++++++++++------- tools/testing/vma/vma_internal.h | 10 ++++++ 6 files changed, 74 insertions(+), 19 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-introduce-vma_iter_store_attached-to-use-with-attached-vmas +14 -0
@@ -821,8 +821,19 @@ static inline void vma_assert_locked(strvma_assert_write_locked (vma); } +static inline void vma_assert_attached (struct vm_area_struct *vma) +{ +WARN_ON_ONCE (vma->detached); +} + +static inline void vma_assert_detached (struct vm_area_struct *vma) +{ +WARN_ON_ONCE (!vma->detached); +} +static inline void vma_mark_attached (struct vm_area_struct *vma) { +vma_assert_detached (vma); vma->detached = false; }
@@ -830,6 +841,7 @@ static inline void vma_mark_detached(str {/* When detaching vma should be write-locked */ vma_assert_write_locked (vma); +vma_assert_attached (vma); vma->detached = true; }
@@ -866,6 +878,8 @@ static inline void vma_end_read(struct vstatic inline void vma_start_write (struct vm_area_struct *vma) {}static inline void vma_assert_write_locked (struct vm_area_struct *vma) {mmap_assert_write_locked (vma->vm_mm); } +static inline void vma_assert_attached (struct vm_area_struct *vma) {} +static inline void vma_assert_detached (struct vm_area_struct *vma) {}static inline void vma_mark_attached (struct vm_area_struct *vma) {}static inline void vma_mark_detached (struct vm_area_struct *vma) {}
mm/nommu.c renamed from mm/nommu.c~mm-introduce-vma_iter_store_attached-to-use-with-attached-vmas +2 -2
@@ -1191,7 +1191,7 @@ share:setup_vma_to_mm (vma, current->mm); current->mm->map_count++;/* add the VMA to the tree */ -vma_iter_store (&vmi, vma); +vma_iter_store_new (&vmi, vma);/* we flush the region from the icache only when the first executable * mapping of it is made */
@@ -1356,7 +1356,7 @@ static int split_vma(struct vma_iteratorsetup_vma_to_mm (vma, mm);setup_vma_to_mm (new, mm); -vma_iter_store (vmi, new); +vma_iter_store_new (vmi, new); mm->map_count++;return 0 ;
mm/vma.c renamed from mm/vma.c~mm-introduce-vma_iter_store_attached-to-use-with-attached-vmas +6 -6
@@ -320,7 +320,7 @@ static void vma_complete(struct vma_prep* us to insert it before dropping the locks * (it may either follow vma or precede it). */ -vma_iter_store (vmi, vp->insert); +vma_iter_store_new (vmi, vp->insert); mm->map_count++; }
@@ -700,7 +700,7 @@ static int commit_merge(struct vma_merge vmg->__adjust_middle_start ? vmg->middle : NULL);vma_set_range (vma, vmg->start, vmg->end, vmg->pgoff);vmg_adjust_set_range (vmg); -vma_iter_store (vmg->vmi, vmg->target); +vma_iter_store_overwrite (vmg->vmi, vmg->target);vma_complete (&vp, vmg->vmi, vma->vm_mm);
@@ -1711,7 +1711,7 @@ int vma_link(struct mm_struct *mm, strucreturn -ENOMEM ;vma_start_write (vma); -vma_iter_store (&vmi, vma); +vma_iter_store_new (&vmi, vma);vma_link_file (vma); mm->map_count++;validate_mm (mm);
@@ -2390,7 +2390,7 @@ static int __mmap_new_vma(struct mmap_st/* Lock the VMA since it is modified after insertion into VMA tree */ vma_start_write (vma); -vma_iter_store (vmi, vma); +vma_iter_store_new (vmi, vma); map->mm->map_count++;vma_link_file (vma);
@@ -2867,7 +2867,7 @@ int expand_upwards(struct vm_area_structanon_vma_interval_tree_pre_update_vma (vma); vma->vm_end = address;/* Overwrite old entry in mtree. */ -vma_iter_store (&vmi, vma); +vma_iter_store_overwrite (&vmi, vma);anon_vma_interval_tree_post_update_vma (vma);perf_event_mmap (vma);
@@ -2947,7 +2947,7 @@ int expand_downwards(struct vm_area_stru vma->vm_start = address; vma->vm_pgoff -= grow;/* Overwrite old entry in mtree. */ -vma_iter_store (&vmi, vma); +vma_iter_store_overwrite (&vmi, vma);anon_vma_interval_tree_post_update_vma (vma);perf_event_mmap (vma);
mm/vma.h renamed from mm/vma.h~mm-introduce-vma_iter_store_attached-to-use-with-attached-vmas +9 -2
@@ -413,9 +413,10 @@ static inline struct vm_area_struct *vma }/* Store a VMA with preallocated memory */ -static inline void vma_iter_store (struct vma_iterator *vmi, -struct vm_area_struct *vma) +static inline void vma_iter_store_overwrite (struct vma_iterator *vmi, +struct vm_area_struct *vma) { +vma_assert_attached (vma);#if defined(CONFIG_DEBUG_VM_MAPLE_TREE ) if (MAS_WARN_ON(&vmi->mas, vmi->mas.status != ma_start &&
@@ -438,7 +439,13 @@ static inline void vma_iter_store(struct__mas_set_range (&vmi->mas, vma->vm_start, vma->vm_end -1 );mas_store_prealloc (&vmi->mas, vma); +} + +static inline void vma_iter_store_new (struct vma_iterator *vmi, +struct vm_area_struct *vma) +{vma_mark_attached (vma); +vma_iter_store_overwrite (vmi, vma); }static inline unsigned long vma_iter_addr (struct vma_iterator *vmi)
tools/testing/vma/vma.c renamed from tools/testing/vma/vma.c~mm-introduce-vma_iter_store_attached-to-use-with-attached-vmas +33 -9
123 lines not on this page · raw message
tools/testing/vma/vma_internal.h renamed from tools/testing/vma/vma_internal.h~mm-introduce-vma_iter_store_attached-to-use-with-attached-vmas +10 -0
@@ -470,6 +470,16 @@ static inline void vma_lock_init(struct vma->vm_lock_seq =UINT_MAX ; } +static inline void vma_assert_attached (struct vm_area_struct *vma) +{ +WARN_ON_ONCE (vma->detached); +} + +static inline void vma_assert_detached (struct vm_area_struct *vma) +{ +WARN_ON_ONCE (!vma->detached); +} +static inline void vma_assert_write_locked (struct vm_area_struct *);static inline void vma_mark_attached (struct vm_area_struct *vma) {
_
Patches currently in -mm which might be from [email protected] are