Skip to content

mm: Unconditional per-VMA locks and cleanups

Suren Baghdasaryan linux-mm lkml netdev 5 versions – Applied

Status from this message: [merged mm-stable] tcp-remove-mmap_lock-fallback-path.patch removed from -mm tree

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest5 patches 5 repliesApplied 5/5
  2. v65 patches 14 repliesSuperseded
  3. v55 patches 2 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v45 patches30 repliesSuperseded
v35 patches42 repliesSuperseded

Patches in v7 All 5 applied

#Subject and filesSizeRepliesApplied
1/5mm: Make per-VMA locks available universallyarch/arm/Kconfig arch/arm64/Kconfig arch/loongarch/Kconfig +25 more+48 -3163 repliesApplied
2/5binder: Make shrinker rely solely on per-VMA lockdrivers/android/binder_alloc.c+21 -251 replyApplied
3/5mm: Add RCU-based VMA lookup helper that waits for writersinclude/linux/mmap_lock.h mm/mmap_lock.c mm/userfaultfd.c+54 -60 repliesApplied
4/5binder: Remove mmap_lock fallbackdrivers/android/binder/page_range.rs drivers/android/binder_alloc.c rust/kernel/mm.rs+36 -280 repliesApplied
5/5tcp: Remove mmap_lock fallback pathnet/ipv4/tcp.c+9 -221 replyApplied

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by.

PatchLorenzo Stoakes (ARM)Vlastimil Babka (SUSE)Alice RyhlCarlos Llamas[email protected]David Hildenbrand (Arm)
1/5R-b A-b A-b
2/5A-b R-b A-b
3/5R-b A-b
4/5A-b R-b
5/5A-b A-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v7 thread

Cover letter [PATCH v7 0/5] mm: Unconditional per-VMA locks and cleanups

v2 version of this patchset [1] was written by Dave Hansen and per his request, I'm taking over this series.

tl;dr: Make per-VMA locks available in all configs. Simplify some of the per-VMA lock users now that they can rely on them being always available.

Binder and networking folks: Your code is the target of the cleanups. I'm cc'ing you now on v2 because there's emerging consensus on the mm side that the approach here is sane. I'm not quite sure how this pile would get merged, but ack/review tags would be appreciated if this looks good to you.

Longer version:

When working on some x86 shadow stack code, it was a real pain to avoid causing recursive locking problems with mmap_lock. One way to avoid those was to avoid mmap_lock and use per-VMA locks instead. They are great, but they are not available in all configs which makes them unusable in generic code, or if you want to completely avoid mmap_lock.

Make per-VMA locks available in all configs. Right now, they are only available on select architectures when SMP and MMU are enabled. But all of the primitives that per-VMA locks are built on (RCU, maple trees, refcounts) work just fine without SMP or MMU.

The only real downside is that making VMAs a wee bit bigger on !MMU and !SMP builds.

The upside is much cleaner code, lower complexity and less #ifdeffery.

Clean up a binder VMA locking site now that it can rely on per-VMA locks.

Building on top of universally-available per-VMA locks, introduce a new helper. Since the new API does not require callers to have a fallback to mmap_lock, it's much easier to use. Callers can potentially replace this very common kernel idiom:

	mmap_read_lock(mm);
	vma = vma_lookup()
	// fiddle with vma
	mmap_read_unlock(mm);

with:

	vma = vma_start_read_unlocked(mm, address);
	// fiddle with vma
	vma_end_read(vma);

Which avoids mmap_lock entirely in the fast path.

Use that new API for another binder site and one in the TCP code.

Cc Suren Baghdasaryan <[email protected]>
Cc Andrew Morton <[email protected]>
Cc "Liam R. Howlett" <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Jann Horn <[email protected]>
Cc Shakeel Butt <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arve Hjønnevåg <[email protected]>
Cc Todd Kjos <[email protected]>
Cc Christian Brauner <[email protected]>
Cc Carlos Llamas <[email protected]>
Cc Alice Ryhl <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc David Ahern <[email protected]>

Changes since v6 [2]:
- Rebased over mm-unstable
Patch 1:
- Added Reviewed-by, per Lorenzo Stoakes Patch 2:
- Added Acked-by, per Carlos Llamas
Patch 4:
- Added INVARIANT comment, per Sashiko and Alice Ryhl

Applies cleanly over mm-unstable

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/

Dave Hansen (5):
mm: Make per-VMA locks available universally
binder: Make shrinker rely solely on per-VMA lock
mm: Add RCU-based VMA lookup helper that waits for writers
binder: Remove mmap_lock fallback
tcp: Remove mmap_lock fallback path

 arch/arm/Kconfig                       |  1 -
 arch/arm64/Kconfig                     |  1 -
 arch/loongarch/Kconfig                 |  1 -
 arch/powerpc/platforms/powernv/Kconfig |  1 -
 arch/powerpc/platforms/pseries/Kconfig |  1 -
 arch/riscv/Kconfig                     |  1 -
 arch/s390/Kconfig                      |  1 -
 arch/x86/Kconfig                       |  2 -
 drivers/android/binder/page_range.rs   | 19 +-----
 drivers/android/binder_alloc.c         | 63 +++++++----------
 fs/proc/internal.h                     |  2 -
 fs/proc/task_mmu.c                     | 93 -------------------------
 include/linux/mm.h                     | 12 ----
 include/linux/mm_types.h               |  8 +--
 include/linux/mmap_lock.h              | 94 +++++++++++---------------
 kernel/bpf/stackmap.c                  | 17 ++---
 kernel/bpf/task_iter.c                 |  2 +-
 kernel/fork.c                          |  2 -
 mm/Kconfig                             | 12 ----
 mm/Kconfig.debug                       |  1 -
 mm/debug.c                             |  4 --
 mm/init-mm.c                           |  2 -
 mm/memory.c                            |  2 -
 mm/mmap_lock.c                         | 61 ++++++++++-------
 mm/pagewalk.c                          |  2 -
 mm/rmap.c                              |  2 -
 mm/userfaultfd.c                       | 61 ++---------------
 net/ipv4/tcp.c                         | 31 +++------
 rust/kernel/mm.rs                      | 58 ++++++++++------
 tools/testing/vma/include/dup.h        |  5 +-
 tools/testing/vma/vma_internal.h       |  1 -
 31 files changed, 167 insertions(+), 396 deletions(-)

base-commit: 42d64d4fef83a241c919c8693fdf0a21b2cb6061

Signature · 1 line
2.55.0.966.g6673acef38-goog