Skip to content

Per-VMA lock support for swap and userfaults

Suren Baghdasaryan linux-fsdevel linux-mm lkml 6 versions – Applied

Status from this message: [merged mm-stable] mm-handle-userfaults-under-vma-lock.patch removed from -mm tree

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest6 patches 18 repliesApplied 6/6
  2. v66 patches 4 repliesSuperseded
  3. v56 patches 7 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v46 patches8 repliesSuperseded
v38 patches18 repliesSuperseded
v26 patches29 repliesSuperseded

Patches in v7 All 6 applied

#Subject and filesSizeRepliesApplied
1/6swap: remove remnants of polling from read_swap_cache_asyncmm/madvise.c mm/swap.h mm/swap_state.c+7 -100 repliesApplied
2/6mm: add missing VM_FAULT_RESULT_TRACE name for VM_FAULT_COMPLETEDinclude/linux/mm_types.h+2 -10 repliesApplied
3/6mm: drop per-VMA lock when returning VM_FAULT_RETRY or VM_FAULT_COMPLETEDarch/arm64/mm/fault.c arch/powerpc/mm/fault.c arch/s390/mm/fault.c +2 more+20 -40 repliesApplied
4/6mm: change folio_lock_or_retry to use vm_fault directlyinclude/linux/pagemap.h mm/filemap.c mm/memory.c+24 -230 repliesApplied
5/6mm: handle swap page faults under per-VMA lockinclude/linux/mm.h mm/filemap.c mm/memory.c+31 -150 repliesApplied
6/6mm: handle userfaults under VMA lockfs/userfaultfd.c include/linux/mm.h mm/memory.c+38 -290 repliesApplied

Reviews trailers per patch

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

PatchHuang, YingChristoph HellwigPeter XuAlistair Popple
1/6R-b R-b
2/6R-b
3/6A-b
4/6A-b
5/6A-b T-b R-b
6/6A-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 4 reviewers.

Read the v7 thread

Cover letter [PATCH v7 0/6] Per-VMA lock support for swap and userfaults

When per-VMA locks were introduced in [1] several types of page faults would still fall back to mmap_lock to keep the patchset simple. Among them are swap and userfault pages. The main reason for skipping those cases was the fact that mmap_lock could be dropped while handling these faults and that required additional logic to be implemented.
Implement the mechanism to allow per-VMA locks to be dropped for these cases.
First, change handle_mm_fault to drop per-VMA locks when returning VM_FAULT_RETRY or VM_FAULT_COMPLETED to be consistent with the way mmap_lock is handled. Then change folio_lock_or_retry to accept vm_fault and return vm_fault_t which simplifies later patches. Finally allow swap and uffd page faults to be handled under per-VMA locks by dropping per-VMA and retrying, the same way it's done under mmap_lock. Naturally, once VMA lock is dropped that VMA should be assumed unstable and can't be used.

Changes since v6 posted at [2]
- 4/6 replaced the ternary operation in folio_lock_or_retry, per Matthew Wilcox
- 4/6 changed return code description for __folio_lock_or_retry per Matthew Wilcox

Note: patch 3/6 will cause a trivial merge conflict in arch/arm64/mm/fault.c when applied over mm-unstable branch due to a patch from ARM64 tree [3] which is missing in mm-unstable.

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

Suren Baghdasaryan (6):
swap: remove remnants of polling from read_swap_cache_async
mm: add missing VM_FAULT_RESULT_TRACE name for VM_FAULT_COMPLETED
mm: drop per-VMA lock when returning VM_FAULT_RETRY or
VM_FAULT_COMPLETED
mm: change folio_lock_or_retry to use vm_fault directly
mm: handle swap page faults under per-VMA lock
mm: handle userfaults under VMA lock

 arch/arm64/mm/fault.c    |  3 ++-
 arch/powerpc/mm/fault.c  |  3 ++-
 arch/s390/mm/fault.c     |  3 ++-
 arch/x86/mm/fault.c      |  3 ++-
 fs/userfaultfd.c         | 34 ++++++++++++----------------
 include/linux/mm.h       | 37 ++++++++++++++++++++++++++++++
 include/linux/mm_types.h |  3 ++-
 include/linux/pagemap.h  | 11 +++++----
 mm/filemap.c             | 37 +++++++++++++++---------------
 mm/madvise.c             |  4 ++--
 mm/memory.c              | 49 ++++++++++++++++++++++------------------
 mm/swap.h                |  1 -
 mm/swap_state.c          | 12 ++++------
 13 files changed, 120 insertions(+), 80 deletions(-)
Signature · 1 line
2.41.0.255.g8b1d071c50-goog