mm: expand mmap_prepare functionality and usage
Status from this message: [merged mm-stable] mm-on-remap-assert-that-input-range-within-the-proposed-vma.patch removed from -mm tree
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest21 patches 26 repliesApplied 21/21
- v316 patches 11 repliesSuperseded
- v216 patches 21 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 15 patches | 30 replies | Superseded |
Changes in v4 from the cover letter
* Added partial revert of AFS as per Vlasta. Labelled as hotfix.
* Updated subsequent afs patch to apply against this version of AFS.
* Reverted rmap_lock_held changes to util.c, mm.h mmap_action_complete() etc. as per Vlasta.
* Added hotfix to fix issue with rmap lock held over munmap() as per Vlasta. Labelled as hotfix.
* Force-disable the rmap lock hold feature in the compatbility layer because being run under the mmap hook eliminates the need for it.
* Removed superfluous map->hold_file_rmap_lock field.
* Moved handling of rmap lock and unmapping to mmap_action_complete().
* Removed unmap_vma_locked() as previous added patches render it unnecessary.
* Removed __compat_vma_mapped() from compatibility layer and call_vma_mapped() from VMA layer and made it part of mmap_action_finish() for all callers.
* Propagated changes to VMA tests.
* Updated mmap_action_map_kernel_pages[_full]() patch to add missing mmap_complete() noop switch enum value as per Nathan.
* Fixed a doc issue in the mmap_prepare docs - reference vma_desc_test_flags() rather than _any().
* Rearranged logic so the vm_ops->mapped hook is called before the success hook, but this should have no impact.
Patches in v4 All 21 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/21 | mm: various small mmap_prepare cleanupsinclude/ include/ mm/ +5 more | +126 | 1 reply | Applied |
| 2/21 | mm: add documentation for the mmap_prepare file operation callbackDocumentation/ Documentation/ | +143 | 0 replies | Applied |
| 3/21 | mm: document vm_operations_struct->open the same as close()include/ tools/ | +20 | 0 replies | Applied |
| 4/21 | mm: avoid deadlock when holding rmap on mmap_prepare errormm/ mm/ | +17 | 1 reply | Applied |
| 5/21 | mm: switch the rmap lock held option off in compat layermm/ tools/ | +27 | 2 replies | Applied |
| 6/21 | mm/vma: remove superfluous map->hold_file_rmap_lockmm/ | +6 | 1 reply | Applied |
| 7/21 | mm: have mmap_action_complete() handle the rmap lock and unmapmm/ mm/ mm/ +1 more | +40 | 1 reply | Applied |
| 8/21 | mm: add vm_ops->mapped hookDocumentation/ include/ include/ +3 more | +120 | 1 reply | Applied |
| 9/21 | fs: afs: revert mmap_prepare() changefs/ | +6 | 1 reply | Applied |
| 10/21 | fs: afs: restore mmap_prepare implementationfs/ | +29 | 1 reply | Applied |
| 11/21 | mm: add mmap_action_simple_ioremap()Documentation/ include/ include/ +4 more | +102 | 1 reply | Applied |
| 12/21 | misc: open-dice: replace deprecated mmap hook with mmap_preparedrivers/ | +11 | 2 replies | Applied |
| 13/21 | hpet: replace deprecated mmap hook with mmap_preparedrivers/ | +7 | 1 reply | Applied |
| 14/21 | mtdchar: replace deprecated mmap hook with mmap_prepare, clean updrivers/ | +3 | 1 reply | Applied |
| 15/21 | stm: replace deprecated mmap hook with mmap_preparedrivers/ | +21 | 1 reply | Applied |
| 16/21 | staging: vme_user: replace deprecated mmap hook with mmap_prepareDocumentation/ drivers/ drivers/ +1 more | +42 | 1 reply | Applied |
| 17/21 | mm: allow handling of stacked mmap_prepare hooks in more driversinclude/ include/ mm/ +2 more | +136 | 1 reply | Applied |
| 18/21 | drivers: hv: vmbus: replace deprecated mmap hook with mmap_preparedrivers/ drivers/ drivers/ +1 more | +29 | 3 replies | Applied |
| 19/21 | uio: replace deprecated mmap hook with mmap_prepare in uio_infodrivers/ drivers/ include/ | +28 | 3 replies | Applied |
| 20/21 | mm: add mmap_action_map_kernel_pages[_full]()Documentation/ include/ include/ +3 more | +160 | 1 reply | Applied |
| 21/21 | mm: on remap assert that input range within the proposed VMAmm/ | +3 | 1 reply | Applied |
Reviews trailers per patch
All 21 patches have a Reviewed-by or Acked-by.
| Patch | Vlastimil Babka (SUSE) | Suren Baghdasaryan | Richard Weinberger | Michael Kelley |
|---|---|---|---|---|
| 1/21 | A-b | |||
| 2/21 | A-b | |||
| 3/21 | A-b | |||
| 4/21 | A-b | |||
| 5/21 | A-b | |||
| 6/21 | A-b | |||
| 7/21 | A-b | |||
| 8/21 | A-b | |||
| 9/21 | A-b | |||
| 10/21 | A-b | |||
| 11/21 | A-b | R-b | ||
| 12/21 | A-b A-b | R-b | ||
| 13/21 | A-b | R-b | ||
| 14/21 | A-b | A-b | ||
| 15/21 | A-b | R-b | ||
| 16/21 | A-b | R-b | ||
| 17/21 | A-b | |||
| 18/21 | A-b | R-b T-b | ||
| 19/21 | A-b | |||
| 20/21 | A-b | R-b | ||
| 21/21 | A-b | R-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.
Cover letter [PATCH v4 00/21] mm: expand mmap_prepare functionality and usage
This series expands the mmap_prepare functionality, which is intended to replace the deprecated f_op->mmap hook which has been the source of bugs and security issues for some time.
This series starts with some cleanup of existing mmap_prepare logic, then adds documentation for the mmap_prepare call to make it easier for filesystem and driver writers to understand how it works.
It then importantly adds a vm_ops->mapped hook, a key feature that was missing from mmap_prepare previously - this is invoked when a driver which specifies mmap_prepare has successfully been mapped but not merged with another VMA.
mmap_prepare is invoked prior to a merge being attempted, so you cannot manipulate state such as reference counts as if it were a new mapping.
The vm_ops->mapped hook allows a driver to perform tasks required at this stage, and provides symmetry against subsequent vm_ops->open,close calls.
The series uses this to correct the afs implementation which wrongly manipulated reference count at mmap_prepare time.
It then adds an mmap_prepare equivalent of vm_iomap_memory() - mmap_action_simple_ioremap(), then uses this to update a number of drivers.
It then splits out the mmap_prepare compatibility layer (which allows for invocation of mmap_prepare hooks in an mmap() hook) in such a way as to allow for more incremental implementation of mmap_prepare hooks.
It then uses this to extend mmap_prepare usage in drivers.
Finally it adds an mmap_prepare equivalent of vm_map_pages(), which lays the foundation for future work which will extend mmap_prepare to DMA coherent mappings.
v4:
* Added partial revert of AFS as per Vlasta. Labelled as hotfix.
* Updated subsequent afs patch to apply against this version of AFS.
* Reverted rmap_lock_held changes to util.c, mm.h mmap_action_complete() etc. as per Vlasta.
* Added hotfix to fix issue with rmap lock held over munmap() as per Vlasta. Labelled as hotfix.
* Force-disable the rmap lock hold feature in the compatbility layer because being run under the mmap hook eliminates the need for it.
* Removed superfluous map->hold_file_rmap_lock field.
* Moved handling of rmap lock and unmapping to mmap_action_complete().
* Removed unmap_vma_locked() as previous added patches render it unnecessary.
* Removed __compat_vma_mapped() from compatibility layer and call_vma_mapped() from VMA layer and made it part of mmap_action_finish() for all callers.
* Propagated changes to VMA tests.
* Updated mmap_action_map_kernel_pages[_full]() patch to add missing mmap_complete() noop switch enum value as per Nathan.
* Fixed a doc issue in the mmap_prepare docs - reference vma_desc_test_flags() rather than _any().
* Rearranged logic so the vm_ops->mapped hook is called before the success hook, but this should have no impact.
v3:
* Propagated tags (thanks Suren, Richard!)
* Updated 12/16 to correctly clear the vm_area_desc data structure in set_desc_from_vma() as per Joshua Hahn (thanks! :)
* Fixed type in 12/16 as per Suren (cheers!)
* Fixed up 6/16 to use mmap_action_ioremap_full() in simple_ioremap_prepare() as suggested by Suren.
* Also fixed up 6/16 to call io_remap_pfn_range_prepare() direct rather than mmap_action_prepare() as per Suren.
* Also fixed up 6/16 to pass vm_len rather than vm_[start, end] to __simple_ioremap_prep() as per Suren (thanks for all the above! :)
* Fixed issue in rmap lock being held - we were referencing a vma->vm_file after the VMA was unmapped, so UAF. Avoid that. Also do_munmap() relies on rmap lock NOT being held or may deadlock, so extend functionality to ensure we drop it when it is held on error paths.
* Updated 'area' -> 'vma' variable in 3/16 in VMA test dup.h.
* Fixed up reference to __compat_vma_mmap() in 12/16 commit message.
* Updated 1/16 to no longer duplicatively apply io_remap_pfn_range_pfn().
* Updated 1/16 to delegate I/O remap complete to remap complete logic.
* Fixed various typos in 12/16.
* Fixed stale comment typos in 13/16.
* Fixed commit msg and comment typos in 14/16.
* Removed accidental sneak peak to future functionality in 15/16 commit message :).
* Fixed up field names to be identical in VMA tests + mm_types.h in 6/16, 15/16.
https://lore.kernel.org/all/[email protected]/
v2:
* Rebased on
https://lore.kernel.org/all/[email protected]/ to make Andrew's life easier :)
* Folded all interim fixes into series (thanks Randy for many doc fixes!))
* As per Suren, removed a comment about allocations too small to fail.
* As per Randy, fixed up typo in documentation for vm_area_desc.
* Fixed mmap_action_prepare() not returning if invalid action->type specified, as updated from Andrew's interim fix (thanks!) and also reported by kernel test bot.
* Updated mmap_action_prepare() and specific prepare functions to only pass vm_area_desc parameter as per Suren.
* Fixed up whitespace as per Suren.
* Updated vm_op->open comment in vm_operations_struct to reference forking as per Suren.
* Added a commit to check that input range is within VMA on remap as per Suren (this also covers I/O remap and all other cases already asserted).
* Updated AFS to not incorrectly reference count on mmap prepare as per Usama.
* Also updated various static AFS functions to be consistent with each other.
* Updated AFS commit message to reflect mmap_prepare being before any VMA merging as per Suren.
* Updated __compat_vma_mapped() to check for NULL vm_ops as per Usama.
* Updated __compat_vma_mapped() to not reference an unmapped VMA's fields as per Usama.
* Updated __vma_check_mmap_hook() to check for NULL vm_ops as per Usama.
* Dropped comment about preferring mmap_prepare as seems overly confusing, as per Suren.
* Updated the mmap lock assert in unmap_vma_locked() to a write lock assert as per Suren.
* Copied vm_ops->open comment over to VMA tests in appropriate patch as per Suren.
* Updated mmap_prepare documentation to reflect the fact that no resources should be allocated upon mmap_prepare.
* Updated mmap_prepare documentation to reference the vm_ops->mapped callback.
* Fixed stray markdown '## How to use' in documentation.
* Fixed bug reported by kernel test bot re: overlooked vma_desc_test_flags() -> vma_desc_test() in MTD driver for nommu.
https://lore.kernel.org/linux-mm/[email protected]/
v1:
https://lore.kernel.org/linux-mm/[email protected]/
Lorenzo Stoakes (Oracle) (21):
mm: various small mmap_prepare cleanups
mm: add documentation for the mmap_prepare file operation callback
mm: document vm_operations_struct->open the same as close()
mm: avoid deadlock when holding rmap on mmap_prepare error
mm: switch the rmap lock held option off in compat layer mm/vma: remove superfluous map->hold_file_rmap_lock
mm: have mmap_action_complete() handle the rmap lock and unmap
mm: add vm_ops->mapped hook
fs: afs: revert mmap_prepare() change
fs: afs: restore mmap_prepare implementation
mm: add mmap_action_simple_ioremap()
misc: open-dice: replace deprecated mmap hook with mmap_prepare
hpet: replace deprecated mmap hook with mmap_prepare
mtdchar: replace deprecated mmap hook with mmap_prepare, clean up
stm: replace deprecated mmap hook with mmap_prepare
staging: vme_user: replace deprecated mmap hook with mmap_prepare
mm: allow handling of stacked mmap_prepare hooks in more drivers
drivers: hv: vmbus: replace deprecated mmap hook with mmap_prepare
uio: replace deprecated mmap hook with mmap_prepare in uio_info
mm: add mmap_action_map_kernel_pages[_full]()
mm: on remap assert that input range within the proposed VMA
Documentation/driver-api/vme.rst | 2 +- Documentation/filesystems/index.rst | 1 + Documentation/filesystems/mmap_prepare.rst | 168 ++++++++++++++ drivers/char/hpet.c | 12 +- drivers/hv/hyperv_vmbus.h | 4 +- drivers/hv/vmbus_drv.c | 31 ++- drivers/hwtracing/stm/core.c | 31 ++- drivers/misc/open-dice.c | 19 +- drivers/mtd/mtdchar.c | 21 +- drivers/staging/vme_user/vme.c | 20 +- drivers/staging/vme_user/vme.h | 2 +- drivers/staging/vme_user/vme_user.c | 51 +++-- drivers/target/target_core_user.c | 26 ++- drivers/uio/uio.c | 10 +- drivers/uio/uio_hv_generic.c | 11 +- fs/afs/file.c | 36 ++- include/linux/fs.h | 14 +- include/linux/hyperv.h | 4 +- include/linux/mm.h | 158 ++++++++++++- include/linux/mm_types.h | 17 +- include/linux/uio_driver.h | 4 +- mm/internal.h | 46 +++- mm/memory.c | 175 ++++++++++---- mm/util.c | 251 ++++++++++++++------- mm/vma.c | 48 ++-- mm/vma.h | 2 +- tools/testing/vma/include/dup.h | 134 +++++++---- tools/testing/vma/include/stubs.h | 8 +- 28 files changed, 956 insertions(+), 350 deletions(-) create mode 100644 Documentation/filesystems/mmap_prepare.rst
--
2.53.0