Commit 16df6e07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.8.netfs' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs 

Pull netfs updates from Christian Brauner:
 "This extends the netfs helper library that network filesystems can use
  to replace their own implementations. Both afs and 9p are ported. cifs
  is ready as well but the patches are way bigger and will be routed
  separately once this is merged. That will remove lots of code as well.

  The overal goal is to get high-level I/O and knowledge of the page
  cache and ouf of the filesystem drivers. This includes knowledge about
  the existence of pages and folios

  The pull request converts afs and 9p. This removes about 800 lines of
  code from afs and 300 from 9p. For 9p it is now possible to do writes
  in larger than a page chunks. Additionally, multipage folio support
  can be turned on for 9p. Separate patches exist for cifs removing
  another 2000+ lines. I've included detailed information in the
  individual pulls I took.

  Summary:

   - Add NFS-style (and Ceph-style) locking around DIO vs buffered I/O
     calls to prevent these from happening at the same time.

   - Support for direct and unbuffered I/O.

   - Support for write-through caching in the page cache.

   - O_*SYNC and RWF_*SYNC writes use write-through rather than writing
     to the page cache and then flushing afterwards.

   - Support for write-streaming.

   - Support for write grouping.

   - Skip reads for which the server could only return zeros or EOF.

   - The fscache module is now part of the netfs library and the
     corresponding maintainer entry is updated.

   - Some helpers from the fscache subsystem are renamed to mark them as
     belonging to the netfs library.

   - Follow-up fixes for the netfs library.

   - Follow-up fixes for the 9p conversion"

* tag 'vfs-6.8.netfs' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs: (50 commits)
  netfs: Fix wrong #ifdef hiding wait
  cachefiles: Fix signed/unsigned mixup
  netfs: Fix the loop that unmarks folios after writing to the cache
  netfs: Fix interaction between write-streaming and cachefiles culling
  netfs: Count DIO writes
  netfs: Mark netfs_unbuffered_write_iter_locked() static
  netfs: Fix proc/fs/fscache symlink to point to "netfs" not "../netfs"
  netfs: Rearrange netfs_io_subrequest to put request pointer first
  9p: Use length of data written to the server in preference to error
  9p: Do a couple of cleanups
  9p: Fix initialisation of netfs_inode for 9p
  cachefiles: Fix __cachefiles_prepare_write()
  9p: Use netfslib read/write_iter
  afs: Use the netfs write helpers
  netfs: Export the netfs_sreq tracepoint
  netfs: Optimise away reads above the point at which there can be no data
  netfs: Implement a write-through caching option
  netfs: Provide a launder_folio implementation
  netfs: Provide a writepages implementation
  netfs, cachefiles: Pass upper bound length to allow expansion
  ...
parents 9d1694dc 1d5911d4

Documentation/filesystems/netfs_library.rst

