[GIT PULL 07/14 for v6.17] vfs mmap

[Christian Brauner <brauner@kernel.org>]

Hey Linus,

/* Summary */
Last cycle we introduce f_op->mmap_prepare() in c84bf6dd2b83 ("mm:
introduce new .mmap_prepare() file callback").

This is preferred to the existing f_op->mmap() hook as it does require a
VMA to be established yet, thus allowing the mmap logic to invoke this
hook far, far earlier, prior to inserting a VMA into the virtual address
space, or performing any other heavy handed operations.

This allows for much simpler unwinding on error, and for there to be a
single attempt at merging a VMA rather than having to possibly reattempt
a merge based on potentially altered VMA state.

Far more importantly, it prevents inappropriate manipulation of
incompletely initialised VMA state, which is something that has been the
cause of bugs and complexity in the past.

The intent is to gradually deprecate f_op->mmap, and in that vein this
series coverts the majority of file systems to using f_op->mmap_prepare.

Prerequisite steps are taken - firstly ensuring all checks for mmap
capabilities use the file_has_valid_mmap_hooks() helper rather than
directly checking for f_op->mmap (which is now not a valid check) and
secondly updating daxdev_mapping_supported() to not require a VMA
parameter to allow ext4 and xfs to be converted.

Commit bb666b7c2707 ("mm: add mmap_prepare() compatibility layer for
nested file systems") handles the nasty edge-case of nested file systems
like overlayfs, which introduces a compatibility shim to allow
f_op->mmap_prepare() to be invoked from an f_op->mmap() callback.

This allows for nested filesystems to continue to function correctly
with all file systems regardless of which callback is used. Once we
finally convert all file systems, this shim can be removed.

As a result, ecryptfs, fuse, and overlayfs remain unaltered so they can
nest all other file systems.

We additionally do not update resctl - as this requires an update to
remap_pfn_range() (or an alternative to it) which we defer to a later
series, equally we do not update cramfs which needs a mixed mapping
insertion with the same issue, nor do we update procfs, hugetlbfs, syfs
or kernfs all of which require VMAs for internal state and hooks. We
shall return to all of these later.

/* Testing */

gcc (Debian 14.2.0-19) 14.2.0
Debian clang version 19.1.7 (3)

No build failures or warnings were observed.

/* Conflicts */

Merge conflicts with mainline
=============================

This will have a merge conflict with mainline that can be resolved as follows:

diff --cc Documentation/filesystems/porting.rst
index 200226bfd6cf,48fff4c407f3..000000000000
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1249,9 -1252,12 +1249,21 @@@ an extra reference to new mount - it sh

  ---

 +collect_mounts()/drop_collected_mounts()/iterate_mounts() are gone now.
 +Replacement is collect_paths()/drop_collected_path(), with no special
 +iterator needed.  Instead of a cloned mount tree, the new interface returns
 +an array of struct path, one for each mount collect_mounts() would've
 +created.  These struct path point to locations in the caller's namespace
 +that would be roots of the cloned mounts.
++
++---
++
+ **highly recommended**
+
+ The file operations mmap() callback is deprecated in favour of
+ mmap_prepare(). This passes a pointer to a vm_area_desc to the callback
+ rather than a VMA, as the VMA at this stage is not yet valid.
+
+ The vm_area_desc provides the minimum required information for a filesystem
+ to initialise state upon memory mapping of a file-backed region, and output
+ parameters for the file system to set this state.

Merge conflicts with other trees
================================

No known conflicts.

The following changes since commit e04c78d86a9699d136910cfc0bdcf01087e3267e:

  Linux 6.16-rc2 (2025-06-15 13:49:41 -0700)

are available in the Git repository at:

  git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.17-rc1.mmap_prepare

for you to fetch changes up to 425c8bb39b032bfb338857476eff5bbee324343e:

  doc: update porting, vfs documentation to describe mmap_prepare() (2025-07-23 15:09:14 +0200)

Please consider pulling these changes from the signed vfs-6.17-rc1.mmap_prepare tag.

Thanks!
Christian

----------------------------------------------------------------
vfs-6.17-rc1.mmap_prepare

----------------------------------------------------------------
Christian Brauner (1):
      Merge patch series "convert the majority of file systems to mmap_prepare"

Lorenzo Stoakes (11):
      mm: rename call_mmap/mmap_prepare to vfs_mmap/mmap_prepare
      mm/nommu: use file_has_valid_mmap_hooks() helper
      fs: consistently use can_mmap_file() helper
      fs/dax: make it possible to check dev dax support without a VMA
      fs/ext4: transition from deprecated .mmap hook to .mmap_prepare
      fs/xfs: transition from deprecated .mmap hook to .mmap_prepare
      mm/filemap: introduce generic_file_*_mmap_prepare() helpers
      fs: convert simple use of generic_file_*_mmap() to .mmap_prepare()
      fs: convert most other generic_file_*mmap() users to .mmap_prepare()
      fs: replace mmap hook with .mmap_prepare for simple mappings
      doc: update porting, vfs documentation to describe mmap_prepare()

 Documentation/filesystems/porting.rst      | 12 +++++++++++
 Documentation/filesystems/vfs.rst          | 22 +++++++++++++++----
 block/fops.c                               | 12 +++++------
 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c |  2 +-
 fs/9p/vfs_file.c                           | 13 ++++++------
 fs/adfs/file.c                             |  2 +-
 fs/affs/file.c                             |  2 +-
 fs/afs/file.c                              | 12 +++++------
 fs/aio.c                                   |  8 +++----
 fs/backing-file.c                          |  4 ++--
 fs/bcachefs/fs.c                           |  8 +++----
 fs/bfs/file.c                              |  2 +-
 fs/binfmt_elf.c                            |  4 ++--
 fs/binfmt_elf_fdpic.c                      |  2 +-
 fs/btrfs/file.c                            |  7 +++---
 fs/ceph/addr.c                             |  6 +++---
 fs/ceph/file.c                             |  2 +-
 fs/ceph/super.h                            |  2 +-
 fs/coda/file.c                             |  6 +++---
 fs/ecryptfs/file.c                         |  2 +-
 fs/erofs/data.c                            | 16 +++++++-------
 fs/exfat/file.c                            | 10 +++++----
 fs/ext2/file.c                             | 12 ++++++-----
 fs/ext4/file.c                             | 13 ++++++------
 fs/f2fs/file.c                             |  7 +++---
 fs/fat/file.c                              |  2 +-
 fs/hfs/inode.c                             |  2 +-
 fs/hfsplus/inode.c                         |  2 +-
 fs/hostfs/hostfs_kern.c                    |  2 +-
 fs/hpfs/file.c                             |  2 +-
 fs/jffs2/file.c                            |  2 +-
 fs/jfs/file.c                              |  2 +-
 fs/minix/file.c                            |  2 +-
 fs/nfs/file.c                              | 13 ++++++------
 fs/nfs/internal.h                          |  2 +-
 fs/nfs/nfs4file.c                          |  2 +-
 fs/nilfs2/file.c                           |  8 +++----
 fs/ntfs3/file.c                            | 15 +++++++------
 fs/ocfs2/file.c                            |  4 ++--
 fs/ocfs2/mmap.c                            |  5 +++--
 fs/ocfs2/mmap.h                            |  2 +-
 fs/omfs/file.c                             |  2 +-
 fs/orangefs/file.c                         | 10 +++++----
 fs/ramfs/file-mmu.c                        |  2 +-
 fs/ramfs/file-nommu.c                      | 12 +++++------
 fs/read_write.c                            |  2 +-
 fs/romfs/mmap-nommu.c                      |  6 +++---
 fs/smb/client/cifsfs.c                     | 12 +++++------
 fs/smb/client/cifsfs.h                     |  4 ++--
 fs/smb/client/file.c                       | 16 +++++++-------
 fs/ubifs/file.c                            | 10 ++++-----
 fs/ufs/file.c                              |  2 +-
 fs/vboxsf/file.c                           |  8 +++----
 fs/xfs/xfs_file.c                          | 15 +++++++------
 fs/zonefs/file.c                           | 10 +++++----
 include/linux/dax.h                        | 16 ++++++++------
 include/linux/fs.h                         | 13 ++++++------
 ipc/shm.c                                  |  2 +-
 mm/filemap.c                               | 29 +++++++++++++++++++++++++
 mm/internal.h                              |  2 +-
 mm/mmap.c                                  |  2 +-
 mm/nommu.c                                 |  2 +-
 mm/vma.c                                   |  2 +-
 tools/testing/vma/vma_internal.h           | 34 ++++++++++++++++++++++++------
 64 files changed, 281 insertions(+), 187 deletions(-)