mm-vma-adduse-vma-lockdep-acquire-release-defines.patch removed from -mm tree
The quilt patch titled
Subject: mm/vma: add+use vma lockdep acquire/release defines
has been removed from the -mm tree. Its filename was
mm-vma-adduse-vma-lockdep-acquire-release-defines.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/vma: add+use vma lockdep acquire/release defines
Date: Fri, 23 Jan 2026 20:12:14 +0000
The code is littered with inscrutable and duplicative lockdep incantations, replace these with defines which explain what is going on and add commentary to explain what we're doing.
If lockdep is disabled these become no-ops. We must use defines so _RET_IP_ remains meaningful.
These are self-documenting and aid readability of the code.
Additionally, instead of using the confusing rwsem_*() form for something that is emphatically not an rwsem, we instead explicitly use lock_[acquired, release]_shared/exclusive() lockdep invocations since we are doing something rather custom here and these make more sense to use.
No functional change intended.
---
include/linux/mmap_lock.h | 37 +++++++++++++++++++++++++++++++++--- mm/mmap_lock.c | 10 ++++----- 2 files changed, 39 insertions(+), 8 deletions(-)
include/linux/mmap_lock.h renamed from include/linux/mmap_lock.h~mm-vma-adduse-vma-lockdep-acquire-release-defines +34 -3
@@ -78,6 +78,37 @@ static inline void mmap_assert_write_loc#ifdef CONFIG_PER_VMA_LOCK +/* +* VMA locks do not behave like most ordinary locks found in the kernel, so we +* cannot quite have full lockdep tracking in the way we would ideally prefer. +* +* Read locks act as shared locks which exclude an exclusive lock being +* taken. We therefore mark these accordingly on read lock acquire/release. +* +* Write locks are acquired exclusively per-VMA, but released in a shared +* fashion, that is upon vma_end_write_all(), we update the mmap's seqcount such +* that write lock is released. +* +* We therefore cannot track write locks per-VMA, nor do we try. Mitigating this +* is the fact that, of course, we do lockdep-track the mmap lock rwsem which +* must be held when taking a VMA write lock. +* +* We do, however, want to indicate that during either acquisition of a VMA +* write lock or detachment of a VMA that we require the lock held be exclusive, +* so we utilise lockdep to do so. +*/ +#define __vma_lockdep_acquire_read (vma) \ + lock_acquire_shared(&vma->vmlock_dep_map, 0, 1, NULL, _RET_IP_) +#define __vma_lockdep_release_read (vma) \ + lock_release(&vma->vmlock_dep_map, _RET_IP_) +#define __vma_lockdep_acquire_exclusive (vma) \ + lock_acquire_exclusive(&vma->vmlock_dep_map, 0, 0, NULL, _RET_IP_) +#define __vma_lockdep_release_exclusive (vma) \ + lock_release(&vma->vmlock_dep_map, _RET_IP_) +/* Only meaningful if CONFIG_LOCK_STAT is defined. */ +#define __vma_lockdep_stat_mark_acquired (vma) \ + lock_acquired(&vma->vmlock_dep_map, _RET_IP_) +static inline void mm_lock_seqcount_init (struct mm_struct *mm) {seqcount_init (&mm->mm_lock_seq);
@@ -176,9 +207,9 @@ static inline void vma_refcount_put(strustruct mm_struct *mm = vma->vm_mm;int newcnt; -rwsem_release (&vma->vmlock_dep_map, _RET_IP_); - +__vma_lockdep_release_read (vma); newcnt =__vma_refcount_put_return (vma); +/* * __vma_enter_locked() may be sleeping waiting for readers to drop * their reference count, so wake it up if we were the last reader
@@ -207,7 +238,7 @@ static inline bool vma_start_read_locked VM_REFCNT_LIMIT)))return false; -rwsem_acquire_read (&vma->vmlock_dep_map,0 ,1 , _RET_IP_); +__vma_lockdep_acquire_read (vma);return true; }
mm/mmap_lock.c renamed from mm/mmap_lock.c~mm-vma-adduse-vma-lockdep-acquire-release-defines +5 -5
@@ -72,7 +72,7 @@ static inline int __vma_enter_locked(strif (!refcount_add_not_zero (VM_REFCNT_EXCLUDE_READERS_FLAG , &vma->vm_refcnt))return 0 ; -rwsem_acquire (&vma->vmlock_dep_map,0 ,0 , _RET_IP_); +__vma_lockdep_acquire_exclusive (vma); err =rcuwait_wait_event (&vma->vm_mm->vma_writer_wait,refcount_read (&vma->vm_refcnt) == tgt_refcnt, state);
@@ -85,10 +85,10 @@ static inline int __vma_enter_locked(strWARN_ON_ONCE (!detaching); err =0 ; } -rwsem_release (&vma->vmlock_dep_map, _RET_IP_); +__vma_lockdep_release_exclusive (vma);return err; } -lock_acquired (&vma->vmlock_dep_map, _RET_IP_); +__vma_lockdep_stat_mark_acquired (vma);return 1 ; }
@@ -97,7 +97,7 @@ static inline void __vma_exit_locked(str { *detached =refcount_sub_and_test (VM_REFCNT_EXCLUDE_READERS_FLAG , &vma->vm_refcnt); -rwsem_release (&vma->vmlock_dep_map, _RET_IP_); +__vma_lockdep_release_exclusive (vma); } int __vma_start_write(struct vm_area_struct *vma, unsigned int mm_lock_seq,
@@ -204,7 +204,7 @@ static inline struct vm_area_struct *vma goto err; } -rwsem_acquire_read (&vma->vmlock_dep_map,0 ,1 , _RET_IP_); +__vma_lockdep_acquire_read (vma);if (unlikely (vma->vm_mm != mm)) goto err_unstable;
_
Patches currently in -mm which might be from [email protected] are
mm-vma-remove-__private-sparse-decoration-from-vma_flags_t.patch mm-rename-vma_flag_test-set_atomic-to-vma_test-set_atomic_flag.patch mm-add-mk_vma_flags-bitmap-flag-macro-helper.patch tools-bitmap-add-missing-bitmap_.patch mm-add-basic-vma-flag-operation-helper-functions.patch mm-update-hugetlbfs-to-use-vma-flags-on-mmap_prepare.patch mm-update-secretmem-to-use-vma-flags-on-mmap_prepare.patch mm-update-secretmem-to-use-vma-flags-on-mmap_prepare-fix.patch mm-update-shmem__file_-functions-to-use-vma_flags_t.patch mm-update-all-remaining-mmap_prepare-users-to-use-vma_flags_t.patch mm-make-vm_area_desc-utilise-vma_flags_t-only.patch tools-testing-vma-separate-vma-userland-tests-into-separate-files.patch tools-testing-vma-separate-out-vma_internalh-into-logical-headers.patch tools-testing-vma-separate-out-vma_internalh-into-logical-headers-fix.patch tools-testing-vma-add-vma-userland-tests-for-vma-flag-functions.patch