+4 −19
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ through which it can issue requests and negotiate:: 
	struct netfs_request_ops {

		void (*init_request)(struct netfs_io_request *rreq, struct file *file);

		void (*free_request)(struct netfs_io_request *rreq);

		int (*begin_cache_operation)(struct netfs_io_request *rreq);

		void (*expand_readahead)(struct netfs_io_request *rreq);

		bool (*clamp_length)(struct netfs_io_subrequest *subreq);

		void (*issue_read)(struct netfs_io_subrequest *subreq);
@@ -317,20 +316,6 @@ The operations are as follows: 
   [Optional] This is called as the request is being deallocated so that the

   filesystem can clean up any state it has attached there.



 * ``begin_cache_operation()``



   [Optional] This is called to ask the network filesystem to call into the

   cache (if present) to initialise the caching state for this read.  The netfs

   library module cannot access the cache directly, so the cache should call

   something like fscache_begin_read_operation() to do this.



   The cache gets to store its state in ->cache_resources and must set a table

   of operations of its own there (though of a different type).



   This should return 0 on success and an error code otherwise.  If an error is

   reported, the operation may proceed anyway, just without local caching (only

   out of memory and interruption errors cause failure here).



 * ``expand_readahead()``



   [Optional] This is called to allow the filesystem to expand the size of a
@@ -460,14 +445,14 @@ When implementing a local cache to be used by the read helpers, two things are 
required: some way for the network filesystem to initialise the caching for a

read request and a table of operations for the helpers to call.



The network filesystem's ->begin_cache_operation() method is called to set up a

cache and this must call into the cache to do the work.  If using fscache, for

example, the cache would call::

To begin a cache operation on an fscache object, the following function is

called::



	int fscache_begin_read_operation(struct netfs_io_request *rreq,

					 struct fscache_cookie *cookie);



passing in the request pointer and the cookie corresponding to the file.

passing in the request pointer and the cookie corresponding to the file.  This

fills in the cache resources mentioned below.



The netfs_io_request object contains a place for the cache to hang its

state::

MAINTAINERS

+13 −8
Original line number Diff line number Diff line
@@ -8214,6 +8214,19 @@ S: Supported 
F:	fs/iomap/

F:	include/linux/iomap.h









FILESYSTEMS [NETFS LIBRARY]









M:	David Howells <dhowells@redhat.com>









L:	linux-cachefs@redhat.com (moderated for non-subscribers)









L:	linux-fsdevel@vger.kernel.org









S:	Supported









F:	Documentation/filesystems/caching/









F:	Documentation/filesystems/netfs_library.rst









F:	fs/netfs/









F:	include/linux/fscache*.h









F:	include/linux/netfs.h









F:	include/trace/events/fscache.h









F:	include/trace/events/netfs.h

















FILESYSTEMS [STACKABLE]









M:	Miklos Szeredi <miklos@szeredi.hu>









M:	Amir Goldstein <amir73il@gmail.com>








@@ -8659,14 +8672,6 @@ F:	Documentation/power/freezing-of-tasks.rst







F:	include/linux/freezer.h









F:	kernel/freezer.c

















FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS









M:	David Howells <dhowells@redhat.com>









L:	linux-cachefs@redhat.com (moderated for non-subscribers)









S:	Supported









F:	Documentation/filesystems/caching/









F:	fs/fscache/









F:	include/linux/fscache*.h

















FSCRYPT: FILE SYSTEM LEVEL ENCRYPTION SUPPORT









M:	Eric Biggers <ebiggers@kernel.org>









M:	Theodore Y. Ts'o <tytso@mit.edu>
































arch/arm/configs/mxs_defconfig



+2
−1






























Original line number
Diff line number
Diff line







@@ -138,7 +138,8 @@ CONFIG_PWM_MXS=y







CONFIG_NVMEM_MXS_OCOTP=y









CONFIG_EXT4_FS=y









# CONFIG_DNOTIFY is not set









CONFIG_FSCACHE=m









CONFIG_NETFS_SUPPORT=m









CONFIG_FSCACHE=y









CONFIG_FSCACHE_STATS=y









CONFIG_CACHEFILES=m









CONFIG_VFAT_FS=y
































arch/csky/configs/defconfig



+2
−1






























Original line number
Diff line number
Diff line







@@ -34,7 +34,8 @@ CONFIG_GENERIC_PHY=y







CONFIG_EXT4_FS=y









CONFIG_FANOTIFY=y









CONFIG_QUOTA=y









CONFIG_FSCACHE=m









CONFIG_NETFS_SUPPORT=m









CONFIG_FSCACHE=y









CONFIG_FSCACHE_STATS=y









CONFIG_CACHEFILES=m









CONFIG_MSDOS_FS=y
































arch/mips/configs/ip27_defconfig



+2
−1






























Original line number
Diff line number
Diff line







@@ -287,7 +287,8 @@ CONFIG_BTRFS_FS_POSIX_ACL=y







CONFIG_QUOTA_NETLINK_INTERFACE=y









CONFIG_FUSE_FS=m









CONFIG_CUSE=m









CONFIG_FSCACHE=m









CONFIG_NETFS_SUPPORT=m









CONFIG_FSCACHE=y









CONFIG_FSCACHE_STATS=y









CONFIG_CACHEFILES=m









CONFIG_PROC_KCORE=y