Skip to content

mm/mremap: permit mremap() move of multiple VMAs

Lorenzo Stoakes linux-api linux-fsdevel linux-mm lkml 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest10 patches 3 repliesIn review 9 of 10 applied
  2. v310 patches 9 repliesSuperseded
  3. v210 patches 0 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v110 patches19 repliesSuperseded

Changes in v4 from the cover letter

* Folded Some nitty review comments into series.
* Re-establish VMA iterator reset on unmap pertinent to move as it turns out the maple tree nodes of a nearby unmapped VMA can indeed cause us to walk into nodes that have been removed.
* Replaced VMA iterator reset with invalidation, as reset will rewalk to the iterator index, and what we require is a pau... invalidation :)

Patches in v4 9 of 10 applied

#Subject and filesSizeRepliesApplied
1/10mm/mremap: perform some simple cleanupsmm/mremap.c+32 -230 repliesApplied
2/10mm/mremap: refactor initial parameter sanity checksmm/mremap.c+14 -150 repliesApplied
3/10mm/mremap: put VMA check and prep logic into helper functionmm/mremap.c+28 -300 repliesApplied
4/10mm/mremap: cleanup post-processing stage of mremapmm/mremap.c+13 -90 repliesApplied
5/10mm/mremap: use an explicit uffd failure path for mremapfs/userfaultfd.c include/linux/userfaultfd_k.h mm/mremap.c+27 -90 repliesApplied
6/10mm/mremap: check remap conditions earliermm/mremap.c+19 -93 replies
7/10mm/mremap: move remap_is_valid() into check_prep_vma()mm/mremap.c+131 -1420 repliesApplied
8/10mm/mremap: clean up mlock populate behaviourmm/mremap.c+8 -50 repliesApplied
9/10mm/mremap: permit mremap() move of multiple VMAsmm/mremap.c+152 -70 repliesApplied
10/10tools/testing/selftests: extend mremap_test to test multi-VMA mremaptools/testing/selftests/mm/mremap_test.c+145 -10 repliesApplied

Reviews trailers per patch

9 of 10 patches have a Reviewed-by or Acked-by.

PatchVlastimil Babka
1/10R-b
2/10R-b
3/10R-b
4/10R-b
5/10R-b
6/10R-b
7/10R-b
8/10R-b
9/10R-b
10/10

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/10] mm/mremap: permit mremap() move of multiple VMAs

Historically we've made it a uAPI requirement that mremap() may only operate on a single VMA at a time.

For instances where VMAs need to be resized, this makes sense, as it becomes very difficult to determine what a user actually wants should they indicate a desire to expand or shrink the size of multiple VMAs (truncate? Adjust sizes individually? Some other strategy?).

However, in instances where a user is moving VMAs, it is restrictive to disallow this.

This is especially the case when anonymous mapping remap may or may not be mergeable depending on whether VMAs have or have not been faulted due to anon_vma assignment and folio index alignment with vma->vm_pgoff.

Often this can result in surprising impact where a moved region is faulted, then moved back and a user fails to observe a merge from otherwise compatible, adjacent VMAs.

This change allows such cases to work without the user having to be cognizant of whether a prior mremap() move or other VMA operations has resulted in VMA fragmentation.

In order to do this, this series performs a large amount of refactoring, most pertinently - grouping sanity checks together, separately those that check input parameters and those relating to VMAs.

we also simplify the post-mmap lock drop processing for uffd and mlock()'d VMAs.

With this done, we can then fairly straightforwardly implement this functionality.

This works exclusively for mremap() invocations which specify MREMAP_FIXED. It is not compatible with VMAs which use userfaultfd, as the notification of the userland fault handler would require us to drop the mmap lock.

It is also not compatible with file-backed mappings with customised get_unmapped_area() handlers as these may not honour MREMAP_FIXED.

The input and output addresses ranges must not overlap. We carefully account for moves which would result in VMA iterator invalidation.

While there can be gaps between VMAs in the input range, there can be no gap before the first VMA in the range.

v4:
* Folded Some nitty review comments into series.
* Re-establish VMA iterator reset on unmap pertinent to move as it turns out the maple tree nodes of a nearby unmapped VMA can indeed cause us to walk into nodes that have been removed.
* Replaced VMA iterator reset with invalidation, as reset will rewalk to the iterator index, and what we require is a pau... invalidation :)

v3:
* Disallowed move operation except for MREMAP_FIXED.
* Disallow gap at start of aggregate range to avoid confusion.
* Disallow any file-baked VMAs with custom get_unmapped_area.
* Renamed multi_vma to seen_vma to be clearer. Stop reusing new_addr, use separate target_addr var to track next target address.
* Check if first VMA fails multi VMA check, if so we'll allow one VMA but not multiple.
* Updated the commit message for patch 9 to be clearer about gap behaviour.
* Removed accidentally included debug goto statement in test (doh!). Test was and is passing regardless.
* Unmap target range in test, previously we ended up moving additional VMAs unintentionally. This still all passed :) but was not what was intended.
* Removed self-merge check - there is absolutely no way this can happen across multiple VMAs, as there is no means of moving VMAs such that a VMA merges with itself.
https://lore.kernel.org/all/[email protected]/

v2:
* Squashed uffd stub fix into series.
* Propagated tags, thanks!
* Fixed param naming in patch 4 as per Vlastimil.
* Renamed vma_reset to vmi_needs_reset + dropped reset on unmap as per Liam.
* Correctly return -EFAULT if no VMAs in input range.
* Account for get_unmapped_area() disregarding MAP_FIXED and returning an altered address.
* Added additional explanatatory comment to the remap_move() function.
https://lore.kernel.org/all/[email protected]/

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

Lorenzo Stoakes (10):
mm/mremap: perform some simple cleanups
mm/mremap: refactor initial parameter sanity checks mm/mremap: put VMA check and prep logic into helper function mm/mremap: cleanup post-processing stage of mremap mm/mremap: use an explicit uffd failure path for mremap mm/mremap: check remap conditions earlier
mm/mremap: move remap_is_valid() into check_prep_vma() mm/mremap: clean up mlock populate behaviour
mm/mremap: permit mremap() move of multiple VMAs tools/testing/selftests: extend mremap_test to test multi-VMA mremap

 fs/userfaultfd.c                         |  15 +-
 include/linux/userfaultfd_k.h            |   5 +
 mm/mremap.c                              | 555 +++++++++++++++--------
 tools/testing/selftests/mm/mremap_test.c | 146 +++++-
 4 files changed, 520 insertions(+), 201 deletions(-)

--
2.50.1