netfs, afs, 9p: Delegate high-level I/O to netfslib
Subsystems (23)
David Howells
maintainerv5 cover netfs, afs, 9p: Delegate high-level I/O to netfslib
Hi Jeff, Steve, Dominique,
I have been working on my netfslib helpers to the point that I can run xfstests on AFS to completion (both with write-back buffering and, with a small patch, write-through buffering in the pagecache). I have a patch for 9P, but am currently unable to test it.
The patches remove a little over 800 lines from AFS, 300 from 9P, albeit with around 3000 lines added to netfs. Hopefully, I will be able to remove a bunch of lines from Ceph too.
I've split the CIFS patches out to a separate branch, cifs-netfs, where a further 2000+ lines are removed. I can run a certain amount of xfstests on CIFS, though I'm running into ksmbd issues and not all the tests work correctly because of issues between fallocate and what the SMB protocol actually supports.
I've also dropped the content-crypto patches out for the moment as they're only usable by the ceph changes which I'm still working on.
The patch to use PG_writeback instead of PG_fscache for writing to the cache has also been deferred, pending 9p, afs, ceph and cifs all being converted.
The main aims of these patches are to get high-level I/O and knowledge of the pagecache out of the filesystem drivers as much as possible and to get rid, as much of possible, of the knowledge that pages/folios exist.
Further, I would like to see ->write_begin, ->write_end and ->launder_folio go away.
Features that are added by these patches to that which is already there in netfslib:
(1) NFS-style (and Ceph-style) locking around DIO vs buffered I/O calls to prevent these from happening at the same time. mmap'd I/O can, of necessity, happen at any time ignoring these locks.
(2) Support for unbuffered I/O. The data is kept in the bounce buffer and the pagecache is not used. This can be turned on with an inode flag.
(3) Support for direct I/O. This is basically unbuffered I/O with some extra restrictions and no RMW.
(4) Support for using a bounce buffer in an operation. The bounce buffer may be bigger than the target data/buffer, allowing for crypto rounding.
(5) ->write_begin() and ->write_end() are ignored in favour of merging all of that into one function, netfs_perform_write(), thereby avoiding the function pointer traversals.
(6) Support for write-through caching in the pagecache. netfs_perform_write() adds the pages is modifies to an I/O operation as it goes and directly marks them writeback rather than dirty. When writing back from write-through, it limits the range written back. This should allow CIFS to deal with byte-range mandatory locks correctly.
(7) O_*SYNC and RWF_*SYNC writes use write-through rather than writing to the pagecache and then flushing afterwards. An AIO O_*SYNC write will notify of completion when the sub-writes all complete.
(8) Support for write-streaming where modifed data is held in !uptodate folios, with a private struct attached indicating the range that is valid.
(9) Support for write grouping, multiplexing a pointer to a group in the folio private data with the write-streaming data. The writepages algorithm only writes stuff back that's in the nominated group. This is intended for use by Ceph to write is snaps in order.
(10) Skipping reads for which we know the server could only supply zeros or EOF (for instance if we've done a local write that leaves a hole in the file and extends the local inode size).
General notes:
(1) The fscache module is merged into the netfslib module to avoid cyclic exported symbol usage that prevents either module from being loaded.
(2) Some helpers from fscache are reassigned to netfslib by name.
(3) netfslib now makes use of folio->private, which means the filesystem can't use it.
(4) The filesystem provides wrappers to call the write helpers, allowing it to do pre-validation, oplock/capability fetching and the passing in of write group info.
(5) I want to try flushing the data when tearing down an inode before invalidating it to try and render launder_folio unnecessary.
(6) Write-through caching will generate and dispatch write subrequests as it gathers enough data to hit wsize and has whole pages that at least span that size. This needs to be a bit more flexible, allowing for a filesystem such as CIFS to have a variable wsize.
(7) The filesystem driver is just given read and write calls with an iov_iter describing the data/buffer to use. Ideally, they don't see pages or folios at all. A function, extract_iter_to_sg(), is already available to decant part of an iterator into a scatterlist for crypto purposes.
AFS notes:
(1) I pushed a pair of patches that clean up the trace header down to the base so that they can be shared with another branch.
9P notes:
(1) Most of xfstests now pass - more, in fact, since upstream 9p lacks a writepages method and can't handle mmap writes. An occasional oops (and sometimes panic) happens somewhere in the pathwalk/FID handling code that is unrelated to these changes.
(2) Writes should now occur in larger-than-page-sized chunks.
(3) It should be possible to turn on multipage folio support in 9P now.
The patches are tagged as:
https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/tag/?h=netfs-lib-20231221
and can also be found on the "netfs-lib" branch in the same repo.
Changes
=======
ver #5)
- Dropped bounce-buffer code for now as that's only used by content crypto (which got deferred previously).
- Removed ceph_fscache_note_page_release() also as that is now unused.
- Cachefiles needs to depend on NETFS_SUPPORT also now.
- fscache_init/exit() should depend on CONFIG_FSCACHE, not CONFIG_PROC_FS.
- Adjust MAINTAINERS file.
- Sank afs trace header cleanup patches to base to share more easily with another branch.
- 9p: Added some missing remote_i_size setting.
- 9p: Added missing writepages (else mmap write never written back).
- Use netfs_folio_info() rather than open-coding pointer mangling.
- Use folio_get_private() rather than using folio->private.
- Don't check the folio private pointer before taking the folio ref during writeback pagecache RCU xarray walk.
- Change arch defconfigs to have NETFS_SUPPORT=m and FSCACHE=y when FSCACHE was m.
ver #4)
- Slimmed down the branch:
- Split the cifs-related patches off to a separate branch (cifs-netfs)
- Deferred the content-encryption to the in-progress ceph changes.
- Deferred the use-PG_writeback rather than PG_fscache patch
- Rebased on a later linux-next with afs-rotation patches.
ver #3)
- Moved the fscache module into netfslib to avoid export cycles.
- Fixed a bunch of bugs.
- Got CIFS to pass as much of xfstests as possible.
- Added a patch to make 9P use all the helpers.
- Added a patch to stop using PG_fscache, but rather dirty pages on reading and have writepages write to the cache.
ver #2)
- Folded the addition of NETFS_RREQ_NONBLOCK/BLOCKED into first patch that uses them.
- Folded addition of rsize member into first user.
- Don't set rsize in ceph (yet) and set it in kafs to 256KiB. cifs sets it dynamically.
- Moved direct_bv next to direct_bv_count in struct netfs_io_request and labelled it with a __counted_by().
- Passed flags into netfs_xa_store_and_mark() rather than two bools.
- Removed netfs_set_up_buffer() as it wasn't used.
David
David Howells (40):
afs: Remove whitespace before most ')' from the trace header
afs: Automatically generate trace tag enums
netfs, fscache: Move fs/fscache/* into fs/netfs/
netfs, fscache: Combine fscache with netfs
netfs, fscache: Remove ->begin_cache_operation
netfs, fscache: Move /proc/fs/fscache to /proc/fs/netfs and put in a
symlink
netfs: Move pinning-for-writeback from fscache to netfs
netfs: Add a procfile to list in-progress requests
netfs: Allow the netfs to make the io (sub)request alloc larger
netfs: Add a ->free_subrequest() op
afs: Don't use folio->private to record partial modification
netfs: Provide invalidate_folio and release_folio calls
netfs: Implement unbuffered/DIO vs buffered I/O locking
netfs: Add iov_iters to (sub)requests to describe various buffers
netfs: Add support for DIO buffering
netfs: Provide tools to create a buffer in an xarray
netfs: Add func to calculate pagecount/size-limited span of an
iterator
netfs: Limit subrequest by size or number of segments
netfs: Extend the netfs_io_*request structs to handle writes
netfs: Add a hook to allow tell the netfs to update its i_size
netfs: Make netfs_put_request() handle a NULL pointer
netfs: Make the refcounting of netfs_begin_read() easier to use
netfs: Prep to use folio->private for write grouping and streaming
write
netfs: Dispatch write requests to process a writeback slice
netfs: Provide func to copy data to pagecache for buffered write
netfs: Make netfs_read_folio() handle streaming-write pages
netfs: Allocate multipage folios in the writepath
netfs: Implement unbuffered/DIO read support
netfs: Implement unbuffered/DIO write support
netfs: Implement buffered write API
netfs: Allow buffered shared-writeable mmap through
netfs_page_mkwrite()
netfs: Provide netfs_file_read_iter()
netfs, cachefiles: Pass upper bound length to allow expansion
netfs: Provide a writepages implementation
netfs: Provide a launder_folio implementation
netfs: Implement a write-through caching option
netfs: Optimise away reads above the point at which there can be no
data
netfs: Export the netfs_sreq tracepoint
afs: Use the netfs write helpers
9p: Use netfslib read/write_iter
Documentation/filesystems/netfs_library.rst | 23 +-
MAINTAINERS | 21 +-
arch/arm/configs/mxs_defconfig | 3 +-
arch/csky/configs/defconfig | 3 +-
arch/mips/configs/ip27_defconfig | 3 +-
arch/mips/configs/lemote2f_defconfig | 3 +-
arch/mips/configs/loongson3_defconfig | 3 +-
arch/mips/configs/pic32mzda_defconfig | 3 +-
arch/s390/configs/debug_defconfig | 3 +-
arch/s390/configs/defconfig | 3 +-
arch/sh/configs/sdk7786_defconfig | 3 +-
fs/9p/vfs_addr.c | 353 +----
fs/9p/vfs_file.c | 89 +-
fs/9p/vfs_inode.c | 8 +-
fs/9p/vfs_inode_dotl.c | 7 +-
fs/9p/vfs_super.c | 14 +-
fs/Kconfig | 1 -
fs/Makefile | 1 -
fs/afs/file.c | 213 +--
fs/afs/inode.c | 26 +-
fs/afs/internal.h | 72 +-
fs/afs/super.c | 2 +-
fs/afs/write.c | 828 +----------
fs/cachefiles/Kconfig | 2 +-
fs/cachefiles/internal.h | 2 +-
fs/cachefiles/io.c | 10 +-
fs/cachefiles/ondemand.c | 2 +-
fs/ceph/addr.c | 25 +-
fs/ceph/cache.h | 45 +-
fs/ceph/inode.c | 2 +-
fs/fs-writeback.c | 10 +-
fs/fscache/Kconfig | 40 -
fs/fscache/Makefile | 16 -
fs/fscache/internal.h | 277 ----
fs/netfs/Kconfig | 39 +
fs/netfs/Makefile | 22 +-
fs/netfs/buffered_read.c | 229 ++-
fs/netfs/buffered_write.c | 1236 +++++++++++++++++
fs/netfs/direct_read.c | 125 ++
fs/netfs/direct_write.c | 170 +++
fs/{fscache/cache.c => netfs/fscache_cache.c} | 0
.../cookie.c => netfs/fscache_cookie.c} | 0
fs/netfs/fscache_internal.h | 14 +
fs/{fscache/io.c => netfs/fscache_io.c} | 42 +-
fs/{fscache/main.c => netfs/fscache_main.c} | 25 +-
fs/{fscache/proc.c => netfs/fscache_proc.c} | 23 +-
fs/{fscache/stats.c => netfs/fscache_stats.c} | 4 +-
.../volume.c => netfs/fscache_volume.c} | 0
fs/netfs/internal.h | 288 ++++
fs/netfs/io.c | 211 ++-
fs/netfs/iterator.c | 97 ++
fs/netfs/locking.c | 216 +++
fs/netfs/main.c | 109 ++
fs/netfs/misc.c | 260 ++++
fs/netfs/objects.c | 59 +-
fs/netfs/output.c | 478 +++++++
fs/netfs/stats.c | 31 +-
fs/nfs/Kconfig | 4 +-
fs/nfs/fscache.c | 7 -
fs/smb/client/cifsfs.c | 9 +-
fs/smb/client/file.c | 18 +-
fs/smb/client/fscache.c | 2 +-
include/linux/fs.h | 2 +-
include/linux/fscache.h | 45 -
include/linux/netfs.h | 174 ++-
include/linux/writeback.h | 2 +-
include/trace/events/afs.h | 496 ++-----
include/trace/events/netfs.h | 155 ++-
mm/filemap.c | 2 +
69 files changed, 4233 insertions(+), 2477 deletions(-)
delete mode 100644 fs/fscache/Kconfig
delete mode 100644 fs/fscache/Makefile
delete mode 100644 fs/fscache/internal.h
create mode 100644 fs/netfs/buffered_write.c
create mode 100644 fs/netfs/direct_read.c
create mode 100644 fs/netfs/direct_write.c
rename fs/{fscache/cache.c => netfs/fscache_cache.c} (100%)
rename fs/{fscache/cookie.c => netfs/fscache_cookie.c} (100%)
create mode 100644 fs/netfs/fscache_internal.h
rename fs/{fscache/io.c => netfs/fscache_io.c} (86%)
rename fs/{fscache/main.c => netfs/fscache_main.c} (84%)
rename fs/{fscache/proc.c => netfs/fscache_proc.c} (58%)
rename fs/{fscache/stats.c => netfs/fscache_stats.c} (97%)
rename fs/{fscache/volume.c => netfs/fscache_volume.c} (100%)
create mode 100644 fs/netfs/locking.c
create mode 100644 fs/netfs/misc.c
create mode 100644 fs/netfs/output.cDavid Howells
maintainerPATCH v5 1/40 afs: Remove whitespace before most ')' from the trace header
checkpatch objects to whitespace before ')', so remove most of it from the afs trace header.
--- include/trace/events/afs.h | 242 ++++++++++++++++++------------------- 1 file changed, 121 insertions(+), 121 deletions(-)
include/trace/events/afs.h +121 -121
@@ -654,12 +654,12 @@ TRACE_EVENT(afs_receive_data, TP_ARGS(call, iter, want_more, ret),TP_STRUCT__entry ( -__field (loff_t ,remain ) - __field(unsigned int, call ) - __field(enum afs_call_state, state ) - __field(unsigned short, unmarshall ) -__field (bool, want_more ) -__field (int, ret ) +__field (loff_t ,remain ) + __field(unsigned int, call) + __field(enum afs_call_state, state) + __field(unsigned short, unmarshall) +__field (bool, want_more) +__field (int, ret) ), TP_fast_assign(
@@ -686,9 +686,9 @@ TRACE_EVENT(afs_notify_call,TP_ARGS (rxcall, call),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(enum afs_call_state, state ) - __field(unsigned short, unmarshall ) + __field(unsigned int, call) + __field(enum afs_call_state, state) + __field(unsigned short, unmarshall) ), TP_fast_assign(
@@ -708,9 +708,9 @@ TRACE_EVENT(afs_cb_call,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call ) -__field (u32 ,op ) -__field (u16, service_id ) + __field(unsigned int, call) +__field (u32 ,op ) +__field (u16, service_id) ), TP_fast_assign(
@@ -733,11 +733,11 @@ TRACE_EVENT(afs_call, TP_ARGS(call_debug_id, op, ref, outstanding, where),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (int, op ) -__field (int, ref ) -__field (int, outstanding ) - __field(const void *, where ) +__field (unsigned int ,call ) +__field (int, op) +__field (int, ref) +__field (int, outstanding) + __field(const void *, where) ), TP_fast_assign(
@@ -762,9 +762,9 @@ TRACE_EVENT(afs_make_fs_call,TP_ARGS (call, fid),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(enum afs_fs_operation, op ) - __field_struct(struct afs_fid, fid ) + __field(unsigned int, call) + __field(enum afs_fs_operation, op) + __field_struct(struct afs_fid, fid) ), TP_fast_assign(
@@ -794,10 +794,10 @@ TRACE_EVENT(afs_make_fs_calli,TP_ARGS (call, fid, i),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(unsigned int, i ) - __field(enum afs_fs_operation, op ) - __field_struct(struct afs_fid, fid ) + __field(unsigned int, call) + __field(unsigned int, i) + __field(enum afs_fs_operation, op) + __field_struct(struct afs_fid, fid) ), TP_fast_assign(
@@ -829,10 +829,10 @@ TRACE_EVENT(afs_make_fs_call1,TP_ARGS (call, fid, name),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(enum afs_fs_operation, op ) - __field_struct(struct afs_fid, fid ) -__array (char, name,24 ) + __field(unsigned int, call) + __field(enum afs_fs_operation, op) + __field_struct(struct afs_fid, fid) +__array (char, name,24 ) ), TP_fast_assign(
@@ -866,11 +866,11 @@ TRACE_EVENT(afs_make_fs_call2, TP_ARGS(call, fid, name, name2),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum afs_fs_operation, op ) - __field_struct(struct afs_fid, fid ) -__array (char, name,24 ) -__array (char, name2,24 ) +__field (unsigned int ,call ) + __field(enum afs_fs_operation, op) + __field_struct(struct afs_fid, fid) +__array (char, name,24 ) +__array (char, name2,24 ) ), TP_fast_assign(
@@ -907,8 +907,8 @@ TRACE_EVENT(afs_make_vl_call,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call ) -__field (enum afs_vl_operation ,op ) + __field(unsigned int, call) +__field (enum afs_vl_operation ,op ) ), TP_fast_assign(
@@ -927,10 +927,10 @@ TRACE_EVENT(afs_call_done,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call ) -__field (struct rxrpc_call *,rx_call ) -__field (int, ret ) -__field (u32, abort_code ) + __field(unsigned int, call) +__field (struct rxrpc_call *,rx_call ) +__field (int, ret) +__field (u32, abort_code) ), TP_fast_assign(
@@ -953,10 +953,10 @@ TRACE_EVENT(afs_send_data, TP_ARGS(call, msg),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(unsigned int, flags ) -__field (loff_t, offset ) -__field (loff_t, count ) +__field (unsigned int ,call ) + __field(unsigned int, flags) +__field (loff_t, offset) +__field (loff_t, count) ), TP_fast_assign(
@@ -977,10 +977,10 @@ TRACE_EVENT(afs_sent_data, TP_ARGS(call, msg, ret),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (int, ret ) -__field (loff_t, offset ) -__field (loff_t, count ) +__field (unsigned int ,call ) +__field (int, ret) +__field (loff_t, offset) +__field (loff_t, count) ), TP_fast_assign(
@@ -1001,9 +1001,9 @@ TRACE_EVENT(afs_dir_check_failed, TP_ARGS(vnode, off, i_size),TP_STRUCT__entry ( -__field (struct afs_vnode *,vnode ) -__field (loff_t, off ) -__field (loff_t, i_size ) +__field (struct afs_vnode *,vnode ) +__field (loff_t, off) +__field (loff_t, i_size) ), TP_fast_assign(
@@ -1022,11 +1022,11 @@ TRACE_EVENT(afs_folio_dirty, TP_ARGS(vnode, where, folio),TP_STRUCT__entry ( -__field (struct afs_vnode *,vnode ) - __field(const char *, where ) -__field (pgoff_t, index ) - __field(unsigned long, from ) - __field(unsigned long, to ) +__field (struct afs_vnode *,vnode ) + __field(const char *, where) +__field (pgoff_t, index) + __field(unsigned long, from) + __field(unsigned long, to) ), TP_fast_assign(
@@ -1056,11 +1056,11 @@ TRACE_EVENT(afs_call_state, TP_ARGS(call, from, to, ret, remote_abort),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum afs_call_state, from ) - __field(enum afs_call_state, to ) -__field (int, ret ) -__field (u32, abort ) +__field (unsigned int ,call ) + __field(enum afs_call_state, from) + __field(enum afs_call_state, to) +__field (int, ret) +__field (u32, abort) ), TP_fast_assign(
@@ -1084,9 +1084,9 @@ TRACE_EVENT(afs_lookup,TP_ARGS (dvnode, name, fid),TP_STRUCT__entry ( - __field_struct(struct afs_fid, dfid ) - __field_struct(struct afs_fid, fid ) -__array (char, name,24 ) + __field_struct(struct afs_fid, dfid) + __field_struct(struct afs_fid, fid) +__array (char, name,24 ) ), TP_fast_assign(
@@ -1116,15 +1116,15 @@ TRACE_EVENT(afs_edit_dir,TP_ARGS (dvnode, why, op, block, slot, f_vnode, f_unique, name),TP_STRUCT__entry ( - __field(unsigned int, vnode ) - __field(unsigned int, unique ) - __field(enum afs_edit_dir_reason, why ) - __field(enum afs_edit_dir_op, op ) - __field(unsigned int, block ) - __field(unsigned short, slot ) - __field(unsigned int, f_vnode ) - __field(unsigned int, f_unique ) -__array (char, name,24 ) + __field(unsigned int, vnode) + __field(unsigned int, unique) + __field(enum afs_edit_dir_reason, why) + __field(enum afs_edit_dir_op, op) + __field(unsigned int, block) + __field(unsigned short, slot) + __field(unsigned int, f_vnode) + __field(unsigned int, f_unique) +__array (char, name,24 ) ), TP_fast_assign(
@@ -1157,8 +1157,8 @@ TRACE_EVENT(afs_protocol_error,TP_ARGS (call, cause),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(enum afs_eproto_cause, cause ) + __field(unsigned int, call) + __field(enum afs_eproto_cause, cause) ), TP_fast_assign(
@@ -1177,9 +1177,9 @@ TRACE_EVENT(afs_io_error, TP_ARGS(call, error, where),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (int, error ) - __field(enum afs_io_error, where ) +__field (unsigned int ,call ) +__field (int, error) + __field(enum afs_io_error, where) ), TP_fast_assign(
@@ -1199,9 +1199,9 @@ TRACE_EVENT(afs_file_error, TP_ARGS(vnode, error, where),TP_STRUCT__entry ( -__field_struct (struct afs_fid ,fid ) -__field (int, error ) - __field(enum afs_file_error, where ) +__field_struct (struct afs_fid ,fid ) +__field (int, error) + __field(enum afs_file_error, where) ), TP_fast_assign(
@@ -1222,9 +1222,9 @@ TRACE_EVENT(afs_cm_no_server,TP_ARGS (call, srx),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(unsigned int, op_id ) - __field_struct(struct sockaddr_rxrpc, srx ) + __field(unsigned int, call) + __field(unsigned int, op_id) + __field_struct(struct sockaddr_rxrpc, srx) ), TP_fast_assign(
@@ -1243,9 +1243,9 @@ TRACE_EVENT(afs_cm_no_server_u,TP_ARGS (call, uuid),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(unsigned int, op_id ) -__field_struct (uuid_t, uuid ) + __field(unsigned int, call) + __field(unsigned int, op_id) +__field_struct (uuid_t, uuid) ), TP_fast_assign(
@@ -1265,11 +1265,11 @@ TRACE_EVENT(afs_flock_ev, TP_ARGS(vnode, fl, event, error),TP_STRUCT__entry ( -__field_struct (struct afs_fid ,fid ) - __field(enum afs_flock_event, event ) - __field(enum afs_lock_state, state ) -__field (int, error ) - __field(unsigned int, debug_id ) +__field_struct (struct afs_fid ,fid ) + __field(enum afs_flock_event, event) + __field(enum afs_lock_state, state) +__field (int, error) + __field(unsigned int, debug_id) ), TP_fast_assign(
@@ -1295,13 +1295,13 @@ TRACE_EVENT(afs_flock_op, TP_ARGS(vnode, fl, op),TP_STRUCT__entry ( -__field_struct (struct afs_fid ,fid ) -__field (loff_t, from ) -__field (loff_t, len ) - __field(enum afs_flock_operation, op ) - __field(unsigned char, type ) - __field(unsigned int, flags ) - __field(unsigned int, debug_id ) +__field_struct (struct afs_fid ,fid ) +__field (loff_t, from) +__field (loff_t, len) + __field(enum afs_flock_operation, op) + __field(unsigned char, type) + __field(unsigned int, flags) + __field(unsigned int, debug_id) ), TP_fast_assign(
@@ -1328,7 +1328,7 @@ TRACE_EVENT(afs_reload_dir,TP_ARGS (vnode),TP_STRUCT__entry ( -__field_struct (struct afs_fid ,fid ) +__field_struct (struct afs_fid ,fid ) ), TP_fast_assign(
@@ -1345,8 +1345,8 @@ TRACE_EVENT(afs_silly_rename,TP_ARGS (vnode, done),TP_STRUCT__entry ( - __field_struct(struct afs_fid, fid ) -__field (bool, done ) + __field_struct(struct afs_fid, fid) +__field (bool, done) ), TP_fast_assign(
@@ -1365,9 +1365,9 @@ TRACE_EVENT(afs_get_tree, TP_ARGS(cell, volume),TP_STRUCT__entry ( -__field (u64 ,vid ) -__array (char, cell,24 ) -__array (char, volume,24 ) +__field (u64 ,vid ) +__array (char, cell,24 ) +__array (char, volume,24 ) ), TP_fast_assign(
@@ -1392,10 +1392,10 @@ TRACE_EVENT(afs_cb_break,TP_ARGS (fid, cb_break, reason, skipped),TP_STRUCT__entry ( - __field_struct(struct afs_fid, fid ) - __field(unsigned int, cb_break ) - __field(enum afs_cb_break_reason, reason ) -__field (bool, skipped ) + __field_struct(struct afs_fid, fid) + __field(unsigned int, cb_break) + __field(enum afs_cb_break_reason, reason) +__field (bool, skipped) ), TP_fast_assign(
@@ -1418,8 +1418,8 @@ TRACE_EVENT(afs_cb_miss,TP_ARGS (fid, reason),TP_STRUCT__entry ( - __field_struct(struct afs_fid, fid ) - __field(enum afs_cb_break_reason, reason ) + __field_struct(struct afs_fid, fid) + __field(enum afs_cb_break_reason, reason) ), TP_fast_assign(
@@ -1439,10 +1439,10 @@ TRACE_EVENT(afs_server, TP_ARGS(server_debug_id, ref, active, reason),TP_STRUCT__entry ( -__field (unsigned int ,server ) -__field (int, ref ) -__field (int, active ) -__field (int, reason ) +__field (unsigned int ,server ) +__field (int, ref) +__field (int, active) +__field (int, reason) ), TP_fast_assign(
@@ -1465,9 +1465,9 @@ TRACE_EVENT(afs_volume, TP_ARGS(vid, ref, reason),TP_STRUCT__entry ( -__field (afs_volid_t ,vid ) -__field (int, ref ) - __field(enum afs_volume_trace, reason ) +__field (afs_volid_t ,vid ) +__field (int, ref) + __field(enum afs_volume_trace, reason) ), TP_fast_assign(
@@ -1489,10 +1489,10 @@ TRACE_EVENT(afs_cell, TP_ARGS(cell_debug_id, ref, active, reason),TP_STRUCT__entry ( -__field (unsigned int ,cell ) -__field (int, ref ) -__field (int, active ) -__field (int, reason ) +__field (unsigned int ,cell ) +__field (int, ref) +__field (int, active) +__field (int, reason) ), TP_fast_assign(
David Howells
maintainerPATCH v5 2/40 afs: Automatically generate trace tag enums
In reply to David HowellsAutomatically generate trace tag enums from the symbol -> string mapping tables rather than having the enums as well, thereby reducing duplicated data.
--- include/trace/events/afs.h | 233 +++++-------------------------------- 1 file changed, 27 insertions(+), 206 deletions(-)
include/trace/events/afs.h +27 -206
@@ -18,97 +18,6 @@#ifndef __AFS_DECLARE_TRACE_ENUMS_ONCE_ONLY#define __AFS_DECLARE_TRACE_ENUMS_ONCE_ONLY -enum afs_call_trace { - afs_call_trace_alloc, - afs_call_trace_free, - afs_call_trace_get, - afs_call_trace_put, - afs_call_trace_wake, - afs_call_trace_work, -}; - -enum afs_server_trace { - afs_server_trace_alloc, - afs_server_trace_callback, - afs_server_trace_destroy, - afs_server_trace_free, - afs_server_trace_gc, - afs_server_trace_get_by_addr, - afs_server_trace_get_by_uuid, - afs_server_trace_get_caps, - afs_server_trace_get_install, - afs_server_trace_get_new_cbi, - afs_server_trace_get_probe, - afs_server_trace_give_up_cb, - afs_server_trace_purging, - afs_server_trace_put_call, - afs_server_trace_put_cbi, - afs_server_trace_put_find_rsq, - afs_server_trace_put_probe, - afs_server_trace_put_slist, - afs_server_trace_put_slist_isort, - afs_server_trace_put_uuid_rsq, - afs_server_trace_update, -}; - - -enum afs_volume_trace { - afs_volume_trace_alloc, - afs_volume_trace_free, - afs_volume_trace_get_alloc_sbi, - afs_volume_trace_get_cell_insert, - afs_volume_trace_get_new_op, - afs_volume_trace_get_query_alias, - afs_volume_trace_put_cell_dup, - afs_volume_trace_put_cell_root, - afs_volume_trace_put_destroy_sbi, - afs_volume_trace_put_free_fc, - afs_volume_trace_put_put_op, - afs_volume_trace_put_query_alias, - afs_volume_trace_put_validate_fc, - afs_volume_trace_remove, -}; - -enum afs_cell_trace { - afs_cell_trace_alloc, - afs_cell_trace_free, - afs_cell_trace_get_queue_dns, - afs_cell_trace_get_queue_manage, - afs_cell_trace_get_queue_new, - afs_cell_trace_get_vol, - afs_cell_trace_insert, - afs_cell_trace_manage, - afs_cell_trace_put_candidate, - afs_cell_trace_put_destroy, - afs_cell_trace_put_queue_fail, - afs_cell_trace_put_queue_work, - afs_cell_trace_put_vol, - afs_cell_trace_see_source, - afs_cell_trace_see_ws, - afs_cell_trace_unuse_alias, - afs_cell_trace_unuse_check_alias, - afs_cell_trace_unuse_delete, - afs_cell_trace_unuse_fc, - afs_cell_trace_unuse_lookup, - afs_cell_trace_unuse_mntpt, - afs_cell_trace_unuse_no_pin, - afs_cell_trace_unuse_parse, - afs_cell_trace_unuse_pin, - afs_cell_trace_unuse_probe, - afs_cell_trace_unuse_sbi, - afs_cell_trace_unuse_ws, - afs_cell_trace_use_alias, - afs_cell_trace_use_check_alias, - afs_cell_trace_use_fc, - afs_cell_trace_use_fc_alias, - afs_cell_trace_use_lookup, - afs_cell_trace_use_mntpt, - afs_cell_trace_use_pin, - afs_cell_trace_use_probe, - afs_cell_trace_use_sbi, - afs_cell_trace_wait, -}; -enum afs_fs_operation { afs_FS_FetchData =130 ,/* AFS Fetch file data */ afs_FS_FetchACL = 131, /* AFS Fetch file ACL */
@@ -202,121 +111,6 @@ enum yfs_cm_operation { yfs_CB_CallBack = 64204, }; -enum afs_edit_dir_op { - afs_edit_dir_create, - afs_edit_dir_create_error, - afs_edit_dir_create_inval, - afs_edit_dir_create_nospc, - afs_edit_dir_delete, - afs_edit_dir_delete_error, - afs_edit_dir_delete_inval, - afs_edit_dir_delete_noent, -}; - -enum afs_edit_dir_reason { - afs_edit_dir_for_create, - afs_edit_dir_for_link, - afs_edit_dir_for_mkdir, - afs_edit_dir_for_rename_0, - afs_edit_dir_for_rename_1, - afs_edit_dir_for_rename_2, - afs_edit_dir_for_rmdir, - afs_edit_dir_for_silly_0, - afs_edit_dir_for_silly_1, - afs_edit_dir_for_symlink, - afs_edit_dir_for_unlink, -}; - -enum afs_eproto_cause { - afs_eproto_bad_status, - afs_eproto_cb_count, - afs_eproto_cb_fid_count, - afs_eproto_cellname_len, - afs_eproto_file_type, - afs_eproto_ibulkst_cb_count, - afs_eproto_ibulkst_count, - afs_eproto_motd_len, - afs_eproto_offline_msg_len, - afs_eproto_volname_len, - afs_eproto_yvl_fsendpt4_len, - afs_eproto_yvl_fsendpt6_len, - afs_eproto_yvl_fsendpt_num, - afs_eproto_yvl_fsendpt_type, - afs_eproto_yvl_vlendpt4_len, - afs_eproto_yvl_vlendpt6_len, - afs_eproto_yvl_vlendpt_type, -}; - -enum afs_io_error { - afs_io_error_cm_reply, - afs_io_error_extract, - afs_io_error_fs_probe_fail, - afs_io_error_vl_lookup_fail, - afs_io_error_vl_probe_fail, -}; - -enum afs_file_error { - afs_file_error_dir_bad_magic, - afs_file_error_dir_big, - afs_file_error_dir_missing_page, - afs_file_error_dir_name_too_long, - afs_file_error_dir_over_end, - afs_file_error_dir_small, - afs_file_error_dir_unmarked_ext, - afs_file_error_mntpt, - afs_file_error_writeback_fail, -}; - -enum afs_flock_event { - afs_flock_acquired, - afs_flock_callback_break, - afs_flock_defer_unlock, - afs_flock_extend_fail, - afs_flock_fail_other, - afs_flock_fail_perm, - afs_flock_no_lockers, - afs_flock_release_fail, - afs_flock_silly_delete, - afs_flock_timestamp, - afs_flock_try_to_lock, - afs_flock_vfs_lock, - afs_flock_vfs_locking, - afs_flock_waited, - afs_flock_waiting, - afs_flock_work_extending, - afs_flock_work_retry, - afs_flock_work_unlocking, - afs_flock_would_block, -}; - -enum afs_flock_operation { - afs_flock_op_copy_lock, - afs_flock_op_flock, - afs_flock_op_grant, - afs_flock_op_lock, - afs_flock_op_release_lock, - afs_flock_op_return_ok, - afs_flock_op_return_eagain, - afs_flock_op_return_edeadlk, - afs_flock_op_return_error, - afs_flock_op_set_lock, - afs_flock_op_unlock, - afs_flock_op_wake, -}; - -enum afs_cb_break_reason { - afs_cb_break_no_break, - afs_cb_break_no_promise, - afs_cb_break_for_callback, - afs_cb_break_for_deleted, - afs_cb_break_for_lapsed, - afs_cb_break_for_s_reinit, - afs_cb_break_for_unlink, - afs_cb_break_for_v_break, - afs_cb_break_for_volume_callback, - afs_cb_break_for_zap, -}; -#endif /* end __AFS_DECLARE_TRACE_ENUMS_ONCE_ONLY */ /*
@@ -391,6 +185,7 @@ enum afs_cb_break_reason { EM(afs_cell_trace_unuse_fc, "UNU fc ") \ EM(afs_cell_trace_unuse_lookup, "UNU lookup") \ EM(afs_cell_trace_unuse_mntpt, "UNU mntpt ") \ + EM(afs_cell_trace_unuse_no_pin, "UNU no-pin") \ EM(afs_cell_trace_unuse_parse, "UNU parse ") \ EM(afs_cell_trace_unuse_pin, "UNU pin ") \EM (afs_cell_trace_unuse_probe,"UNU probe " ) \
@@ -614,6 +409,32 @@ enum afs_cb_break_reason { EM(afs_cb_break_for_volume_callback, "break-v-cb") \E_ (afs_cb_break_for_zap,"break-zap" ) +/* +* Generate enums for tracing information. + */ +#ifndef __AFS_GENERATE_TRACE_ENUMS_ONCE_ONLY +#define __AFS_GENERATE_TRACE_ENUMS_ONCE_ONLY + +#undef EM +#undef E_ +#define EM (a, b) a, +#define E_ (a, b) a + +enum afs_call_trace { afs_call_traces }__mode (byte ); +enum afs_cb_break_reason { afs_cb_break_reasons }__mode (byte ); +enum afs_cell_trace { afs_cell_traces }__mode (byte ); +enum afs_edit_dir_op { afs_edit_dir_ops }__mode (byte ); +enum afs_edit_dir_reason { afs_edit_dir_reasons }__mode (byte ); +enum afs_eproto_cause { afs_eproto_causes }__mode (byte ); +enum afs_file_error { afs_file_errors }__mode (byte ); +enum afs_flock_event { afs_flock_events }__mode (byte ); +enum afs_flock_operation { afs_flock_operations }__mode (byte ); +enum afs_io_error { afs_io_errors }__mode (byte ); +enum afs_server_trace { afs_server_traces }__mode (byte ); +enum afs_volume_trace { afs_volume_traces }__mode (byte ); + +#endif /* end __AFS_GENERATE_TRACE_ENUMS_ONCE_ONLY */ +/* * Export enum symbols via userspace. */
David Howells
maintainerPATCH v5 3/40 netfs, fscache: Move fs/fscache/* into fs/netfs/
In reply to David HowellsThere's a problem with dependencies between netfslib and fscache as each wants to access some functions of the other. Deal with this by moving fs/fscache/* into fs/netfs/ and renaming those files to begin with "fscache-".
For the moment, the moved files are changed as little as possible and an fscache module is still built. A subsequent patch will integrate them.
---
Notes:
Changes
=======
ver #5)
- Adjust MAINTAINERS file. MAINTAINERS | 21 ++++++----
fs/Kconfig | 1 -
fs/Makefile | 1 -
fs/fscache/Kconfig | 40 -------------------
fs/fscache/Makefile | 16 --------
fs/netfs/Kconfig | 39 ++++++++++++++++++
fs/netfs/Makefile | 14 ++++++-
fs/{fscache/cache.c => netfs/fscache_cache.c} | 0
.../cookie.c => netfs/fscache_cookie.c} | 0
.../internal.h => netfs/fscache_internal.h} | 0
fs/{fscache/io.c => netfs/fscache_io.c} | 0
fs/{fscache/main.c => netfs/fscache_main.c} | 0
fs/{fscache/proc.c => netfs/fscache_proc.c} | 0
fs/{fscache/stats.c => netfs/fscache_stats.c} | 0
.../volume.c => netfs/fscache_volume.c} | 0
fs/netfs/internal.h | 5 +++
fs/netfs/main.c | 5 ++-
17 files changed, 73 insertions(+), 69 deletions(-)
delete mode 100644 fs/fscache/Kconfig
delete mode 100644 fs/fscache/Makefile
rename fs/{fscache/cache.c => netfs/fscache_cache.c} (100%)
rename fs/{fscache/cookie.c => netfs/fscache_cookie.c} (100%)
rename fs/{fscache/internal.h => netfs/fscache_internal.h} (100%)
rename fs/{fscache/io.c => netfs/fscache_io.c} (100%)
rename fs/{fscache/main.c => netfs/fscache_main.c} (100%)
rename fs/{fscache/proc.c => netfs/fscache_proc.c} (100%)
rename fs/{fscache/stats.c => netfs/fscache_stats.c} (100%)
rename fs/{fscache/volume.c => netfs/fscache_volume.c} (100%)MAINTAINERS +13 -8
@@ -8135,6 +8135,19 @@ S: Supported F: fs/iomap/ F: include/linux/iomap.h +FILESYSTEMS [NETFS LIBRARY] +M: David Howells <[email protected]> +L: [email protected] (moderated for non-subscribers) +L: [email protected] +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 + FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER M: Riku Voipio <[email protected]> L: [email protected]
@@ -8569,14 +8582,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 <[email protected]> -L: [email protected] (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 <[email protected]> M: Theodore Y. Ts'o <[email protected]>
fs/Kconfig +0 -1
@@ -140,7 +140,6 @@ source "fs/overlayfs/Kconfig" menu "Caches" source "fs/netfs/Kconfig" -source "fs/fscache/Kconfig" source "fs/cachefiles/Kconfig" endmenu
fs/Makefile +0 -1
@@ -60,7 +60,6 @@ obj-$(CONFIG_DLM) += dlm/ # Do not add any filesystems before this line obj-$(CONFIG_NETFS_SUPPORT) += netfs/ -obj-$(CONFIG_FSCACHE) += fscache/ obj-$(CONFIG_REISERFS_FS) += reiserfs/ obj-$(CONFIG_EXT4_FS) += ext4/ # We place ext4 before ext2 so that clean ext3 root fs's do NOT mount using the
fs/fscache/Kconfig deleted +0 -40
@@ -1,40 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -config FSCACHE - tristate "General filesystem local caching manager" - select NETFS_SUPPORT - help - This option enables a generic filesystem caching manager that can be - used by various network and other filesystems to cache data locally. - Different sorts of caches can be plugged in, depending on the - resources available. - - See Documentation/filesystems/caching/fscache.rst for more information. - -config FSCACHE_STATS - bool "Gather statistical information on local caching" - depends on FSCACHE && PROC_FS - select NETFS_STATS - help - This option causes statistical information to be gathered on local - caching and exported through file: - - /proc/fs/fscache/stats - - The gathering of statistics adds a certain amount of overhead to - execution as there are a quite a few stats gathered, and on a - multi-CPU system these may be on cachelines that keep bouncing - between CPUs. On the other hand, the stats are very useful for - debugging purposes. Saying 'Y' here is recommended. - - See Documentation/filesystems/caching/fscache.rst for more information. - -config FSCACHE_DEBUG - bool "Debug FS-Cache" - depends on FSCACHE - help - This permits debugging to be dynamically enabled in the local caching - management module. If this is set, the debugging output may be - enabled by setting bits in /sys/modules/fscache/parameter/debug. - - See Documentation/filesystems/caching/fscache.rst for more information.
fs/fscache/Makefile deleted +0 -16
@@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Makefile for general filesystem caching code -# - -fscache-y := \ - cache.o \ - cookie.o \ - io.o \ - main.o \ - volume.o - -fscache-$(CONFIG_PROC_FS) += proc.o -fscache-$(CONFIG_FSCACHE_STATS) += stats.o - -obj-$(CONFIG_FSCACHE) := fscache.o
fs/netfs/Kconfig +39 -0
@@ -21,3 +21,42 @@ config NETFS_STATS multi-CPU system these may be on cachelines that keep bouncing between CPUs. On the other hand, the stats are very useful for debugging purposes. Saying 'Y' here is recommended. + +config FSCACHE + tristate "General filesystem local caching manager" + select NETFS_SUPPORT + help + This option enables a generic filesystem caching manager that can be + used by various network and other filesystems to cache data locally. + Different sorts of caches can be plugged in, depending on the + resources available. + + See Documentation/filesystems/caching/fscache.rst for more information. + +config FSCACHE_STATS + bool "Gather statistical information on local caching" + depends on FSCACHE && PROC_FS + select NETFS_STATS + help + This option causes statistical information to be gathered on local + caching and exported through file: + + /proc/fs/fscache/stats + + The gathering of statistics adds a certain amount of overhead to + execution as there are a quite a few stats gathered, and on a + multi-CPU system these may be on cachelines that keep bouncing + between CPUs. On the other hand, the stats are very useful for + debugging purposes. Saying 'Y' here is recommended. + + See Documentation/filesystems/caching/fscache.rst for more information. + +config FSCACHE_DEBUG + bool "Debug FS-Cache" + depends on FSCACHE + help + This permits debugging to be dynamically enabled in the local caching + management module. If this is set, the debugging output may be + enabled by setting bits in /sys/modules/fscache/parameter/debug. + + See Documentation/filesystems/caching/fscache.rst for more information.
fs/netfs/Makefile +13 -1
@@ -1,5 +1,17 @@ # SPDX-License-Identifier: GPL-2.0 +fscache-y := \ + fscache_cache.o \ + fscache_cookie.o \ + fscache_io.o \ + fscache_main.o \ + fscache_volume.o + +fscache-$(CONFIG_PROC_FS) += fscache_proc.o +fscache-$(CONFIG_FSCACHE_STATS) += fscache_stats.o + +obj-$(CONFIG_FSCACHE) := fscache.o + netfs-y := \ buffered_read.o \ io.o \
@@ -9,4 +21,4 @@ netfs-y := \ netfs-$(CONFIG_NETFS_STATS) += stats.o -obj-$(CONFIG_NETFS_SUPPORT) := netfs.o +obj-$(CONFIG_NETFS_SUPPORT) += netfs.o
fs/netfs/fscache_cache.c renamed from fs/fscache/cache.c +0 -0
fs/netfs/fscache_cookie.c renamed from fs/fscache/cookie.c +0 -0
fs/netfs/fscache_internal.h renamed from fs/fscache/internal.h +0 -0
fs/netfs/fscache_io.c renamed from fs/fscache/io.c +0 -0
fs/netfs/fscache_main.c renamed from fs/fscache/main.c +0 -0
fs/netfs/fscache_proc.c renamed from fs/fscache/proc.c +0 -0
fs/netfs/fscache_stats.c renamed from fs/fscache/stats.c +0 -0
fs/netfs/fscache_volume.c renamed from fs/fscache/volume.c +0 -0
fs/netfs/internal.h +5 -0
@@ -5,9 +5,12 @@* Written by David Howells ([email protected]) */ +#include <linux/slab.h> +#include <linux/seq_file.h> #include <linux/netfs.h> #include <linux/fscache.h> #include <trace/events/netfs.h> +#include "fscache_internal.h" #ifdef pr_fmt#undef pr_fmt
@@ -107,6 +110,7 @@ static inline bool netfs_is_cache_enabled(struct netfs_inode *ctx)/* * debug tracing */ +#if 0 #define dbgprintk (FMT , ...) \ printk("[%-6.6s] "FMT"\n", current->comm, ##__VA_ARGS__)
@@ -143,3 +147,4 @@ do { \#define _leave (FMT , ...) no_printk("<== %s()"FMT"", __func__, ##__VA_ARGS__)#define _debug (FMT , ...) no_printk(FMT, ##__VA_ARGS__)#endif +#endif
fs/netfs/main.c +3 -2
@@ -8,8 +8,8 @@#include <linux/module.h> #include <linux/export.h> #include "internal.h" -#define CREATE_TRACE_POINTS -#include <trace/events/netfs.h> +//#define CREATE_TRACE_POINTS +//#include <trace/events/netfs.h> MODULE_DESCRIPTION ("Network fs support" );MODULE_AUTHOR ("Red Hat, Inc." );
@@ -18,3 +18,4 @@ MODULE_LICENSE("GPL");unsigned netfs_debug;module_param_named (debug, netfs_debug, uint,S_IWUSR |S_IRUGO );MODULE_PARM_DESC (netfs_debug,"Netfs support debugging mask" ); +
David Howells
maintainerPATCH v5 4/40 netfs, fscache: Combine fscache with netfs
In reply to David HowellsNow that the fscache code is moved to be colocated with the netfslib code so that they combined into one module, do the combining.
---
Notes:
Changes
=======
ver #5)
- Cachefiles needs to depend on NETFS_SUPPORT also now.
- Change arch defconfigs to have NETFS_SUPPORT=m and FSCACHE=y when FSCACHE was m.
arch/arm/configs/mxs_defconfig | 3 +- arch/csky/configs/defconfig | 3 +- arch/mips/configs/ip27_defconfig | 3 +- arch/mips/configs/lemote2f_defconfig | 3 +- arch/mips/configs/loongson3_defconfig | 3 +- arch/mips/configs/pic32mzda_defconfig | 3 +- arch/s390/configs/debug_defconfig | 3 +- arch/s390/configs/defconfig | 3 +- arch/sh/configs/sdk7786_defconfig | 3 +- fs/cachefiles/Kconfig | 2 +- fs/netfs/Kconfig | 4 +- fs/netfs/Makefile | 24 +-- fs/netfs/fscache_internal.h | 267 +------------------------- fs/netfs/fscache_main.c | 17 +- fs/netfs/internal.h | 192 +++++++++++++++++- fs/netfs/main.c | 4 +- fs/nfs/Kconfig | 4 +- 17 files changed, 232 insertions(+), 309 deletions(-)
arch/arm/configs/mxs_defconfig +2 -1
@@ -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
@@ -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
@@ -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
arch/mips/configs/lemote2f_defconfig +2 -1
@@ -238,7 +238,8 @@ CONFIG_BTRFS_FS=m CONFIG_QUOTA=y CONFIG_QFMT_V2=m CONFIG_AUTOFS_FS=m -CONFIG_FSCACHE=m +CONFIG_NETFS_SUPPORT=m +CONFIG_FSCACHE=y CONFIG_CACHEFILES=m CONFIG_ISO9660_FS=m CONFIG_JOLIET=y
arch/mips/configs/loongson3_defconfig +2 -1
@@ -356,7 +356,8 @@ CONFIG_QFMT_V2=m CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_VIRTIO_FS=m -CONFIG_FSCACHE=m +CONFIG_NETFS_SUPPORT=m +CONFIG_FSCACHE=y CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_MSDOS_FS=m
arch/mips/configs/pic32mzda_defconfig +2 -1
@@ -68,7 +68,8 @@ CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m -CONFIG_FSCACHE=m +CONFIG_NETFS_SUPPORT=m +CONFIG_FSCACHE=y CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y
arch/s390/configs/debug_defconfig +2 -1
@@ -635,8 +635,9 @@ CONFIG_FUSE_FS=y CONFIG_CUSE=m CONFIG_VIRTIO_FS=m CONFIG_OVERLAY_FS=m +CONFIG_NETFS_SUPPORT=m CONFIG_NETFS_STATS=y -CONFIG_FSCACHE=m +CONFIG_FSCACHE=y CONFIG_CACHEFILES=m CONFIG_ISO9660_FS=y CONFIG_JOLIET=y
arch/s390/configs/defconfig +2 -1
@@ -620,8 +620,9 @@ CONFIG_FUSE_FS=y CONFIG_CUSE=m CONFIG_VIRTIO_FS=m CONFIG_OVERLAY_FS=m +CONFIG_NETFS_SUPPORT=m CONFIG_NETFS_STATS=y -CONFIG_FSCACHE=m +CONFIG_FSCACHE=y CONFIG_CACHEFILES=m CONFIG_ISO9660_FS=y CONFIG_JOLIET=y
arch/sh/configs/sdk7786_defconfig +2 -1
@@ -171,7 +171,8 @@ CONFIG_BTRFS_FS=y CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=y CONFIG_CUSE=m -CONFIG_FSCACHE=m +CONFIG_NETFS_SUPPORT=m +CONFIG_FSCACHE=y CONFIG_CACHEFILES=m CONFIG_ISO9660_FS=m CONFIG_JOLIET=y
fs/cachefiles/Kconfig +1 -1
@@ -2,7 +2,7 @@ config CACHEFILES tristate "Filesystem caching on files" - depends on FSCACHE && BLOCK + depends on NETFS_SUPPORT && FSCACHE && BLOCK help This permits use of a mounted filesystem as a cache for other filesystems - primarily networking filesystems - thus allowing fast
fs/netfs/Kconfig +2 -2
@@ -23,8 +23,8 @@ config NETFS_STATS debugging purposes. Saying 'Y' here is recommended. config FSCACHE - tristate "General filesystem local caching manager" - select NETFS_SUPPORT + bool "General filesystem local caching manager" + depends on NETFS_SUPPORT help This option enables a generic filesystem caching manager that can be used by various network and other filesystems to cache data locally.
fs/netfs/Makefile +12 -12
@@ -1,17 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -fscache-y := \ - fscache_cache.o \ - fscache_cookie.o \ - fscache_io.o \ - fscache_main.o \ - fscache_volume.o - -fscache-$(CONFIG_PROC_FS) += fscache_proc.o -fscache-$(CONFIG_FSCACHE_STATS) += fscache_stats.o - -obj-$(CONFIG_FSCACHE) := fscache.o - netfs-y := \ buffered_read.o \ io.o \
@@ -21,4 +9,16 @@ netfs-y := \ netfs-$(CONFIG_NETFS_STATS) += stats.o +netfs-$(CONFIG_FSCACHE) += \ + fscache_cache.o \ + fscache_cookie.o \ + fscache_io.o \ + fscache_main.o \ + fscache_volume.o + +ifeq ($(CONFIG_PROC_FS),y) +netfs-$(CONFIG_FSCACHE) += fscache_proc.o +endif +netfs-$(CONFIG_FSCACHE_STATS) += fscache_stats.o + obj-$(CONFIG_NETFS_SUPPORT) += netfs.o
fs/netfs/fscache_internal.h +2 -265
275 lines not on this page · raw message
fs/netfs/fscache_main.c +4 -13
@@ -8,18 +8,9 @@#define FSCACHE_DEBUG_LEVEL CACHE#include <linux/module.h> #include <linux/init.h> -#define CREATE_TRACE_POINTS #include "internal.h" - -MODULE_DESCRIPTION ("FS Cache Manager" ); -MODULE_AUTHOR ("Red Hat, Inc." ); -MODULE_LICENSE ("GPL" ); - -unsigned fscache_debug; -module_param_named (debug, fscache_debug, uint, -S_IWUSR |S_IRUGO ); -MODULE_PARM_DESC (fscache_debug, -"FS-Cache debugging mask" ); +#define CREATE_TRACE_POINTS +#include <trace/events/fscache.h> EXPORT_TRACEPOINT_SYMBOL (fscache_access_cache);EXPORT_TRACEPOINT_SYMBOL (fscache_access_volume);
@@ -92,7 +83,7 @@ static int __init fscache_init(void) goto error_cookie_jar; } -pr_notice ("Loaded\n" ); +pr_notice ("FS-Cache loaded\n" );return 0 ; error_cookie_jar:
@@ -115,7 +106,7 @@ static void __exit fscache_exit(void)kmem_cache_destroy (fscache_cookie_jar);fscache_proc_cleanup ();destroy_workqueue (fscache_wq); -pr_notice ("Unloaded\n" ); +pr_notice ("FS-Cache unloaded\n" ); }module_exit (fscache_exit);
fs/netfs/internal.h +189 -3
212 lines not on this page · raw message
fs/netfs/main.c +2 -2
@@ -8,8 +8,8 @@#include <linux/module.h> #include <linux/export.h> #include "internal.h" -//#define CREATE_TRACE_POINTS -//#include <trace/events/netfs.h> +#define CREATE_TRACE_POINTS +#include <trace/events/netfs.h> MODULE_DESCRIPTION ("Network fs support" );MODULE_AUTHOR ("Red Hat, Inc." );
fs/nfs/Kconfig +2 -2
@@ -169,8 +169,8 @@ config ROOT_NFS config NFS_FSCACHE bool "Provide NFS client caching support" - depends on NFS_FS=m && FSCACHE || NFS_FS=y && FSCACHE=y - select NETFS_SUPPORT + depends on NFS_FS=m && NETFS_SUPPORT || NFS_FS=y && NETFS_SUPPORT=y + select FSCACHE help Say Y here if you want NFS data to be cached locally on disc through the general filesystem cache manager
David Howells
maintainerPATCH 1/1 Fix EROFS Kconfig
This needs an additional change (see attached).
fs/erofs/Kconfig +2 -1
@@ -114,7 +114,8 @@ config EROFS_FS_ZIP_DEFLATE config EROFS_FS_ONDEMAND bool "EROFS fscache-based on-demand read support" - depends on CACHEFILES_ONDEMAND && (EROFS_FS=m && FSCACHE || EROFS_FS=y && FSCACHE=y) + depends on CACHEFILES_ONDEMAND && FSCACHE && \ + (EROFS_FS=m && NETFS_SUPPORT || EROFS_FS=y && NETFS_SUPPORT=y) default n help This permits EROFS to use fscache-backed data blobs with on-demand
Re: [PATCH] Fix EROFS Kconfig
Hi,
Quoted 8 lines · David Howells
This needs an additional change (see attached).
fs/erofs/Kconfig +0
-0
fs/erofs/Kconfig config EROFS_FS_ZIP_DEFLATE · line 121
Quoted 9 lines
fs/erofs/Kconfig +2
-1@@ -114,7 +114,8 @@ config EROFS_FS_ZIP_DEFLATE config EROFS_FS_ONDEMAND bool "EROFS fscache-based on-demand read support" - depends on CACHEFILES_ONDEMAND && (EROFS_FS=m && FSCACHE || EROFS_FS=y && FSCACHE=y) + depends on CACHEFILES_ONDEMAND && FSCACHE && \ + (EROFS_FS=m && NETFS_SUPPORT || EROFS_FS=y && NETFS_SUPPORT=y) default n help This permits EROFS to use fscache-backed data blobs with on-demand
Thanks for the special reminder. I noticed that it has been included in this commit[*] in the dev tree.
Besides I noticed an issue when trying to configure EROFS_FS_ONDEMAND. The above kconfig indicates that EROFS_FS_ONDEMAND depends on NETFS_SUPPORT, while NETFS_SUPPORT has no prompt in menuconfig and can only be selected by, e.g. fs/ceph/Kconfig:
config CEPH_FS
select NETFS_SUPPORT
IOW EROFS_FS_ONDEMAND will not be prompted and has no way being configured if NETFS_SUPPORT itself is not selected by any other filesystem.
I tried to fix this in following way:
fs/erofs/Kconfig +1 -2
@@ -5,6 +5,7 @@ config EROFS_FS depends on BLOCK select FS_IOMAP select LIBCRC32C + select NETFS_SUPPORT if EROFS_FS_ONDEMAND help EROFS (Enhanced Read-Only File System) is a lightweight read-only file system with modern designs (e.g. no buffer heads, inline
@@ -114,8 +115,10 @@ config EROFS_FS_ZIP_DEFLATE config EROFS_FS_ONDEMAND bool "EROFS fscache-based on-demand read support" - depends on CACHEFILES_ONDEMAND && FSCACHE && \ - (EROFS_FS=m && NETFS_SUPPORT || EROFS_FS=y &&
NETFS_SUPPORT=y)
+ depends on EROFS_FS
+ select FSCACHE
default n
help
This permits EROFS to use fscache-backed data blobs with on-demand
But still the dependency for CACHEFILES_ONDEMAND and CACHEFILES can not be resolved. Though CACHEFILES is not a must during the linking stage as EROFS only calls fscache APIs directly, CACHEFILES is indeed needed to ensure that the EROFS on-demand functionality works at runtime.
If we let EROFS_FS_ONDEMAND select CACHEFILES_ONDEMAND, then only CACHEFILES_ONDEMAND will be selected while CACHEFILES can be still N. Maybe EROFS_FS_ONDEMAND needs to selct both CACHEFILES_ONDEMAND and CACHEFILES?
Besides if we make EROFS_FS_ONDEMAND depends on CACHEFILES_ONDEMAND, then there will be a recursive dependency loop, as
fs/netfs/Kconfig:3:error: recursive dependency detected!fs/netfs/Kconfig:3: symbol NETFS_SUPPORT is selected by EROFS_FS_ONDEMANDfs/erofs/Kconfig:116: symbol EROFS_FS_ONDEMAND depends onCACHEFILES_ONDEMANDfs/cachefiles/Kconfig:30: symbol CACHEFILES_ONDEMAND depends on CACHEFILESfs/cachefiles/Kconfig:3: symbol CACHEFILES depends on NETFS_SUPPORT
Hi Xiang, any better idea?
Signature · 2 lines
Thanks, Jingbo
Re: [PATCH] Fix EROFS Kconfig
Hi David and Jingbo,
Quoted 73 lines · Jingbo Xu
Hi,
Quoted 8 lines · David Howells
This needs an additional change (see attached).
fs/erofs/Kconfig +0
-0fs/erofs/Kconfig config EROFS_FS_ZIP_DEFLATE · line 121
Quoted 9 lines
fs/erofs/Kconfig +2
-1@@ -114,7 +114,8 @@ config EROFS_FS_ZIP_DEFLATE config EROFS_FS_ONDEMAND bool "EROFS fscache-based on-demand read support" - depends on CACHEFILES_ONDEMAND && (EROFS_FS=m && FSCACHE || EROFS_FS=y && FSCACHE=y) + depends on CACHEFILES_ONDEMAND && FSCACHE && \ + (EROFS_FS=m && NETFS_SUPPORT || EROFS_FS=y && NETFS_SUPPORT=y) default n help This permits EROFS to use fscache-backed data blobs with on-demandThanks for the special reminder. I noticed that it has been included in this commit[*] in the dev tree.
Besides I noticed an issue when trying to configure
EROFS_FS_ONDEMAND. The above kconfig indicates thatEROFS_FS_ONDEMANDdepends onNETFS_SUPPORT, whileNETFS_SUPPORThas no prompt in menuconfig and can only be selected by, e.g.fs/ceph/Kconfig:config
CEPH_FS
selectNETFS_SUPPORTIOW
EROFS_FS_ONDEMANDwill not be prompted and has no way being configured ifNETFS_SUPPORTitself is not selected by any other filesystem.I tried to fix this in following way:
fs/erofs/Kconfig +3
-2@@ -5,6 +5,7 @@ config EROFS_FS depends on BLOCK select FS_IOMAP select LIBCRC32C + select NETFS_SUPPORT if EROFS_FS_ONDEMAND help EROFS (Enhanced Read-Only File System) is a lightweight read-only file system with modern designs (e.g. no buffer heads, inline@@ -114,8 +115,10 @@ config EROFS_FS_ZIP_DEFLATE config EROFS_FS_ONDEMAND bool "EROFS fscache-based on-demand read support" - depends on CACHEFILES_ONDEMAND && FSCACHE && \ - (EROFS_FS=m && NETFS_SUPPORT || EROFS_FS=y && NETFS_SUPPORT=y) + depends on EROFS_FS + select FSCACHE default n help This permits EROFS to use fscache-backed data blobs with on-demandBut still the dependency for
CACHEFILES_ONDEMANDand CACHEFILES can not be resolved. Though CACHEFILES is not a must during the linking stage as EROFS only calls fscache APIs directly, CACHEFILES is indeed needed to ensure that the EROFS on-demand functionality works at runtime.
Quoted 4 lines
If we let
EROFS_FS_ONDEMANDselectCACHEFILES_ONDEMAND, then onlyCACHEFILES_ONDEMANDwill be selected while CACHEFILES can be still N. MaybeEROFS_FS_ONDEMANDneeds to selct bothCACHEFILES_ONDEMANDand CACHEFILES?
I think the main point here is that we don't have an explicit menuconfig item for either netfs or fscache directly.
In principle, EROFS ondemand feature only needs fscache "volume and cookie" management framework as well as cachefiles since they're all needed to manage EROFS cached blobs, but I'm fine if that needs NETFS_SUPPORT is also enabled.
If netfs doesn't have a plan for a new explicit menuconfig item for users to use, I think we have to enable as below:
fs/erofs/Kconfig +5 -2
@@ -114,8 +114,11 @@ config EROFS_FS_ZIP_DEFLATE config EROFS_FS_ONDEMAND bool "EROFS fscache-based on-demand read support" - depends on CACHEFILES_ONDEMAND && (EROFS_FS=m && FSCACHE || EROFS_FS=y && FSCACHE=y) - default n + depends on EROFS_FS + select NETFS_SUPPORT + select FSCACHE + select CACHEFILES + select CACHEFILES_ONDEMAND help This permits EROFS to use fscache-backed data blobs with on-demand read support.
--
2.39.3
But cachefiles won't be complied as modules anymore. Does it sounds good?
Thanks,
Gao Xiang
David Howells
maintainerPATCH v5 5/40 netfs, fscache: Remove ->begin_cache_operation
In reply to David HowellsRemove ->begin_cache_operation() in favour of just calling fscache directly.
--- Documentation/filesystems/netfs_library.rst | 23 +++----------- fs/9p/vfs_addr.c | 16 ---------- fs/afs/file.c | 13 -------- fs/ceph/addr.c | 1 - fs/ceph/cache.h | 12 -------- fs/netfs/buffered_read.c | 33 +++++++++++---------- fs/nfs/fscache.c | 7 ----- include/linux/fscache.h | 3 -- include/linux/netfs.h | 4 +-- 9 files changed, 23 insertions(+), 89 deletions(-)
Documentation/filesystems/netfs_library.rst +4 -19
@@ -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::
fs/9p/vfs_addr.c +0 -16
@@ -82,25 +82,9 @@ static void v9fs_free_request(struct netfs_io_request *rreq)p9_fid_put (fid); } -/** -* v9fs_begin_cache_operation - Begin a cache operation for a read -* @rreq: The read request -*/ -static int v9fs_begin_cache_operation (struct netfs_io_request *rreq) -{ -#ifdef CONFIG_9P_FSCACHE -struct fscache_cookie *cookie =v9fs_inode_cookie (V9FS_I (rreq->inode)); - -return fscache_begin_read_operation (&rreq->cache_resources, cookie); -#else -return -ENOBUFS ; -#endif -} -const struct netfs_request_ops v9fs_req_ops = { .init_request = v9fs_init_request, .free_request = v9fs_free_request, - .begin_cache_operation = v9fs_begin_cache_operation, .issue_read = v9fs_issue_read, };
fs/afs/file.c +0 -13
@@ -366,18 +366,6 @@ static int afs_init_request(struct netfs_io_request *rreq, struct file *file)return 0 ; } -static int afs_begin_cache_operation (struct netfs_io_request *rreq) -{ -#ifdef CONFIG_AFS_FSCACHE -struct afs_vnode *vnode =AFS_FS_I (rreq->inode); - -return fscache_begin_read_operation (&rreq->cache_resources, -afs_vnode_cache (vnode)); -#else -return -ENOBUFS ; -#endif -} -static int afs_check_write_begin (struct file *file,loff_t pos,unsigned len,struct folio **foliop,void **_fsdata) {
@@ -394,7 +382,6 @@ static void afs_free_request(struct netfs_io_request *rreq)const struct netfs_request_ops afs_req_ops = { .init_request = afs_init_request, .free_request = afs_free_request, - .begin_cache_operation = afs_begin_cache_operation, .check_write_begin = afs_check_write_begin, .issue_read = afs_issue_read, };
fs/ceph/addr.c +0 -1
@@ -509,7 +509,6 @@ static void ceph_netfs_free_request(struct netfs_io_request *rreq)const struct netfs_request_ops ceph_netfs_ops = { .init_request = ceph_init_request, .free_request = ceph_netfs_free_request, - .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read, .expand_readahead = ceph_netfs_expand_readahead, .clamp_length = ceph_netfs_clamp_length,
fs/ceph/cache.h +0 -12
@@ -57,13 +57,6 @@ static inline int ceph_fscache_dirty_folio(struct address_space *mapping,return fscache_dirty_folio (mapping, folio,ceph_fscache_cookie (ci)); } -static inline int ceph_begin_cache_operation (struct netfs_io_request *rreq) -{ -struct fscache_cookie *cookie =ceph_fscache_cookie (ceph_inode (rreq->inode)); - -return fscache_begin_read_operation (&rreq->cache_resources, cookie); -} -static inline bool ceph_is_cache_enabled (struct inode *inode) {return fscache_cookie_enabled (ceph_fscache_cookie (ceph_inode (inode)));
@@ -135,11 +128,6 @@ static inline bool ceph_is_cache_enabled(struct inode *inode)return false; } -static inline int ceph_begin_cache_operation (struct netfs_io_request *rreq) -{ -return -ENOBUFS ; -} -static inline void ceph_fscache_note_page_release (struct inode *inode) { }
fs/netfs/buffered_read.c +18 -15
@@ -147,6 +147,15 @@ static void netfs_rreq_expand(struct netfs_io_request *rreq, } } +/* +* Begin an operation, and fetch the stored zero point value from the cookie if +* available. +*/ +static int netfs_begin_cache_read (struct netfs_io_request *rreq,struct netfs_inode *ctx) +{ +return fscache_begin_read_operation (&rreq->cache_resources,netfs_i_cookie (ctx)); +} +/** * netfs_readahead - Helper to manage a read request * @ractl: The description of the readahead request
@@ -180,11 +189,9 @@ void netfs_readahead(struct readahead_control *ractl)if (IS_ERR (rreq))return ; -if (ctx->ops->begin_cache_operation) { - ret = ctx->ops->begin_cache_operation (rreq); -if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) - goto cleanup_free; - } + ret =netfs_begin_cache_read (rreq, ctx); +if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) + goto cleanup_free;netfs_stat (&netfs_n_rh_readahead); trace_netfs_read(rreq, readahead_pos(ractl), readahead_length(ractl),
@@ -238,11 +245,9 @@ int netfs_read_folio(struct file *file, struct folio *folio) goto alloc_error; } -if (ctx->ops->begin_cache_operation) { - ret = ctx->ops->begin_cache_operation (rreq); -if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) - goto discard; - } + ret =netfs_begin_cache_read (rreq, ctx); +if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) + goto discard;netfs_stat (&netfs_n_rh_readpage);trace_netfs_read (rreq, rreq->start, rreq->len, netfs_read_trace_readpage);
@@ -390,11 +395,9 @@ int netfs_write_begin(struct netfs_inode *ctx, rreq->no_unlock_folio =folio_index (folio);__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); -if (ctx->ops->begin_cache_operation) { - ret = ctx->ops->begin_cache_operation (rreq); -if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) - goto error_put; - } + ret =netfs_begin_cache_read (rreq, ctx); +if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) + goto error_put;netfs_stat (&netfs_n_rh_write_begin);trace_netfs_read (rreq, pos, len, netfs_read_trace_write_begin);
fs/nfs/fscache.c +0 -7
@@ -274,12 +274,6 @@ static void nfs_netfs_free_request(struct netfs_io_request *rreq)put_nfs_open_context (rreq->netfs_priv); } -static inline int nfs_netfs_begin_cache_operation (struct netfs_io_request *rreq) -{ -return fscache_begin_read_operation (&rreq->cache_resources, -netfs_i_cookie (netfs_inode (rreq->inode))); -} -static struct nfs_netfs_io_data *nfs_netfs_alloc (struct netfs_io_subrequest *sreq) {struct nfs_netfs_io_data *netfs;
@@ -387,7 +381,6 @@ void nfs_netfs_read_completion(struct nfs_pgio_header *hdr)const struct netfs_request_ops nfs_netfs_ops = { .init_request = nfs_netfs_init_request, .free_request = nfs_netfs_free_request, - .begin_cache_operation = nfs_netfs_begin_cache_operation, .issue_read = nfs_netfs_issue_read, .clamp_length = nfs_netfs_clamp_length };
include/linux/fscache.h +0 -3
@@ -437,9 +437,6 @@ const struct netfs_cache_ops *fscache_operation_valid(const struct netfs_cache_r* indicates the cache resources to which the operation state should be * attached; @cookie indicates the cache object that will be accessed. * -* This is intended to be called from the ->begin_cache_operation() netfs lib -* operation as implemented by the network filesystem. -* * @cres->inval_counter is set from @cookie->inval_counter for comparison at * the end of the operation. This allows invalidation during the operation to * be detected by the caller.
include/linux/netfs.h +1 -3
@@ -208,7 +208,6 @@ struct netfs_io_request {struct netfs_request_ops {int (*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);
@@ -229,8 +228,7 @@ enum netfs_read_from_hole { };/* -* Table of operations for access to a cache. This is obtained by -* rreq->ops->begin_cache_operation(). +* Table of operations for access to a cache. */ struct netfs_cache_ops {/* End an operation */
David Howells
maintainerPATCH v5 6/40 netfs, fscache: Move /proc/fs/fscache to /proc/fs/netfs and put in a symlink
In reply to David HowellsRename /proc/fs/fscache to "netfs" and make a symlink from fscache to that.
---
Notes:
Changes
=======
ver #5)
- fscache_init/exit() should depend on CONFIG_FSCACHE, not CONFIG_PROC_FS.fs/netfs/fscache_main.c | 8 ++------ fs/netfs/fscache_proc.c | 23 ++++++++--------------- fs/netfs/fscache_stats.c | 4 +--- fs/netfs/internal.h | 12 +++++++++++- fs/netfs/main.c | 33 +++++++++++++++++++++++++++++++++ fs/netfs/stats.c | 13 +++++++------ include/linux/netfs.h | 1 - 7 files changed, 62 insertions(+), 32 deletions(-)
fs/netfs/fscache_main.c +2 -6
@@ -62,7 +62,7 @@ unsigned int fscache_hash(unsigned int salt, const void *data, size_t len)/* * initialise the fs caching module */ -static int __init fscache_init (void ) +int __init fscache_init (void ) {int ret = -ENOMEM ;
@@ -94,12 +94,10 @@ static int __init fscache_init(void)return ret; } -fs_initcall (fscache_init); -/* * clean up on module removal */ -static void __exit fscache_exit(void) +void __exit fscache_exit(void) {_enter ("" );
@@ -108,5 +106,3 @@ static void __exit fscache_exit(void)destroy_workqueue (fscache_wq);pr_notice ("FS-Cache unloaded\n" ); } - -module_exit (fscache_exit);
fs/netfs/fscache_proc.c +8 -15
@@ -12,41 +12,34 @@#include "internal.h" /* -* initialise the /proc/fs/fscache/ directory +* Add files to /proc/fs/netfs/. */ int __init fscache_proc_init (void ) { -if (!proc_mkdir ("fs/fscache" ,NULL )) - goto error_dir; +if (!proc_symlink ("fs/fscache" ,NULL ,"../netfs" )) + goto error_sym; -if (!proc_create_seq ("fs/fscache/caches" ,S_IFREG |0444 ,NULL , +if (!proc_create_seq ("fs/netfs/caches" ,S_IFREG |0444 ,NULL , &fscache_caches_seq_ops)) goto error; -if (!proc_create_seq ("fs/fscache/volumes" ,S_IFREG |0444 ,NULL , +if (!proc_create_seq ("fs/netfs/volumes" ,S_IFREG |0444 ,NULL , &fscache_volumes_seq_ops)) goto error; -if (!proc_create_seq ("fs/fscache/cookies" ,S_IFREG |0444 ,NULL , +if (!proc_create_seq ("fs/netfs/cookies" ,S_IFREG |0444 ,NULL , &fscache_cookies_seq_ops)) goto error; - -#ifdef CONFIG_FSCACHE_STATS -if (!proc_create_single ("fs/fscache/stats" ,S_IFREG |0444 ,NULL , - fscache_stats_show)) - goto error; -#endif -return 0 ; error:remove_proc_entry ("fs/fscache" ,NULL ); -error_dir: +error_sym:return -ENOMEM ; }/* -* clean up the /proc/fs/fscache/ directory +* Clean up the /proc/fs/fscache symlink. */ void fscache_proc_cleanup (void ) {
fs/netfs/fscache_stats.c +1 -3
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(fscache_n_culled);/* * display the general statistics */ -int fscache_stats_show (struct seq_file *m,void *v) +int fscache_stats_show (struct seq_file *m) {seq_puts (m,"FS-Cache statistics\n" ); seq_printf(m, "Cookies: n=%d v=%d vcol=%u voom=%u\n",
@@ -96,7 +96,5 @@ int fscache_stats_show(struct seq_file *m, void *v)seq_printf (m,"IO : rd=%u wr=%u\n" ,atomic_read (&fscache_n_read),atomic_read (&fscache_n_write)); - -netfs_stats_show (m);return 0 ; }
fs/netfs/internal.h +11 -1
@@ -76,6 +76,7 @@ extern atomic_t netfs_n_rh_write_done;extern atomic_t netfs_n_rh_write_failed;extern atomic_t netfs_n_rh_write_zskip; +int netfs_stats_show (struct seq_file *m,void *v);static inline void netfs_stat (atomic_t *stat) {
@@ -166,6 +167,13 @@ static inline void fscache_see_cookie(struct fscache_cookie *cookie,* fscache-main.c */ extern unsigned int fscache_hash (unsigned int salt,const void *data,size_t len); +#ifdef CONFIG_FSCACHE +int __init fscache_init (void ); +void __exit fscache_exit(void); +#else +static inline int fscache_init (void ) {return 0 ; } +static inline void fscache_exit (void ) {} +#endif /* * fscache-proc.c
@@ -216,12 +224,14 @@ static inline void fscache_stat_d(atomic_t *stat)#define __fscache_stat (stat) (stat) -int fscache_stats_show (struct seq_file *m,void *v); +int fscache_stats_show (struct seq_file *m);#else #define __fscache_stat (stat) (NULL)#define fscache_stat (stat) do {} while (0)#define fscache_stat_d (stat) do {} while (0) + +static inline int fscache_stats_show (struct seq_file *m) {return 0 ; }#endif /*
fs/netfs/main.c +33 -0
@@ -7,6 +7,8 @@#include <linux/module.h> #include <linux/export.h> +#include <linux/proc_fs.h> +#include <linux/seq_file.h> #include "internal.h" #define CREATE_TRACE_POINTS #include <trace/events/netfs.h>
@@ -19,3 +21,34 @@ unsigned netfs_debug;module_param_named (debug, netfs_debug, uint,S_IWUSR |S_IRUGO );MODULE_PARM_DESC (netfs_debug,"Netfs support debugging mask" ); +static int __init netfs_init (void ) +{ +int ret = -ENOMEM ; + +if (!proc_mkdir ("fs/netfs" ,NULL )) + goto error; + +#ifdef CONFIG_FSCACHE_STATS +if (!proc_create_single ("fs/netfs/stats" ,S_IFREG |0444 ,NULL , + netfs_stats_show)) + goto error_proc; +#endif + + ret =fscache_init (); +if (ret <0 ) + goto error_proc; +return 0 ; + +error_proc: +remove_proc_entry ("fs/netfs" ,NULL ); +error: +return ret; +} +fs_initcall (netfs_init); + +static void __exit netfs_exit(void) +{ +fscache_exit (); +remove_proc_entry ("fs/netfs" ,NULL ); +} +module_exit (netfs_exit);
fs/netfs/stats.c +7 -6
@@ -28,31 +28,32 @@ atomic_t netfs_n_rh_write_done;atomic_t netfs_n_rh_write_failed;atomic_t netfs_n_rh_write_zskip; -void netfs_stats_show (struct seq_file *m) +int netfs_stats_show (struct seq_file *m,void *v) { -seq_printf (m,"RdHelp : RA=%u RP=%u WB=%u WBZ=%u rr=%u sr=%u\n" , +seq_printf (m,"Netfs : RA=%u RP=%u WB=%u WBZ=%u rr=%u sr=%u\n" ,atomic_read (&netfs_n_rh_readahead),atomic_read (&netfs_n_rh_readpage),atomic_read (&netfs_n_rh_write_begin),atomic_read (&netfs_n_rh_write_zskip),atomic_read (&netfs_n_rh_rreq),atomic_read (&netfs_n_rh_sreq)); -seq_printf (m,"RdHelp : ZR=%u sh=%u sk=%u\n" , +seq_printf (m,"Netfs : ZR=%u sh=%u sk=%u\n" ,atomic_read (&netfs_n_rh_zero),atomic_read (&netfs_n_rh_short_read),atomic_read (&netfs_n_rh_write_zskip)); -seq_printf (m,"RdHelp : DL=%u ds=%u df=%u di=%u\n" , +seq_printf (m,"Netfs : DL=%u ds=%u df=%u di=%u\n" ,atomic_read (&netfs_n_rh_download),atomic_read (&netfs_n_rh_download_done),atomic_read (&netfs_n_rh_download_failed),atomic_read (&netfs_n_rh_download_instead)); -seq_printf (m,"RdHelp : RD=%u rs=%u rf=%u\n" , +seq_printf (m,"Netfs : RD=%u rs=%u rf=%u\n" ,atomic_read (&netfs_n_rh_read),atomic_read (&netfs_n_rh_read_done),atomic_read (&netfs_n_rh_read_failed)); -seq_printf (m,"RdHelp : WR=%u ws=%u wf=%u\n" , +seq_printf (m,"Netfs : WR=%u ws=%u wf=%u\n" ,atomic_read (&netfs_n_rh_write),atomic_read (&netfs_n_rh_write_done),atomic_read (&netfs_n_rh_write_failed)); +return fscache_stats_show (m); }EXPORT_SYMBOL (netfs_stats_show);
include/linux/netfs.h +0 -1
@@ -294,7 +294,6 @@ void netfs_get_subrequest(struct netfs_io_subrequest *subreq, enum netfs_sreq_ref_trace what);void netfs_put_subrequest (struct netfs_io_subrequest *subreq,bool was_async,enum netfs_sreq_ref_trace what); -void netfs_stats_show (struct seq_file *);ssize_t netfs_extract_user_iter (struct iov_iter *orig,size_t orig_len,struct iov_iter *new,iov_iter_extraction_t extraction_flags);
Marc Dionne
maintainerRe: [PATCH v5 06/40] netfs, fscache: Move /proc/fs/fscache to /proc/fs/netfs and put in a symlink
Quoted 64 lines · David Howells
Rename
/proc/fs/fscacheto "netfs" and make a symlink from fscache to that.Signed-off-by David Howells <[email protected]>Reviewed-by Jeff Layton <[email protected]>cc Christian Brauner <[email protected]>---
Notes:
Changes ======= ver #5) - fscache_init/exit() should depend on CONFIG_FSCACHE, not CONFIG_PROC_FS.fs/netfs/fscache_main.c | 8 ++------ fs/netfs/fscache_proc.c | 23 ++++++++--------------- fs/netfs/fscache_stats.c | 4 +--- fs/netfs/internal.h | 12 +++++++++++- fs/netfs/main.c | 33 +++++++++++++++++++++++++++++++++ fs/netfs/stats.c | 13 +++++++------ include/linux/netfs.h | 1 - 7 files changed, 62 insertions(+), 32 deletions(-)fs/netfs/fscache_main.c +2
-6@@ -62,7 +62,7 @@ unsigned int fscache_hash(unsigned int salt, const void *data, size_t len)/* * initialise the fs caching module */ -static int __init fscache_init (void ) +int __init fscache_init (void ) {int ret = -ENOMEM ;@@ -94,12 +94,10 @@ static int __init fscache_init(void)return ret; } -fs_initcall (fscache_init); -/* * clean up on module removal */ -static void __exit fscache_exit(void) +void __exit fscache_exit(void) {_enter ("" );@@ -108,5 +106,3 @@ static void __exit fscache_exit(void)destroy_workqueue (fscache_wq);pr_notice ("FS-Cache unloaded\n" ); } - -module_exit (fscache_exit);fs/netfs/fscache_proc.c +0
-0@@ -12,41 +12,34 @@#include "internal.h"
fs/netfs/fscache_proc.c line 19
Quoted 10 lines
fs/netfs/fscache_proc.c +2
-3/* -* initialise the /proc/fs/fscache/ directory +* Add files to /proc/fs/netfs/. */ int __init fscache_proc_init (void ) { -if (!proc_mkdir ("fs/fscache" ,NULL )) - goto error_dir; +if (!proc_symlink ("fs/fscache" ,NULL ,"../netfs" ))
This should be just "netfs"
Quoted 198 lines
fs/netfs/fscache_proc.c +6
-12+ goto error_sym; -if (!proc_create_seq ("fs/fscache/caches" ,S_IFREG |0444 ,NULL , +if (!proc_create_seq ("fs/netfs/caches" ,S_IFREG |0444 ,NULL , &fscache_caches_seq_ops)) goto error; -if (!proc_create_seq ("fs/fscache/volumes" ,S_IFREG |0444 ,NULL , +if (!proc_create_seq ("fs/netfs/volumes" ,S_IFREG |0444 ,NULL , &fscache_volumes_seq_ops)) goto error; -if (!proc_create_seq ("fs/fscache/cookies" ,S_IFREG |0444 ,NULL , +if (!proc_create_seq ("fs/netfs/cookies" ,S_IFREG |0444 ,NULL , &fscache_cookies_seq_ops)) goto error; - -#ifdef CONFIG_FSCACHE_STATS -if (!proc_create_single ("fs/fscache/stats" ,S_IFREG |0444 ,NULL , - fscache_stats_show)) - goto error; -#endif -return 0 ; error:remove_proc_entry ("fs/fscache" ,NULL ); -error_dir: +error_sym:return -ENOMEM ; }/* -* clean up the /proc/fs/fscache/ directory +* Clean up the /proc/fs/fscache symlink. */ void fscache_proc_cleanup (void ) {fs/netfs/fscache_stats.c +1
-3@@ -52,7 +52,7 @@ EXPORT_SYMBOL(fscache_n_culled);/* * display the general statistics */ -int fscache_stats_show (struct seq_file *m,void *v) +int fscache_stats_show (struct seq_file *m) {seq_puts (m,"FS-Cache statistics\n" ); seq_printf(m, "Cookies: n=%d v=%d vcol=%u voom=%u\n",@@ -96,7 +96,5 @@ int fscache_stats_show(struct seq_file *m, void *v)seq_printf (m,"IO : rd=%u wr=%u\n" ,atomic_read (&fscache_n_read),atomic_read (&fscache_n_write)); - -netfs_stats_show (m);return 0 ; }fs/netfs/internal.h +11
-1@@ -76,6 +76,7 @@ extern atomic_t netfs_n_rh_write_done;extern atomic_t netfs_n_rh_write_failed;extern atomic_t netfs_n_rh_write_zskip; +int netfs_stats_show (struct seq_file *m,void *v);static inline void netfs_stat (atomic_t *stat) {@@ -166,6 +167,13 @@ static inline void fscache_see_cookie(struct fscache_cookie *cookie,* fscache-main.c */ extern unsigned int fscache_hash (unsigned int salt,const void *data,size_t len); +#ifdef CONFIG_FSCACHE +int __init fscache_init (void ); +void __exit fscache_exit(void); +#else +static inline int fscache_init (void ) {return 0 ; } +static inline void fscache_exit (void ) {} +#endif /* * fscache-proc.c @@ -216,12 +224,14 @@ static inline void fscache_stat_d(atomic_t *stat)#define __fscache_stat (stat) (stat) -int fscache_stats_show (struct seq_file *m,void *v); +int fscache_stats_show (struct seq_file *m);#else #define __fscache_stat (stat) (NULL)#define fscache_stat (stat) do {} while (0)#define fscache_stat_d (stat) do {} while (0) + +static inline int fscache_stats_show (struct seq_file *m) {return 0 ; }#endif /* fs/netfs/main.c +33
-0@@ -7,6 +7,8 @@#include <linux/module.h> #include <linux/export.h> +#include <linux/proc_fs.h> +#include <linux/seq_file.h> #include "internal.h" #define CREATE_TRACE_POINTS #include <trace/events/netfs.h> @@ -19,3 +21,34 @@ unsigned netfs_debug;module_param_named (debug, netfs_debug, uint,S_IWUSR |S_IRUGO );MODULE_PARM_DESC (netfs_debug,"Netfs support debugging mask" ); +static int __init netfs_init (void ) +{ +int ret = -ENOMEM ; + +if (!proc_mkdir ("fs/netfs" ,NULL )) + goto error; + +#ifdef CONFIG_FSCACHE_STATS +if (!proc_create_single ("fs/netfs/stats" ,S_IFREG |0444 ,NULL , + netfs_stats_show)) + goto error_proc; +#endif + + ret =fscache_init (); +if (ret <0 ) + goto error_proc; +return 0 ; + +error_proc: +remove_proc_entry ("fs/netfs" ,NULL ); +error: +return ret; +} +fs_initcall (netfs_init); + +static void __exit netfs_exit(void) +{ +fscache_exit (); +remove_proc_entry ("fs/netfs" ,NULL ); +} +module_exit (netfs_exit);fs/netfs/stats.c +7
-6@@ -28,31 +28,32 @@ atomic_t netfs_n_rh_write_done;atomic_t netfs_n_rh_write_failed;atomic_t netfs_n_rh_write_zskip; -void netfs_stats_show (struct seq_file *m) +int netfs_stats_show (struct seq_file *m,void *v) { -seq_printf (m,"RdHelp : RA=%u RP=%u WB=%u WBZ=%u rr=%u sr=%u\n" , +seq_printf (m,"Netfs : RA=%u RP=%u WB=%u WBZ=%u rr=%u sr=%u\n" ,atomic_read (&netfs_n_rh_readahead),atomic_read (&netfs_n_rh_readpage),atomic_read (&netfs_n_rh_write_begin),atomic_read (&netfs_n_rh_write_zskip),atomic_read (&netfs_n_rh_rreq),atomic_read (&netfs_n_rh_sreq)); -seq_printf (m,"RdHelp : ZR=%u sh=%u sk=%u\n" , +seq_printf (m,"Netfs : ZR=%u sh=%u sk=%u\n" ,atomic_read (&netfs_n_rh_zero),atomic_read (&netfs_n_rh_short_read),atomic_read (&netfs_n_rh_write_zskip)); -seq_printf (m,"RdHelp : DL=%u ds=%u df=%u di=%u\n" , +seq_printf (m,"Netfs : DL=%u ds=%u df=%u di=%u\n" ,atomic_read (&netfs_n_rh_download),atomic_read (&netfs_n_rh_download_done),atomic_read (&netfs_n_rh_download_failed),atomic_read (&netfs_n_rh_download_instead)); -seq_printf (m,"RdHelp : RD=%u rs=%u rf=%u\n" , +seq_printf (m,"Netfs : RD=%u rs=%u rf=%u\n" ,atomic_read (&netfs_n_rh_read),atomic_read (&netfs_n_rh_read_done),atomic_read (&netfs_n_rh_read_failed)); -seq_printf (m,"RdHelp : WR=%u ws=%u wf=%u\n" , +seq_printf (m,"Netfs : WR=%u ws=%u wf=%u\n" ,atomic_read (&netfs_n_rh_write),atomic_read (&netfs_n_rh_write_done),atomic_read (&netfs_n_rh_write_failed)); +return fscache_stats_show (m); }EXPORT_SYMBOL (netfs_stats_show);include/linux/netfs.h +0
-0
include/linux/netfs.h void netfs_get_subrequest(struct netfs_io_subrequest *subreq, · line 299
Quoted 7 lines
include/linux/netfs.h +0
-1@@ -294,7 +294,6 @@ void netfs_get_subrequest(struct netfs_io_subrequest *subreq, enum netfs_sreq_ref_trace what);void netfs_put_subrequest (struct netfs_io_subrequest *subreq,bool was_async,enum netfs_sreq_ref_trace what); -void netfs_stats_show (struct seq_file *);ssize_t netfs_extract_user_iter (struct iov_iter *orig,size_t orig_len,struct iov_iter *new,iov_iter_extraction_t extraction_flags);
Marc
David Howells
maintainerPATCH v5 7/40 netfs: Move pinning-for-writeback from fscache to netfs
In reply to David HowellsMove the resource pinning-for-writeback from fscache code to netfslib code. This is used to keep a cache backing object pinned whilst we have dirty pages on the netfs inode in the pagecache such that VM writeback will be able to reach it.
Whilst we're at it, switch the parameters of netfs_unpin_writeback() to match ->write_inode() so that it can be used for that directly.
Note that this mechanism could be more generically useful than that for network filesystems. Quite often they have to keep around other resources (e.g. authentication tokens or network connections) until the writeback is complete.
--- fs/9p/vfs_addr.c | 33 ++++----------- fs/9p/vfs_inode.c | 3 +- fs/9p/vfs_super.c | 14 +------ fs/afs/file.c | 8 +--- fs/afs/inode.c | 2 +- fs/afs/internal.h | 6 --- fs/afs/super.c | 2 +- fs/afs/write.c | 9 ---- fs/ceph/cache.h | 23 ++++------- fs/ceph/inode.c | 2 +- fs/fs-writeback.c | 10 ++--- fs/netfs/Makefile | 1 + fs/netfs/fscache_io.c | 40 ------------------ fs/netfs/misc.c | 86 +++++++++++++++++++++++++++++++++++++++ fs/smb/client/cifsfs.c | 5 +-- fs/smb/client/file.c | 18 +------- include/linux/fs.h | 2 +- include/linux/fscache.h | 42 ------------------- include/linux/netfs.h | 3 ++ include/linux/writeback.h | 2 +- 20 files changed, 124 insertions(+), 187 deletions(-) create mode 100644 fs/netfs/misc.c
fs/9p/vfs_addr.c +9 -24
@@ -317,30 +317,15 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping,return copied; } -#ifdef CONFIG_9P_FSCACHE -/* -* Mark a page as having been made dirty and thus needing writeback. We also -* need to pin the cache object to write back to. -*/ -static bool v9fs_dirty_folio (struct address_space *mapping,struct folio *folio) -{ -struct v9fs_inode *v9inode =V9FS_I (mapping->host); - -return fscache_dirty_folio (mapping, folio,v9fs_inode_cookie (v9inode)); -} -#else -#define v9fs_dirty_folio filemap_dirty_folio -#endif -const struct address_space_operations v9fs_addr_operations = { - .read_folio = netfs_read_folio, - .readahead = netfs_readahead, - .dirty_folio = v9fs_dirty_folio, - .writepage = v9fs_vfs_writepage, - .write_begin = v9fs_write_begin, - .write_end = v9fs_write_end, - .release_folio = v9fs_release_folio, + .read_folio = netfs_read_folio, + .readahead = netfs_readahead, + .dirty_folio = netfs_dirty_folio, + .writepage = v9fs_vfs_writepage, + .write_begin = v9fs_write_begin, + .write_end = v9fs_write_end, + .release_folio = v9fs_release_folio, .invalidate_folio = v9fs_invalidate_folio, - .launder_folio = v9fs_launder_folio, - .direct_IO = v9fs_direct_IO, + .launder_folio = v9fs_launder_folio, + .direct_IO = v9fs_direct_IO, };
fs/9p/vfs_inode.c +1 -2
@@ -376,8 +376,7 @@ void v9fs_evict_inode(struct inode *inode)#ifdef CONFIG_9P_FSCACHE version =cpu_to_le32 (v9inode->qid.version); -fscache_clear_inode_writeback (v9fs_inode_cookie (v9inode), inode, - &version); +netfs_clear_inode_writeback (inode, &version);#endif clear_inode (inode);
fs/9p/vfs_super.c +2 -12
@@ -289,31 +289,21 @@ static int v9fs_drop_inode(struct inode *inode)static int v9fs_write_inode (struct inode *inode,struct writeback_control *wbc) { -struct v9fs_inode *v9inode; -/* * send an fsync request to server irrespective of * wbc->sync_mode. */ p9_debug (P9_DEBUG_VFS ,"%s: inode %p\n" , __func__, inode); - - v9inode =V9FS_I (inode); -fscache_unpin_writeback (wbc,v9fs_inode_cookie (v9inode)); - -return 0 ; +return netfs_unpin_writeback (inode, wbc); }static int v9fs_write_inode_dotl (struct inode *inode,struct writeback_control *wbc) { -struct v9fs_inode *v9inode; - v9inode =V9FS_I (inode);p9_debug (P9_DEBUG_VFS ,"%s: inode %p\n" , __func__, inode); -fscache_unpin_writeback (wbc,v9fs_inode_cookie (v9inode)); - -return 0 ; +return netfs_unpin_writeback (inode, wbc); }static const struct super_operations v9fs_super_ops = {
fs/afs/file.c +1 -7
@@ -55,7 +55,7 @@ const struct inode_operations afs_file_inode_operations = {const struct address_space_operations afs_file_aops = { .read_folio = netfs_read_folio, .readahead = netfs_readahead, - .dirty_folio = afs_dirty_folio, + .dirty_folio = netfs_dirty_folio, .launder_folio = afs_launder_folio, .release_folio = afs_release_folio, .invalidate_folio = afs_invalidate_folio,
@@ -386,12 +386,6 @@ const struct netfs_request_ops afs_req_ops = { .issue_read = afs_issue_read, }; -int afs_write_inode (struct inode *inode,struct writeback_control *wbc) -{ -fscache_unpin_writeback (wbc,afs_vnode_cache (AFS_FS_I (inode))); -return 0 ; -} -/* * Adjust the dirty region of the page on truncation or full invalidation, * getting rid of the markers altogether if the region is entirely invalidated.
fs/afs/inode.c +1 -1
@@ -823,7 +823,7 @@ void afs_evict_inode(struct inode *inode)truncate_inode_pages_final (&inode->i_data);afs_set_cache_aux (vnode, &aux); -fscache_clear_inode_writeback (afs_vnode_cache (vnode), inode, &aux); +netfs_clear_inode_writeback (inode, &aux);clear_inode (inode);while (!list_empty (&vnode->wb_keys)) {
fs/afs/internal.h +0 -6
@@ -1072,7 +1072,6 @@ extern int afs_release(struct inode *, struct file *);extern int afs_fetch_data (struct afs_vnode *,struct afs_read *);extern struct afs_read *afs_alloc_read (gfp_t );extern void afs_put_read (struct afs_read *); -extern int afs_write_inode (struct inode *,struct writeback_control *);static inline struct afs_read *afs_get_read (struct afs_read *req) {
@@ -1520,11 +1519,6 @@ extern int afs_check_volume_status(struct afs_volume *, struct afs_operation *);/* * write.c */ -#ifdef CONFIG_AFS_FSCACHE -bool afs_dirty_folio (struct address_space *,struct folio *); -#else -#define afs_dirty_folio filemap_dirty_folio -#endif extern int afs_write_begin (struct file *file,struct address_space *mapping,loff_t pos,unsigned len,struct page **pagep,void **fsdata);
fs/afs/super.c +1 -1
@@ -55,7 +55,7 @@ int afs_net_id;static const struct super_operations afs_super_ops = { .statfs = afs_statfs, .alloc_inode = afs_alloc_inode, - .write_inode = afs_write_inode, + .write_inode = netfs_unpin_writeback, .drop_inode = afs_drop_inode, .destroy_inode = afs_destroy_inode, .free_inode = afs_free_inode,
fs/afs/write.c +0 -9
@@ -23,15 +23,6 @@ static void afs_write_to_cache(struct afs_vnode *vnode, loff_t start, size_t len loff_t i_size, bool caching);#ifdef CONFIG_AFS_FSCACHE -/* -* Mark a page as having been made dirty and thus needing writeback. We also -* need to pin the cache object to write back to. -*/ -bool afs_dirty_folio (struct address_space *mapping,struct folio *folio) -{ -return fscache_dirty_folio (mapping, folio, -afs_vnode_cache (AFS_FS_I (mapping->host))); -}static void afs_folio_start_fscache (bool caching,struct folio *folio) {if (caching)
fs/ceph/cache.h +7 -16
@@ -43,19 +43,13 @@ static inline void ceph_fscache_resize(struct inode *inode, loff_t to) } } -static inline void ceph_fscache_unpin_writeback (struct inode *inode, +static inline int ceph_fscache_unpin_writeback (struct inode *inode,struct writeback_control *wbc) { -fscache_unpin_writeback (wbc,ceph_fscache_cookie (ceph_inode (inode))); +return netfs_unpin_writeback (inode, wbc); } -static inline int ceph_fscache_dirty_folio (struct address_space *mapping, -struct folio *folio) -{ -struct ceph_inode_info *ci =ceph_inode (mapping->host); - -return fscache_dirty_folio (mapping, folio,ceph_fscache_cookie (ci)); -} +#define ceph_fscache_dirty_folio netfs_dirty_foliostatic inline bool ceph_is_cache_enabled (struct inode *inode) {
@@ -112,16 +106,13 @@ static inline void ceph_fscache_resize(struct inode *inode, loff_t to) { } -static inline void ceph_fscache_unpin_writeback (struct inode *inode, -struct writeback_control *wbc) +static inline int ceph_fscache_unpin_writeback (struct inode *inode, +struct writeback_control *wbc) { +return 0 ; } -static inline int ceph_fscache_dirty_folio (struct address_space *mapping, -struct folio *folio) -{ -return filemap_dirty_folio (mapping, folio); -} +#define ceph_fscache_dirty_folio filemap_dirty_foliostatic inline bool ceph_is_cache_enabled (struct inode *inode) {
fs/ceph/inode.c +1 -1
@@ -694,7 +694,7 @@ void ceph_evict_inode(struct inode *inode)percpu_counter_dec (&mdsc->metric.total_inodes);truncate_inode_pages_final (&inode->i_data); -if (inode->i_state &I_PINNING_FSCACHE_WB ) +if (inode->i_state &I_PINNING_NETFS_WB )ceph_fscache_unuse_cookie (inode, true);clear_inode (inode);
fs/fs-writeback.c +5 -5
@@ -1675,11 +1675,11 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)if (mapping_tagged (mapping,PAGECACHE_TAG_DIRTY )) inode->i_state |=I_DIRTY_PAGES ; -else if (unlikely (inode->i_state &I_PINNING_FSCACHE_WB )) { +else if (unlikely (inode->i_state &I_PINNING_NETFS_WB )) {if (!(inode->i_state &I_DIRTY_PAGES )) { - inode->i_state &= ~I_PINNING_FSCACHE_WB ; - wbc->unpinned_fscache_wb = true; - dirty |=I_PINNING_FSCACHE_WB ;/* Cause write_inode */ + inode->i_state &= ~I_PINNING_NETFS_WB ; + wbc->unpinned_netfs_wb = true; + dirty |=I_PINNING_NETFS_WB ;/* Cause write_inode */ } }
@@ -1691,7 +1691,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)if (ret ==0 ) ret = err; } - wbc->unpinned_fscache_wb = false; + wbc->unpinned_netfs_wb = false;trace_writeback_single_inode (inode, wbc, nr_to_write);return ret; }
fs/netfs/Makefile +1 -0
@@ -5,6 +5,7 @@ netfs-y := \ io.o \ iterator.o \ main.o \ + misc.o \ objects.o netfs-$(CONFIG_NETFS_STATS) += stats.o
fs/netfs/fscache_io.c +0 -40
@@ -158,46 +158,6 @@ int __fscache_begin_write_operation(struct netfs_cache_resources *cres, }EXPORT_SYMBOL (__fscache_begin_write_operation); -/** -* fscache_dirty_folio - Mark folio dirty and pin a cache object for writeback -* @mapping: The mapping the folio belongs to. -* @folio: The folio being dirtied. -* @cookie: The cookie referring to the cache object -* -* Set the dirty flag on a folio and pin an in-use cache object in memory -* so that writeback can later write to it. This is intended -* to be called from the filesystem's ->dirty_folio() method. -* -* Return: true if the dirty flag was set on the folio, false otherwise. -*/ -bool fscache_dirty_folio (struct address_space *mapping,struct folio *folio, -struct fscache_cookie *cookie) -{ -struct inode *inode = mapping->host; -bool need_use = false; - -_enter ("" ); - -if (!filemap_dirty_folio (mapping, folio)) -return false; -if (!fscache_cookie_valid (cookie)) -return true; - -if (!(inode->i_state &I_PINNING_FSCACHE_WB )) { -spin_lock (&inode->i_lock); -if (!(inode->i_state &I_PINNING_FSCACHE_WB )) { - inode->i_state |=I_PINNING_FSCACHE_WB ; - need_use = true; - } -spin_unlock (&inode->i_lock); - -if (need_use) -fscache_use_cookie (cookie, true); - } -return true; -} -EXPORT_SYMBOL (fscache_dirty_folio); -struct fscache_write_request {struct netfs_cache_resources cache_resources;struct address_space *mapping;
fs/netfs/misc.c new file +86 -0
86 lines not on this page · raw message
fs/smb/client/cifsfs.c +2 -3
@@ -429,7 +429,7 @@ static void cifs_evict_inode(struct inode *inode) {truncate_inode_pages_final (&inode->i_data); -if (inode->i_state &I_PINNING_FSCACHE_WB ) +if (inode->i_state &I_PINNING_NETFS_WB )cifs_fscache_unuse_inode_cookie (inode, true);cifs_fscache_release_inode_cookie (inode);clear_inode (inode);
@@ -792,8 +792,7 @@ static int cifs_show_stats(struct seq_file *s, struct dentry *root)static int cifs_write_inode (struct inode *inode,struct writeback_control *wbc) { -fscache_unpin_writeback (wbc,cifs_inode_cookie (inode)); -return 0 ; +return netfs_unpin_writeback (inode, wbc); }static int cifs_drop_inode (struct inode *inode)
fs/smb/client/file.c +2 -16
@@ -5043,27 +5043,13 @@ static void cifs_swap_deactivate(struct file *file)/* do we need to unpin (or unlock) the file */ } -/* -* Mark a page as having been made dirty and thus needing writeback. We also -* need to pin the cache object to write back to. -*/ -#ifdef CONFIG_CIFS_FSCACHE -static bool cifs_dirty_folio (struct address_space *mapping,struct folio *folio) -{ -return fscache_dirty_folio (mapping, folio, -cifs_inode_cookie (mapping->host)); -} -#else -#define cifs_dirty_folio filemap_dirty_folio -#endif -const struct address_space_operations cifs_addr_ops = { .read_folio = cifs_read_folio, .readahead = cifs_readahead, .writepages = cifs_writepages, .write_begin = cifs_write_begin, .write_end = cifs_write_end, - .dirty_folio = cifs_dirty_folio, + .dirty_folio = netfs_dirty_folio, .release_folio = cifs_release_folio, .direct_IO = cifs_direct_io, .invalidate_folio = cifs_invalidate_folio,
@@ -5087,7 +5073,7 @@ const struct address_space_operations cifs_addr_ops_smallbuf = { .writepages = cifs_writepages, .write_begin = cifs_write_begin, .write_end = cifs_write_end, - .dirty_folio = cifs_dirty_folio, + .dirty_folio = netfs_dirty_folio, .release_folio = cifs_release_folio, .invalidate_folio = cifs_invalidate_folio, .launder_folio = cifs_launder_folio,
include/linux/fs.h +1 -1
@@ -2294,7 +2294,7 @@ static inline void kiocb_clone(struct kiocb *kiocb, struct kiocb *kiocb_src,#define I_CREATING (1 << 15)#define I_DONTCACHE (1 << 16)#define I_SYNC_QUEUED (1 << 17) -#define I_PINNING_FSCACHE_WB (1 << 18) +#define I_PINNING_NETFS_WB (1 << 18)#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)#define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES)
include/linux/fscache.h +0 -42
48 lines not on this page · raw message
include/linux/netfs.h +3 -0
@@ -288,6 +288,9 @@ int netfs_read_folio(struct file *, struct folio *);int netfs_write_begin (struct netfs_inode *,struct file *,struct address_space *,loff_t pos,unsigned int len,struct folio **,void **fsdata); +bool netfs_dirty_folio (struct address_space *mapping,struct folio *folio); +int netfs_unpin_writeback (struct inode *inode,struct writeback_control *wbc); +void netfs_clear_inode_writeback (struct inode *inode,const void *aux);void netfs_subreq_terminated (struct netfs_io_subrequest *,ssize_t ,bool ); void netfs_get_subrequest(struct netfs_io_subrequest *subreq,
include/linux/writeback.h +1 -1
@@ -60,7 +60,7 @@ struct writeback_control { unsigned for_reclaim:1; /* Invoked from the page allocator */ unsigned range_cyclic:1; /* range_start is cyclic */ unsigned for_sync:1; /* sync(2) WB_SYNC_ALL writeback */ - unsigned unpinned_fscache_wb:1; /* Cleared I_PINNING_FSCACHE_WB */ + unsigned unpinned_netfs_wb:1; /* Cleared I_PINNING_NETFS_WB *//* * When writeback IOs are bounced through async layers, only the
David Howells
maintainerPATCH v5 8/40 netfs: Add a procfile to list in-progress requests
In reply to David HowellsAdd a procfile, /proc/fs/netfs/requests, to list in-progress netfslib I/O requests.
--- fs/netfs/internal.h | 22 ++++++++++++++ fs/netfs/main.c | 69 ++++++++++++++++++++++++++++++++++++++++++- fs/netfs/objects.c | 4 ++- include/linux/netfs.h | 6 +++- 4 files changed, 98 insertions(+), 3 deletions(-)
fs/netfs/internal.h +22 -0
@@ -33,6 +33,28 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync);* main.c */ extern unsigned int netfs_debug; +extern struct list_head netfs_io_requests; +extern spinlock_t netfs_proc_lock; + +#ifdef CONFIG_PROC_FS +static inline void netfs_proc_add_rreq (struct netfs_io_request *rreq) +{ +spin_lock (&netfs_proc_lock); +list_add_tail_rcu (&rreq->proc_link, &netfs_io_requests); +spin_unlock (&netfs_proc_lock); +} +static inline void netfs_proc_del_rreq (struct netfs_io_request *rreq) +{ +if (!list_empty (&rreq->proc_link)) { +spin_lock (&netfs_proc_lock); +list_del_rcu (&rreq->proc_link); +spin_unlock (&netfs_proc_lock); + } +} +#else +static inline void netfs_proc_add_rreq (struct netfs_io_request *rreq) {} +static inline void netfs_proc_del_rreq (struct netfs_io_request *rreq) {} +#endif /* * objects.c
fs/netfs/main.c +68 -1
81 lines not on this page · raw message
fs/netfs/objects.c +3 -1
@@ -45,6 +45,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, } } +netfs_proc_add_rreq (rreq);netfs_stat (&netfs_n_rh_rreq);return rreq; }
@@ -76,12 +77,13 @@ static void netfs_free_request(struct work_struct *work) container_of(work, struct netfs_io_request, work);trace_netfs_rreq (rreq, netfs_rreq_trace_free); +netfs_proc_del_rreq (rreq);netfs_clear_subrequests (rreq, false);if (rreq->netfs_ops->free_request) rreq->netfs_ops->free_request (rreq);if (rreq->cache_resources.ops) rreq->cache_resources.ops->end_operation (&rreq->cache_resources); -kfree (rreq); +kfree_rcu (rreq, rcu);netfs_stat_d (&netfs_n_rh_rreq); }
include/linux/netfs.h +5 -1
@@ -175,10 +175,14 @@ enum netfs_io_origin {* operations to a variety of data stores and then stitch the result together. */ struct netfs_io_request { -struct work_struct work; +union { +struct work_struct work; +struct rcu_head rcu; + };struct inode *inode;/* The file being accessed */ struct address_space *mapping;/* The mapping being accessed */ struct netfs_cache_resources cache_resources; +struct list_head proc_link;/* Link in netfs_iorequests */ struct list_head subrequests;/* Contributory I/O operations */ void *netfs_priv;/* Private data for the netfs */ unsigned int debug_id;
David Howells
maintainerPATCH v5 9/40 netfs: Allow the netfs to make the io (sub)request alloc larger
In reply to David HowellsAllow the network filesystem to specify extra space to be allocated on the end of the io (sub)request. This allows cifs, for example, to use this space rather than allocating its own cifs_readdata struct.
--- fs/netfs/objects.c | 7 +++++-- include/linux/netfs.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-)
fs/netfs/objects.c +5 -2
@@ -22,7 +22,8 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping,struct netfs_io_request *rreq;int ret; - rreq =kzalloc (sizeof (struct netfs_io_request ),GFP_KERNEL ); + rreq =kzalloc (ctx->ops->io_request_size ?:sizeof (struct netfs_io_request ), +GFP_KERNEL );if (!rreq)return ERR_PTR (-ENOMEM );
@@ -114,7 +115,9 @@ struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreq {struct netfs_io_subrequest *subreq; - subreq =kzalloc (sizeof (struct netfs_io_subrequest ),GFP_KERNEL ); + subreq =kzalloc (rreq->netfs_ops->io_subrequest_size ?: +sizeof (struct netfs_io_subrequest ), +GFP_KERNEL );if (subreq) {INIT_LIST_HEAD (&subreq->rreq_link);refcount_set (&subreq->ref,2 );
include/linux/netfs.h +2 -0
@@ -210,6 +210,8 @@ struct netfs_io_request {* Operations the network filesystem can/must provide to the helpers. */ struct netfs_request_ops { +unsigned int io_request_size;/* Alloc size for netfs_io_request struct */ +unsigned int io_subrequest_size;/* Alloc size for netfs_io_subrequest struct */ int (*init_request)(struct netfs_io_request *rreq,struct file *file);void (*free_request)(struct netfs_io_request *rreq);
David Howells
maintainerPATCH v5 10/40 netfs: Add a ->free_subrequest() op
In reply to David HowellsAdd a ->free_subrequest() op so that the netfs can clean up data attached to a subrequest.
--- fs/netfs/objects.c | 2 ++ include/linux/netfs.h | 1 + 2 files changed, 3 insertions(+)
fs/netfs/objects.c +2 -0
@@ -145,6 +145,8 @@ static void netfs_free_subrequest(struct netfs_io_subrequest *subreq,struct netfs_io_request *rreq = subreq->rreq;trace_netfs_sreq (subreq, netfs_sreq_trace_free); +if (rreq->netfs_ops->free_subrequest) + rreq->netfs_ops->free_subrequest (subreq);kfree (subreq);netfs_stat_d (&netfs_n_rh_sreq);netfs_put_request (rreq, was_async, netfs_rreq_trace_put_subreq);
include/linux/netfs.h +1 -0
@@ -214,6 +214,7 @@ struct netfs_request_ops {unsigned int io_subrequest_size;/* Alloc size for netfs_io_subrequest struct */ int (*init_request)(struct netfs_io_request *rreq,struct file *file);void (*free_request)(struct netfs_io_request *rreq); +void (*free_subrequest)(struct netfs_io_subrequest *rreq);void (*expand_readahead)(struct netfs_io_request *rreq);bool (*clamp_length)(struct netfs_io_subrequest *subreq);
David Howells
maintainerPATCH v5 11/40 afs: Don't use folio->private to record partial modification
In reply to David HowellsAFS currently uses folio->private to store the range of bytes within a folio that have been modified - the idea being that if we have, say, a 2MiB folio and someone writes a single byte, we only have to write back that single page and not the whole 2MiB folio - thereby saving on network bandwidth.
Remove this, at least for now, and accept the extra network load (which doesn't matter in the common case of writing a whole file at a time from beginning to end).
This makes folio->private available for netfslib to use.
--- fs/afs/file.c | 67 ------------- fs/afs/internal.h | 56 ----------- fs/afs/write.c | 188 ++++++++----------------------------- include/trace/events/afs.h | 16 +--- 4 files changed, 42 insertions(+), 285 deletions(-)
fs/afs/file.c +0 -67
@@ -386,63 +386,6 @@ const struct netfs_request_ops afs_req_ops = { .issue_read = afs_issue_read, }; -/* -* Adjust the dirty region of the page on truncation or full invalidation, -* getting rid of the markers altogether if the region is entirely invalidated. -*/ -static void afs_invalidate_dirty (struct folio *folio,size_t offset, -size_t length) -{ -struct afs_vnode *vnode =AFS_FS_I (folio_inode (folio)); -unsigned long priv; -unsigned int f, t, end = offset + length; - - priv = (unsigned long )folio_get_private (folio); - -/* we clean up only if the entire page is being invalidated */ -if (offset ==0 && length ==folio_size (folio)) - goto full_invalidate; - -/* If the page was dirtied by page_mkwrite(), the PTE stays writable -* and we don't get another notification to tell us to expand it -* again. -*/ -if (afs_is_folio_dirty_mmapped (priv)) -return ; - -/* We may need to shorten the dirty region */ - f =afs_folio_dirty_from (folio, priv); - t =afs_folio_dirty_to (folio, priv); - -if (t <= offset || f >= end) -return ;/* Doesn't overlap */ - -if (f < offset && t > end) -return ;/* Splits the dirty region - just absorb it */ - -if (f >= offset && t <= end) - goto undirty; - -if (f < offset) - t = offset; -else - f = end; -if (f == t) - goto undirty; - - priv =afs_folio_dirty (folio, f, t); -folio_change_private (folio, (void *)priv); -trace_afs_folio_dirty (vnode,tracepoint_string ("trunc" ), folio); -return ; - -undirty: -trace_afs_folio_dirty (vnode,tracepoint_string ("undirty" ), folio); -folio_clear_dirty_for_io (folio); -full_invalidate: -trace_afs_folio_dirty (vnode,tracepoint_string ("inval" ), folio); -folio_detach_private (folio); -} -/* * invalidate part or all of a page * - release a page and clean up its private data if offset is 0 (indicating
@@ -453,11 +396,6 @@ static void afs_invalidate_folio(struct folio *folio, size_t offset, {_enter ("{%lu},%zu,%zu" , folio->index, offset, length); -BUG_ON (!folio_test_locked (folio)); - -if (folio_get_private (folio)) -afs_invalidate_dirty (folio, offset, length); -folio_wait_fscache (folio);_leave ("" ); }
@@ -485,11 +423,6 @@ static bool afs_release_folio(struct folio *folio, gfp_t gfp)fscache_note_page_release (afs_vnode_cache (vnode));#endif -if (folio_test_private (folio)) { -trace_afs_folio_dirty (vnode,tracepoint_string ("rel" ), folio); -folio_detach_private (folio); - } -/* Indicate that the folio can be released */ _leave (" = T" );return true;
fs/afs/internal.h +0 -56
62 lines not on this page · raw message
fs/afs/write.c +38 -150
353 lines not on this page · raw message
include/trace/events/afs.h +4 -12
@@ -846,26 +846,18 @@ TRACE_EVENT(afs_folio_dirty, __field(struct afs_vnode *, vnode) __field(const char *, where) __field(pgoff_t, index) - __field(unsigned long, from) - __field(unsigned long, to) + __field(size_t, size) ),TP_fast_assign ( - unsigned long priv = (unsigned long)folio_get_private(folio); __entry->vnode = vnode; __entry->where = where; __entry->index =folio_index (folio); - __entry->from =afs_folio_dirty_from (folio, priv); - __entry->to =afs_folio_dirty_to (folio, priv); - __entry->to |= (afs_is_folio_dirty_mmapped (priv) ? - (1UL << (BITS_PER_LONG -1 )) :0 ); + __entry->size =folio_size (folio); ), -TP_printk ("vn=%p %lx %s %lx-%lx%s" , - __entry->vnode, __entry->index, __entry->where, - __entry->from, - __entry->to & ~(1UL << (BITS_PER_LONG -1 )), - __entry->to & (1UL << (BITS_PER_LONG -1 )) ?" M" :"" ) +TP_printk ("vn=%p ix=%05lx s=%05lx %s" , + __entry->vnode, __entry->index, __entry->size, __entry->where) ); TRACE_EVENT(afs_call_state,
David Howells
maintainerPATCH v5 12/40 netfs: Provide invalidate_folio and release_folio calls
In reply to David HowellsProvide default invalidate_folio and release_folio calls. These will need to interact with invalidation correctly at some point. They will be needed if netfslib is to make use of folio->private for its own purposes.
---
Notes:
Changes
=======
ver #5)
- Removed ceph_fscache_note_page_release() also as that is now unused.
- Added missing '*' to turn comment into kdoc.
fs/9p/vfs_addr.c | 33 ++------------------------- fs/afs/file.c | 53 ++++--------------------------------------- fs/ceph/addr.c | 24 ++------------------ fs/ceph/cache.h | 10 -------- fs/netfs/misc.c | 42 ++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 6 +++-- 6 files changed, 54 insertions(+), 114 deletions(-)
fs/9p/vfs_addr.c +2 -31
@@ -88,35 +88,6 @@ const struct netfs_request_ops v9fs_req_ops = { .issue_read = v9fs_issue_read, }; -/** -* v9fs_release_folio - release the private state associated with a folio -* @folio: The folio to be released -* @gfp: The caller's allocation restrictions -* -* Returns true if the page can be released, false otherwise. -*/ - -static bool v9fs_release_folio (struct folio *folio,gfp_t gfp) -{ -if (folio_test_private (folio)) -return false; -#ifdef CONFIG_9P_FSCACHE -if (folio_test_fscache (folio)) { -if (current_is_kswapd () || !(gfp & __GFP_FS)) -return false; -folio_wait_fscache (folio); - } -fscache_note_page_release (v9fs_inode_cookie (V9FS_I (folio_inode (folio)))); -#endif -return true; -} - -static void v9fs_invalidate_folio (struct folio *folio,size_t offset, -size_t length) -{ -folio_wait_fscache (folio); -} -#ifdef CONFIG_9P_FSCACHE static void v9fs_write_to_cache_done (void *priv,ssize_t transferred_or_error,bool was_async)
@@ -324,8 +295,8 @@ const struct address_space_operations v9fs_addr_operations = { .writepage = v9fs_vfs_writepage, .write_begin = v9fs_write_begin, .write_end = v9fs_write_end, - .release_folio = v9fs_release_folio, - .invalidate_folio = v9fs_invalidate_folio, + .release_folio = netfs_release_folio, + .invalidate_folio = netfs_invalidate_folio, .launder_folio = v9fs_launder_folio, .direct_IO = v9fs_direct_IO, };
fs/afs/file.c +4 -49
77 lines not on this page · raw message
fs/ceph/addr.c +2 -22
@@ -159,27 +159,7 @@ static void ceph_invalidate_folio(struct folio *folio, size_t offset,ceph_put_snap_context (snapc); } -folio_wait_fscache (folio); -} - -static bool ceph_release_folio (struct folio *folio,gfp_t gfp) -{ -struct inode *inode = folio->mapping->host; -struct ceph_client *cl =ceph_inode_to_client (inode); - -doutc (cl,"%llx.%llx idx %lu (%sdirty)\n" ,ceph_vinop (inode), - folio->index,folio_test_dirty (folio) ?"" :"not " ); - -if (folio_test_private (folio)) -return false; - -if (folio_test_fscache (folio)) { -if (current_is_kswapd () || !(gfp & __GFP_FS)) -return false; -folio_wait_fscache (folio); - } -ceph_fscache_note_page_release (inode); -return true; +netfs_invalidate_folio (folio, offset, length); }static void ceph_netfs_expand_readahead (struct netfs_io_request *rreq)
@@ -1585,7 +1565,7 @@ const struct address_space_operations ceph_aops = { .write_end = ceph_write_end, .dirty_folio = ceph_dirty_folio, .invalidate_folio = ceph_invalidate_folio, - .release_folio = ceph_release_folio, + .release_folio = netfs_release_folio, .direct_IO = noop_direct_IO, };
fs/ceph/cache.h +0 -10
@@ -56,12 +56,6 @@ static inline bool ceph_is_cache_enabled(struct inode *inode) return fscache_cookie_enabled(ceph_fscache_cookie(ceph_inode(inode))); } -static inline void ceph_fscache_note_page_release (struct inode *inode) -{ -struct ceph_inode_info *ci =ceph_inode (inode); - -fscache_note_page_release (ceph_fscache_cookie (ci)); -}#else /* CONFIG_CEPH_FSCACHE */ static inline int ceph_fscache_register_fs (struct ceph_fs_client * fsc,struct fs_context *fc)
@@ -118,10 +112,6 @@ static inline bool ceph_is_cache_enabled(struct inode *inode) {return false; } - -static inline void ceph_fscache_note_page_release (struct inode *inode) -{ -}#endif /* CONFIG_CEPH_FSCACHE */ #endif
fs/netfs/misc.c +42 -0
45 lines not on this page · raw message
include/linux/netfs.h +4 -2
@@ -293,11 +293,13 @@ struct readahead_control;void netfs_readahead (struct readahead_control *);int netfs_read_folio (struct file *,struct folio *);int netfs_write_begin (struct netfs_inode *,struct file *, -struct address_space *,loff_t pos,unsigned int len, -struct folio **,void **fsdata); +struct address_space *,loff_t pos,unsigned int len, +struct folio **,void **fsdata);bool netfs_dirty_folio (struct address_space *mapping,struct folio *folio);int netfs_unpin_writeback (struct inode *inode,struct writeback_control *wbc);void netfs_clear_inode_writeback (struct inode *inode,const void *aux); +void netfs_invalidate_folio (struct folio *folio,size_t offset,size_t length); +bool netfs_release_folio (struct folio *folio,gfp_t gfp);void netfs_subreq_terminated (struct netfs_io_subrequest *,ssize_t ,bool ); void netfs_get_subrequest(struct netfs_io_subrequest *subreq,
David Howells
maintainerPATCH v5 13/40 netfs: Implement unbuffered/DIO vs buffered I/O locking
In reply to David HowellsBorrow NFS's direct-vs-buffered I/O locking into netfslib. Similar code is also used in ceph.
Modify it to have the correct checker annotations for i_rwsem lock acquisition/release and to return -ERESTARTSYS if waits are interrupted.
--- fs/netfs/Makefile | 1 + fs/netfs/locking.c | 216 ++++++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 10 ++ 3 files changed, 227 insertions(+) create mode 100644 fs/netfs/locking.c
fs/netfs/Makefile +1 -0
@@ -4,6 +4,7 @@ netfs-y := \ buffered_read.o \ io.o \ iterator.o \ + locking.o \ main.o \ misc.o \ objects.o
fs/netfs/locking.c new file +216 -0
216 lines not on this page · raw message
include/linux/netfs.h +10 -0
@@ -129,6 +129,8 @@ struct netfs_inode {struct fscache_cookie *cache;#endif loff_t remote_i_size;/* Size of the remote file */ +unsigned long flags; +#define NETFS_ICTX_ODIRECT 0/* The file has DIO in progress */ };/*
@@ -310,6 +312,13 @@ ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len,struct iov_iter *new, iov_iter_extraction_t extraction_flags); +int netfs_start_io_read (struct inode *inode); +void netfs_end_io_read (struct inode *inode); +int netfs_start_io_write (struct inode *inode); +void netfs_end_io_write (struct inode *inode); +int netfs_start_io_direct (struct inode *inode); +void netfs_end_io_direct (struct inode *inode); +/** * netfs_inode - Get the netfs inode context from the inode * @inode: The inode to query
@@ -335,6 +344,7 @@ static inline void netfs_inode_init(struct netfs_inode *ctx, { ctx->ops = ops; ctx->remote_i_size =i_size_read (&ctx->inode); + ctx->flags =0 ;#if IS_ENABLED (CONFIG_FSCACHE ) ctx->cache =NULL ;#endif
David Howells
maintainerPATCH v5 14/40 netfs: Add iov_iters to (sub)requests to describe various buffers
In reply to David HowellsAdd three iov_iter structs:
(1) Add an iov_iter (->iter) to the I/O request to describe the unencrypted-side buffer.
(2) Add an iov_iter (->io_iter) to the I/O request to describe the encrypted-side I/O buffer. This may be a different size to the buffer in (1).
(3) Add an iov_iter (->io_iter) to the I/O subrequest to describe the part of the I/O buffer for that subrequest.
This will allow future patches to point to a bounce buffer instead for purposes of handling oversize writes, decryption (where we want to save the encrypted data to the cache) and decompression.
These iov_iters persist for the lifetime of the (sub)request, and so can be accessed multiple times without worrying about them being deallocated upon return to the caller.
The network filesystem must appropriately advance the iterator before terminating the request.
--- fs/afs/file.c | 6 +--- fs/netfs/buffered_read.c | 13 ++++++++ fs/netfs/io.c | 69 +++++++++++++++++++++++++++++----------- include/linux/netfs.h | 3 ++ 4 files changed, 67 insertions(+), 24 deletions(-)
fs/afs/file.c +1 -5
@@ -323,11 +323,7 @@ static void afs_issue_read(struct netfs_io_subrequest *subreq) fsreq->len = subreq->len - subreq->transferred; fsreq->key =key_get (subreq->rreq->netfs_priv); fsreq->vnode = vnode; - fsreq->iter = &fsreq->def_iter; - -iov_iter_xarray (&fsreq->def_iter,ITER_DEST , - &fsreq->vnode->netfs.inode.i_mapping->i_pages, - fsreq->pos, fsreq->len); + fsreq->iter = &subreq->io_iter;afs_fetch_data (fsreq->vnode, fsreq);afs_put_read (fsreq);
fs/netfs/buffered_read.c +13 -0
@@ -199,6 +199,10 @@ void netfs_readahead(struct readahead_control *ractl)netfs_rreq_expand (rreq, ractl); +/* Set up the output buffer */ +iov_iter_xarray (&rreq->iter,ITER_DEST , &ractl->mapping->i_pages, + rreq->start, rreq->len); +/* Drop the refs on the folios here rather than in the cache or * filesystem. The locks will be dropped in netfs_rreq_unlock(). */
@@ -251,6 +255,11 @@ int netfs_read_folio(struct file *file, struct folio *folio)netfs_stat (&netfs_n_rh_readpage);trace_netfs_read (rreq, rreq->start, rreq->len, netfs_read_trace_readpage); + +/* Set up the output buffer */ +iov_iter_xarray (&rreq->iter,ITER_DEST , &mapping->i_pages, + rreq->start, rreq->len); +return netfs_begin_read (rreq, true); discard:
@@ -408,6 +417,10 @@ int netfs_write_begin(struct netfs_inode *ctx, ractl._nr_pages =folio_nr_pages (folio);netfs_rreq_expand (rreq, &ractl); +/* Set up the output buffer */ +iov_iter_xarray (&rreq->iter,ITER_DEST , &mapping->i_pages, + rreq->start, rreq->len); +/* We hold the folio locks, so we can drop the references */ folio_get (folio);while (readahead_folio (&ractl))
fs/netfs/io.c +50 -19
152 lines not on this page · raw message
include/linux/netfs.h +3 -0
@@ -150,6 +150,7 @@ struct netfs_cache_resources {struct netfs_io_subrequest {struct netfs_io_request *rreq;/* Supervising I/O request */ struct list_head rreq_link;/* Link in rreq->subrequests */ +struct iov_iter io_iter;/* Iterator for this subrequest */ loff_t start;/* Where to start the I/O */ size_t len;/* Size of the I/O */ size_t transferred;/* Amount of data transferred */
@@ -186,6 +187,8 @@ struct netfs_io_request {struct netfs_cache_resources cache_resources;struct list_head proc_link;/* Link in netfs_iorequests */ struct list_head subrequests;/* Contributory I/O operations */ +struct iov_iter iter;/* Unencrypted-side iterator */ +struct iov_iter io_iter;/* I/O (Encrypted-side) iterator */ void *netfs_priv;/* Private data for the netfs */ unsigned int debug_id;atomic_t nr_outstanding;/* Number of ops in progress */
Re: [PATCH v5 14/40] netfs: Add iov_iters to (sub)requests to describe various buffers
Hi,
recently some of our (Proxmox VE) users report issues with file corruptions when accessing contents located on CephFS via the in-kernel ceph client [0,1]. According to these reports, our kernels based on (Ubuntu) v6.8 do show these corruptions, using the FUSE client or the in-kernel ceph client with kernels based on v6.5 does not show these. Unfortunately the corruption is hard to reproduce.
After a further report of file corruption [2] with a completely unrelated code path, we managed to reproduce the corruption for one file by sheer chance on one of our ceph test clusters. We were able to narrow it down to be possibly an issue with reading of the contents via the in-kernel ceph client. Note that we can exclude the file contents itself being corrupt, as any not affected kernel version or the FUSE client gives the correct contents.
The issue is present also in the current mainline kernel 6.11-rc2.
Bisection with the reproducer points to this commit:
"92b6cc5d: netfs: Add iov_iters to (sub)requests to describe various buffers"
Description of the issue:
* file copied from local filesystem to cephfs via:cp /tmp/proxmox-backup-server_3.2-1.iso /mnt/pve/cephfs/proxmox-backup-server_3.2-1.iso
* sha256sum on local filesystem:1d19698e8f7e769cf0a0dcc7ba0018ef5416c5ec495d5e61313f9c84a4237607 /tmp/proxmox-backup-server_3.2-1.iso
* sha256sum on cephfs with kernel up to above commit:1d19698e8f7e769cf0a0dcc7ba0018ef5416c5ec495d5e61313f9c84a4237607 /mnt/pve/cephfs/proxmox-backup-server_3.2-1.iso
* sha256sum on cephfs with kernel after above commit:89ad3620bf7b1e0913b534516cfbe48580efbaec944b79951e2c14e5e551f736 /mnt/pve/cephfs/proxmox-backup-server_3.2-1.iso
* removing and/or recopying the file does not change the issue, the corrupt checksum remains the same.
* Only this one particular file has been observed to show the issue, for others the checksums match.
* Accessing the same file from different clients results in the same output: The one with above patch applied do show the incorrect checksum, ones without the patch show the correct checksum.
* The issue persists even across reboot of the ceph cluster and/or clients.
* The file is indeed corrupt after reading, as verified by a cmp -b.
Does anyone have an idea what could be the cause of this issue, or how to further debug this? Happy to provide more information or a dynamic debug output if needed.
Best regards,
Chris
[0] https://forum.proxmox.com/threads/78340/post-676129
[1] https://forum.proxmox.com/threads/149249/
[2] https://forum.proxmox.com/threads/151291/
Re: [PATCH v5 14/40] netfs: Add iov_iters to (sub)requests to describe various buffers
Quoted 31 lines · Christian Ebner
Hi,
recently some of our (Proxmox VE) users report issues with file corruptions when accessing contents located on CephFS via the in-kernel ceph client [0,1]. According to these reports, our kernels based on (Ubuntu) v6.8 do show these corruptions, using the FUSE client or the in-kernel ceph client with kernels based on v6.5 does not show these. Unfortunately the corruption is hard to reproduce.
After a further report of file corruption [2] with a completely unrelated code path, we managed to reproduce the corruption for one file by sheer chance on one of our ceph test clusters. We were able to narrow it down to be possibly an issue with reading of the contents via the in-kernel ceph client. Note that we can exclude the file contents itself being corrupt, as any not affected kernel version or the FUSE client gives the correct contents.
The issue is present also in the current mainline kernel 6.11-rc2.
Bisection with the reproducer points to this commit:
"
92b6cc5d: netfs: Addiov_itersto (sub)requests to describe various buffers"Description of the issue:
* file copied from local filesystem to cephfs via:
cp /tmp/proxmox-backup-server_3.2-1.iso /mnt/pve/cephfs/proxmox-backup-server_3.2-1.iso
* sha256sum on local filesystem:1d19698e8f7e769cf0a0dcc7ba0018ef5416c5ec495d5e61313f9c84a4237607 /tmp/proxmox-backup-server_3.2-1.iso
* sha256sum on cephfs with kernel up to above commit:1d19698e8f7e769cf0a0dcc7ba0018ef5416c5ec495d5e61313f9c84a4237607 /mnt/pve/cephfs/proxmox-backup-server_3.2-1.iso
* sha256sum on cephfs with kernel after above commit:89ad3620bf7b1e0913b534516cfbe48580efbaec944b79951e2c14e5e551f736 /mnt/pve/cephfs/proxmox-backup-server_3.2-1.iso
* removing and/or recopying the file does not change the issue, the corrupt checksum remains the same.
* Only this one particular file has been observed to show the issue, for others the checksums match.
* Accessing the same file from different clients results in the same output: The one with above patch applied do show the incorrect checksum, ones without the patch show the correct checksum.
* The issue persists even across reboot of the ceph cluster and/or clients.
* The file is indeed corrupt after reading, as verified by acmp -b.Does anyone have an idea what could be the cause of this issue, or how to further debug this? Happy to provide more information or a dynamic debug output if needed.
Quoted 7 lines
Best regards,
Chris
[0] https://forum.proxmox.com/threads/78340/post-676129
[1] https://forum.proxmox.com/threads/149249/
[2] https://forum.proxmox.com/threads/151291/
Hi,
please allow me to send a followup regarding this:
Thanks to a suggestion by my colleague Friedrich Weber we have some further interesting findings.
The issue is related to the readahead size passed to mount.ceph, when mounting the filesystem [0].
Passing an rasize in the range of [0..1k] leads to the correct checksum, independent of the bisected patch being applied or not.
Ranges from (1k..1M] lead to corrupt, but different checksums for different rasize values, and finally rasize values above 1M lead to a corrupt, but constant checksum value. Again, without the bisected patch, the issue is not present.
Please let me know if I can provide further information or debug outputs in order to narrow down the issue.
Best regards,
Chris
[0] https://docs.ceph.com/en/reef/man/8/mount.ceph/#advanced
David Howells
maintainerPATCH v5 15/40 netfs: Add support for DIO buffering
In reply to David HowellsAdd a bvec array pointer and an iterator to netfs_io_request for either holding a copy of a DIO iterator or a list of all the bits of buffer pointed to by a DIO iterator.
There are two problems: Firstly, if an iovec-class iov_iter is passed to ->read_iter() or ->write_iter(), this cannot be passed directly to kernel_sendmsg() or kernel_recvmsg() as that may cause locking recursion if a fault is generated, so we need to keep track of the pages involved separately.
Secondly, if the I/O is asynchronous, we must copy the iov_iter describing the buffer before returning to the caller as it may be immediately deallocated.
--- fs/netfs/objects.c | 10 ++++++++++ include/linux/netfs.h | 4 ++++ 2 files changed, 14 insertions(+)
fs/netfs/objects.c +10 -0
@@ -76,6 +76,7 @@ static void netfs_free_request(struct work_struct *work) {struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work); +unsigned int i;trace_netfs_rreq (rreq, netfs_rreq_trace_free);netfs_proc_del_rreq (rreq);
@@ -84,6 +85,15 @@ static void netfs_free_request(struct work_struct *work) rreq->netfs_ops->free_request (rreq);if (rreq->cache_resources.ops) rreq->cache_resources.ops->end_operation (&rreq->cache_resources); +if (rreq->direct_bv) { +for (i =0 ; i < rreq->direct_bv_count; i++) { +if (rreq->direct_bv[i].bv_page) { +if (rreq->direct_bv_unpin) +unpin_user_page (rreq->direct_bv[i].bv_page); + } + } +kvfree (rreq->direct_bv); + }kfree_rcu (rreq, rcu);netfs_stat_d (&netfs_n_rh_rreq); }
include/linux/netfs.h +4 -0
@@ -190,6 +190,9 @@ struct netfs_io_request {struct iov_iter iter;/* Unencrypted-side iterator */ struct iov_iter io_iter;/* I/O (Encrypted-side) iterator */ void *netfs_priv;/* Private data for the netfs */ + struct bio_vec *direct_bv /* DIO buffer list (when handling iovec-iter) */ +__counted_by (direct_bv_count ); +unsigned int direct_bv_count;/* Number of elements in direct_bv[] */ unsigned int debug_id;atomic_t nr_outstanding;/* Number of ops in progress */ atomic_t nr_copy_ops;/* Number of copy-to-cache ops in progress */
@@ -197,6 +200,7 @@ struct netfs_io_request {size_t len;/* Length of the request */ short error;/* 0 or error that occurred */ enum netfs_io_origin origin;/* Origin of the request */ +bool direct_bv_unpin;/* T if direct_bv[] must be unpinned */ loff_t i_size;/* Size of the file */ loff_t start;/* Start position */ pgoff_t no_unlock_folio;/* Don't unlock this folio after read */
Re: [PATCH v5 15/40] netfs: Add support for DIO buffering
Quoted 57 lines · David Howells
Add a bvec array pointer and an iterator to
netfs_io_requestfor either holding a copy of a DIO iterator or a list of all the bits of buffer pointed to by a DIO iterator.There are two problems: Firstly, if an iovec-class
iov_iteris passed to ->read_iter() or ->write_iter(), this cannot be passed directly tokernel_sendmsg()orkernel_recvmsg()as that may cause locking recursion if a fault is generated, so we need to keep track of the pages involved separately.Secondly, if the I/O is asynchronous, we must copy the
iov_iterdescribing the buffer before returning to the caller as it may be immediately deallocated.Signed-off-by David Howells <[email protected]>Reviewed-by Jeff Layton <[email protected]>--- fs/netfs/objects.c | 10 ++++++++++ include/linux/netfs.h | 4 ++++ 2 files changed, 14 insertions(+)fs/netfs/objects.c +10
-0@@ -76,6 +76,7 @@ static void netfs_free_request(struct work_struct *work) {struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work); +unsigned int i;trace_netfs_rreq (rreq, netfs_rreq_trace_free);netfs_proc_del_rreq (rreq);@@ -84,6 +85,15 @@ static void netfs_free_request(struct work_struct *work) rreq->netfs_ops->free_request (rreq);if (rreq->cache_resources.ops) rreq->cache_resources.ops->end_operation (&rreq->cache_resources); +if (rreq->direct_bv) { +for (i =0 ; i < rreq->direct_bv_count; i++) { +if (rreq->direct_bv[i].bv_page) { +if (rreq->direct_bv_unpin) +unpin_user_page (rreq->direct_bv[i].bv_page); + } + } +kvfree (rreq->direct_bv); + }kfree_rcu (rreq, rcu);netfs_stat_d (&netfs_n_rh_rreq); }include/linux/netfs.h +0
-0
include/linux/netfs.h struct netfs_io_request { · line 194
Quoted 5 lines
include/linux/netfs.h +2
-0@@ -190,6 +190,9 @@ struct netfs_io_request {struct iov_iter iter;/* Unencrypted-side iterator */ struct iov_iter io_iter;/* I/O (Encrypted-side) iterator */ void *netfs_priv;/* Private data for the netfs */ + struct bio_vec *direct_bv /* DIO buffer list (when handling iovec-iter) */ +__counted_by (direct_bv_count );
This will break the build with versions of clang that have support for counted_by (as it has been reverted in main but reapplication to main is being actively worked on) because while annotating pointers with this attribute is a goal of the counted_by attribute, it is not ready yet. Please consider removing this and adding a TODO to annotate it when support is available.
In file included from /builds/linux/fs/ceph/crypto.c:14:
In file included from /builds/linux/fs/ceph/super.h:20:
/builds/linux/include/linux/netfs.h:259:19: error: 'counted_by' only applies to C99 flexible array members
259 | struct bio_vec *direct_bv /* DIO buffer list (when handling iovec-iter) */
| ^~~~~~~~~
1 error generated.
Some additional context from another recent error like this:
https://lore.kernel.org/CAKwvOdkvGTGiWzqEFq=kzqvxSYP5vUj3g9Z-=MZSQROzzSa_dg@mail.gmail.com/
Cheers,
Nathan
Quoted 13 lines
include/linux/netfs.h +2
-0+unsigned int direct_bv_count;/* Number of elements in direct_bv[] */ unsigned int debug_id;atomic_t nr_outstanding;/* Number of ops in progress */ atomic_t nr_copy_ops;/* Number of copy-to-cache ops in progress */ @@ -197,6 +200,7 @@ struct netfs_io_request {size_t len;/* Length of the request */ short error;/* 0 or error that occurred */ enum netfs_io_origin origin;/* Origin of the request */ +bool direct_bv_unpin;/* T if direct_bv[] must be unpinned */ loff_t i_size;/* Size of the file */ loff_t start;/* Start position */ pgoff_t no_unlock_folio;/* Don't unlock this folio after read */
Christian Brauner
maintainerRe: [PATCH v5 15/40] netfs: Add support for DIO buffering
Quoted 6 lines
This will break the build with versions of clang that have support for
counted_by(as it has been reverted in main but reapplication to main is being actively worked on) because while annotating pointers with this attribute is a goal of thecounted_byattribute, it is not ready yet. Please consider removing this and adding a TODO to annotate it when support is available.
It's really unpleasant that we keep getting new attributes that we seemingly are encouraged to use and get sent patches for it. And then we learn a little later that that stuff isn't ready yet. It's annoying. I know it isn't your fault but it would be wise to be a little more careful. IOW, unless both clang and gcc do support that thing appropriately don't send patches to various subsystems for this.
In any case, this is now fixed. I pulled an updated version from David.
Re: [PATCH v5 15/40] netfs: Add support for DIO buffering
Quoted 10 lines · Christian Brauner
Quoted 6 lines
This will break the build with versions of clang that have support for
counted_by(as it has been reverted in main but reapplication to main is being actively worked on) because while annotating pointers with this attribute is a goal of thecounted_byattribute, it is not ready yet. Please consider removing this and adding a TODO to annotate it when support is available.It's really unpleasant that we keep getting new attributes that we seemingly are encouraged to use and get sent patches for it. And then we learn a little later that that stuff isn't ready yet. It's annoying. I
I will assume the "get sent patches for it" is referring to the patches that Kees has been sending out to add this attribute to flexible array members. In his defense, that part of the attribute is very nearly ready (it is only the pointer annotations that are not ready, as in not worked on at all as far as I am aware). In fact, it was merged in clang's main branch for some time and the only reason that it was backed out was because adoption in the kernel had pointed out bugs in the original implementation that were harder to fix than initially thought; in other words, only because we started adding this attribute to the kernel were we able to realize that the initial implementation in clang needed to be improved, otherwise this feature may have shipped completely broken in clang 18.1.0 because it had not been stress tested yet. Now we can get it right.
However, I do not necessarily disagree that it is annoying for maintainers who are not following this saga but are just receiving patches to add these annotatations because adds additional things to check for. Perhaps there should be some guidance added to the __counted_by definition or Documentation around how it is expected to be used so that there is clear advice for both developers and maintainers?
Quoted 3 lines
know it isn't your fault but it would be wise to be a little more careful. IOW, unless both clang and gcc do support that thing appropriately don't send patches to various subsystems for this.
I will assume this was not necessarily directed at me because I have not sent any patches for __counted_by.
Quoted 1 line
In any case, this is now fixed. I pulled an updated version from David.
Thanks a lot.
Cheers,
Nathan
David Howells
maintainerPATCH v5 16/40 netfs: Provide tools to create a buffer in an xarray
In reply to David HowellsProvide tools to create a buffer in an xarray, with a function to add new folios with a mark. This will be used to create bounce buffer and can be used more easily to create a list of folios the span of which would require more than a page's worth of bio_vec structs.
--- fs/netfs/internal.h | 13 +++++++ fs/netfs/misc.c | 81 +++++++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 4 +++ 3 files changed, 98 insertions(+)
fs/netfs/internal.h +13 -0
@@ -56,6 +56,19 @@ static inline void netfs_proc_add_rreq(struct netfs_io_request *rreq) {}static inline void netfs_proc_del_rreq (struct netfs_io_request *rreq) {}#endif +/* +* misc.c +*/ +#define NETFS_FLAG_PUT_MARK BIT(0) +#define NETFS_FLAG_PAGECACHE_MARK BIT(1) +int netfs_xa_store_and_mark (struct xarray *xa,unsigned long index, +struct folio *folio,unsigned int flags, +gfp_t gfp_mask); +int netfs_add_folios_to_buffer (struct xarray *buffer, +struct address_space *mapping, +pgoff_t index,pgoff_t to,gfp_t gfp_mask); +void netfs_clear_buffer (struct xarray *buffer); +/* * objects.c */
fs/netfs/misc.c +81 -0
87 lines not on this page · raw message
include/linux/netfs.h +4 -0
@@ -109,6 +109,10 @@ static inline int wait_on_page_fscache_killable(struct page *page)return folio_wait_private_2_killable (page_folio (page)); } +/* Marks used on xarray-based buffers */ +#define NETFS_BUF_PUT_MARK XA_MARK_0/* - Page needs putting */ +#define NETFS_BUF_PAGECACHE_MARK XA_MARK_1/* - Page needs wb/dirty flag wrangling */ +enum netfs_io_source {NETFS_FILL_WITH_ZEROES ,NETFS_DOWNLOAD_FROM_SERVER ,
David Howells
maintainerPATCH v5 17/40 netfs: Add func to calculate pagecount/size-limited span of an iterator
In reply to David HowellsAdd a function to work out how much of an ITER_BVEC or ITER_XARRAY iterator we can use in a pagecount-limited and size-limited span. This will be used, for example, to limit the number of segments in a subrequest to the maximum number of elements that an RDMA transfer can handle.
--- fs/netfs/iterator.c | 97 +++++++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 2 + 2 files changed, 99 insertions(+)
fs/netfs/iterator.c +97 -0
@@ -101,3 +101,100 @@ ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len,return npages; }EXPORT_SYMBOL_GPL (netfs_extract_user_iter); + +/* +* Select the span of a bvec iterator we're going to use. Limit it by both maximum +* size and maximum number of segments. Returns the size of the span in bytes. +*/ +static size_t netfs_limit_bvec (const struct iov_iter *iter,size_t start_offset, +size_t max_size,size_t max_segs) +{ +const struct bio_vec *bvecs = iter->bvec; +unsigned int nbv = iter->nr_segs, ix =0 , nsegs =0 ; +size_t len, span =0 , n = iter->count; +size_t skip = iter->iov_offset + start_offset; + +if (WARN_ON (!iov_iter_is_bvec (iter)) || +WARN_ON (start_offset > n) || + n ==0 ) +return 0 ; + +while (n && ix < nbv && skip) { + len = bvecs[ix].bv_len; +if (skip < len) +break ; + skip -= len; + n -= len; + ix++; + } + +while (n && ix < nbv) { + len =min3 (n, bvecs[ix].bv_len - skip, max_size); + span += len; + nsegs++; + ix++; +if (span >= max_size || nsegs >= max_segs) +break ; + skip =0 ; + n -= len; + } + +return min (span, max_size); +} + +/* +* Select the span of an xarray iterator we're going to use. Limit it by both +* maximum size and maximum number of segments. It is assumed that segments +* can be larger than a page in size, provided they're physically contiguous. +* Returns the size of the span in bytes. +*/ +static size_t netfs_limit_xarray (const struct iov_iter *iter,size_t start_offset, +size_t max_size,size_t max_segs) +{ +struct folio *folio; +unsigned int nsegs =0 ; +loff_t pos = iter->xarray_start + iter->iov_offset; +pgoff_t index = pos /PAGE_SIZE ; +size_t span =0 , n = iter->count; + +XA_STATE (xas, iter->xarray, index); + +if (WARN_ON (!iov_iter_is_xarray (iter)) || +WARN_ON (start_offset > n) || + n ==0 ) +return 0 ; + max_size =min (max_size, n - start_offset); + +rcu_read_lock (); +xas_for_each (&xas, folio,ULONG_MAX ) { +size_t offset, flen, len; +if (xas_retry (&xas, folio)) +continue ; +if (WARN_ON (xa_is_value (folio))) +break ; +if (WARN_ON (folio_test_hugetlb (folio))) +break ; + + flen =folio_size (folio); + offset =offset_in_folio (folio, pos); + len =min (max_size, flen - offset); + span += len; + nsegs++; +if (span >= max_size || nsegs >= max_segs) +break ; + } + +rcu_read_unlock (); +return min (span, max_size); +} + +size_t netfs_limit_iter (const struct iov_iter *iter,size_t start_offset, +size_t max_size,size_t max_segs) +{ +if (iov_iter_is_bvec (iter)) +return netfs_limit_bvec (iter, start_offset, max_size, max_segs); +if (iov_iter_is_xarray (iter)) +return netfs_limit_xarray (iter, start_offset, max_size, max_segs); +BUG (); +} +EXPORT_SYMBOL (netfs_limit_iter);
include/linux/netfs.h +2 -0
@@ -322,6 +322,8 @@ void netfs_put_subrequest(struct netfs_io_subrequest *subreq,ssize_t netfs_extract_user_iter (struct iov_iter *orig,size_t orig_len,struct iov_iter *new,iov_iter_extraction_t extraction_flags); +size_t netfs_limit_iter (const struct iov_iter *iter,size_t start_offset, +size_t max_size,size_t max_segs);int netfs_start_io_read (struct inode *inode);void netfs_end_io_read (struct inode *inode);
David Howells
maintainerPATCH v5 18/40 netfs: Limit subrequest by size or number of segments
In reply to David HowellsLimit a subrequest to a maximum size and/or a maximum number of contiguous physical regions. This permits, for instance, an subreq's iterator to be limited to the number of DMA'able segments that a large RDMA request can handle.
--- fs/netfs/io.c | 18 ++++++++++++++++++ include/linux/netfs.h | 1 + include/trace/events/netfs.h | 1 + 3 files changed, 20 insertions(+)
fs/netfs/io.c +18 -0
@@ -525,6 +525,7 @@ netfs_rreq_prepare_read(struct netfs_io_request *rreq, struct iov_iter *io_iter) {enum netfs_io_source source; +size_t lsize;_enter ("%llx-%llx,%llx" , subreq->start, subreq->start + subreq->len, rreq->i_size);
@@ -547,13 +548,30 @@ netfs_rreq_prepare_read(struct netfs_io_request *rreq, source =NETFS_INVALID_READ ; goto out; } + +if (subreq->max_nr_segs) { + lsize =netfs_limit_iter (io_iter,0 , subreq->len, + subreq->max_nr_segs); +if (subreq->len > lsize) { + subreq->len = lsize; +trace_netfs_sreq (subreq, netfs_sreq_trace_limited); + } + } } +if (subreq->len > rreq->len) +pr_warn ("R=%08x[%u] SREQ>RREQ %zx > %zx\n" , + rreq->debug_id, subreq->debug_index, + subreq->len, rreq->len); +if (WARN_ON (subreq->len ==0 )) { source =NETFS_INVALID_READ ; goto out; } + subreq->source = source; +trace_netfs_sreq (subreq, netfs_sreq_trace_prepare); + subreq->io_iter = *io_iter;iov_iter_truncate (&subreq->io_iter, subreq->len);iov_iter_advance (io_iter, subreq->len);
include/linux/netfs.h +1 -0
@@ -161,6 +161,7 @@ struct netfs_io_subrequest {refcount_t ref;short error;/* 0 or error that occurred */ unsigned short debug_index;/* Index in list (for debugging output) */ +unsigned int max_nr_segs;/* 0 or max number of segments in an iterator */ enum netfs_io_source source;/* Where to read from/write to */ unsigned long flags;#define NETFS_SREQ_COPY_TO_CACHE 0/* Set if should copy the data to the cache */
include/trace/events/netfs.h +1 -0
@@ -44,6 +44,7 @@#define netfs_sreq_traces \ EM(netfs_sreq_trace_download_instead, "RDOWN") \ EM(netfs_sreq_trace_free, "FREE ") \ + EM(netfs_sreq_trace_limited, "LIMIT") \ EM(netfs_sreq_trace_prepare, "PREP ") \ EM(netfs_sreq_trace_resubmit_short, "SHORT") \ EM(netfs_sreq_trace_submit, "SUBMT") \
David Howells
maintainerPATCH v5 19/40 netfs: Extend the netfs_io_*request structs to handle writes
In reply to David HowellsModify the netfs_io_request struct to act as a point around which writes can be coordinated. It represents and pins a range of pages that need writing and a list of regions of dirty data in that range of pages.
If RMW is required, the original data can be downloaded into the bounce buffer, decrypted if necessary, the modifications made, then the modified data can be reencrypted/recompressed and sent back to the server.
--- fs/netfs/internal.h | 6 ++++++ fs/netfs/main.c | 3 ++- fs/netfs/objects.c | 6 ++++++ fs/netfs/stats.c | 16 +++++++++++++--- include/linux/netfs.h | 15 ++++++++++++++- include/trace/events/netfs.h | 8 ++++++-- 6 files changed, 47 insertions(+), 7 deletions(-)
fs/netfs/internal.h +6 -0
@@ -110,6 +110,12 @@ extern atomic_t netfs_n_rh_write_begin;extern atomic_t netfs_n_rh_write_done;extern atomic_t netfs_n_rh_write_failed;extern atomic_t netfs_n_rh_write_zskip; +extern atomic_t netfs_n_wh_upload; +extern atomic_t netfs_n_wh_upload_done; +extern atomic_t netfs_n_wh_upload_failed; +extern atomic_t netfs_n_wh_write; +extern atomic_t netfs_n_wh_write_done; +extern atomic_t netfs_n_wh_write_failed;int netfs_stats_show (struct seq_file *m,void *v);
fs/netfs/main.c +2 -1
@@ -25,10 +25,11 @@ MODULE_PARM_DESC(netfs_debug, "Netfs support debugging mask");LIST_HEAD (netfs_io_requests);DEFINE_SPINLOCK (netfs_proc_lock); -static const char *netfs_origins[] = { +static const char *netfs_origins[nr__netfs_io_origin] = { [NETFS_READAHEAD ] ="RA" , [NETFS_READPAGE ] ="RP" , [NETFS_READ_FOR_WRITE ] ="RW" , + [NETFS_WRITEBACK ] ="WB" , };/*
fs/netfs/objects.c +6 -0
@@ -20,6 +20,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping,struct inode *inode = file ?file_inode (file) : mapping->host;struct netfs_inode *ctx =netfs_inode (inode);struct netfs_io_request *rreq; +bool cached =netfs_is_cache_enabled (ctx);int ret; rreq = kzalloc(ctx->ops->io_request_size ?: sizeof(struct netfs_io_request),
@@ -37,7 +38,10 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, rreq->debug_id =atomic_inc_return (&debug_ids);INIT_LIST_HEAD (&rreq->subrequests);refcount_set (&rreq->ref,1 ); +__set_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags); +if (cached) +__set_bit (NETFS_RREQ_WRITE_TO_CACHE , &rreq->flags);if (rreq->netfs_ops->init_request) { ret = rreq->netfs_ops->init_request (rreq, file);if (ret <0 ) {
@@ -46,6 +50,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, } } +trace_netfs_rreq_ref (rreq->debug_id,1 , netfs_rreq_trace_new);netfs_proc_add_rreq (rreq);netfs_stat (&netfs_n_rh_rreq);return rreq;
@@ -129,6 +134,7 @@ struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreqsizeof (struct netfs_io_subrequest ), GFP_KERNEL);if (subreq) { +INIT_WORK (&subreq->work,NULL );INIT_LIST_HEAD (&subreq->rreq_link);refcount_set (&subreq->ref,2 ); subreq->rreq = rreq;
fs/netfs/stats.c +13 -3
@@ -27,6 +27,12 @@ atomic_t netfs_n_rh_write_begin;atomic_t netfs_n_rh_write_done;atomic_t netfs_n_rh_write_failed;atomic_t netfs_n_rh_write_zskip; +atomic_t netfs_n_wh_upload; +atomic_t netfs_n_wh_upload_done; +atomic_t netfs_n_wh_upload_failed; +atomic_t netfs_n_wh_write; +atomic_t netfs_n_wh_write_done; +atomic_t netfs_n_wh_write_failed;int netfs_stats_show (struct seq_file *m,void *v) {
@@ -50,10 +56,14 @@ int netfs_stats_show(struct seq_file *m, void *v)atomic_read (&netfs_n_rh_read),atomic_read (&netfs_n_rh_read_done), atomic_read(&netfs_n_rh_read_failed)); +seq_printf (m,"Netfs : UL=%u us=%u uf=%u\n" , +atomic_read (&netfs_n_wh_upload), +atomic_read (&netfs_n_wh_upload_done), +atomic_read (&netfs_n_wh_upload_failed));seq_printf (m,"Netfs : WR=%u ws=%u wf=%u\n" , -atomic_read (&netfs_n_rh_write), -atomic_read (&netfs_n_rh_write_done), -atomic_read (&netfs_n_rh_write_failed)); +atomic_read (&netfs_n_wh_write), +atomic_read (&netfs_n_wh_write_done), +atomic_read (&netfs_n_wh_write_failed));return fscache_stats_show (m); }EXPORT_SYMBOL (netfs_stats_show);
include/linux/netfs.h +14 -1
@@ -118,6 +118,9 @@ enum netfs_io_source {NETFS_DOWNLOAD_FROM_SERVER ,NETFS_READ_FROM_CACHE ,NETFS_INVALID_READ , +NETFS_UPLOAD_TO_SERVER , +NETFS_WRITE_TO_CACHE , +NETFS_INVALID_WRITE , } __mode(byte); typedef void (*netfs_io_terminated_t)(void *priv, ssize_t transferred_or_error,
@@ -149,9 +152,14 @@ struct netfs_cache_resources { };/* -* Descriptor for a single component subrequest. +* Descriptor for a single component subrequest. Each operation represents an +* individual read/write from/to a server, a cache, a journal, etc.. +* +* The buffer iterator is persistent for the life of the subrequest struct and +* the pages it points to can be relied on to exist for the duration. */ struct netfs_io_subrequest { +struct work_struct work;struct netfs_io_request *rreq;/* Supervising I/O request */ struct list_head rreq_link;/* Link in rreq->subrequests */ struct iov_iter io_iter;/* Iterator for this subrequest */
@@ -176,6 +184,8 @@ enum netfs_io_origin {NETFS_READAHEAD ,/* This read was triggered by readahead */ NETFS_READPAGE ,/* This read is a synchronous read */ NETFS_READ_FOR_WRITE ,/* This read is to prepare a write */ +NETFS_WRITEBACK ,/* This write was triggered by writepages */ + nr__netfs_io_origin }__mode (byte);/*
@@ -199,6 +209,7 @@ struct netfs_io_request {__counted_by (direct_bv_count);unsigned int direct_bv_count;/* Number of elements in direct_bv[] */ unsigned int debug_id; +unsigned int subreq_counter;/* Next subreq->debug_index */ atomic_t nr_outstanding;/* Number of ops in progress */ atomic_t nr_copy_ops;/* Number of copy-to-cache ops in progress */ size_t submitted;/* Amount submitted for I/O so far */
@@ -217,6 +228,8 @@ struct netfs_io_request {#define NETFS_RREQ_DONT_UNLOCK_FOLIOS 3/* Don't unlock the folios on completion */ #define NETFS_RREQ_FAILED 4/* The request failed */ #define NETFS_RREQ_IN_PROGRESS 5/* Unlocked when the request completes */ +#define NETFS_RREQ_WRITE_TO_CACHE 7/* Need to write to the cache */ +#define NETFS_RREQ_UPLOAD_TO_SERVER 8/* Need to write to the server */ const struct netfs_request_ops *netfs_ops; };
include/trace/events/netfs.h +6 -2
@@ -24,7 +24,8 @@#define netfs_rreq_origins \ EM(NETFS_READAHEAD, "RA") \ EM(NETFS_READPAGE, "RP") \ - E_(NETFS_READ_FOR_WRITE, "RW") + EM(NETFS_READ_FOR_WRITE, "RW") \ + E_(NETFS_WRITEBACK, "WB")#define netfs_rreq_traces \ EM(netfs_rreq_trace_assess, "ASSESS ") \
@@ -39,7 +40,10 @@ EM(NETFS_FILL_WITH_ZEROES, "ZERO") \ EM(NETFS_DOWNLOAD_FROM_SERVER, "DOWN") \ EM(NETFS_READ_FROM_CACHE, "READ") \ - E_(NETFS_INVALID_READ, "INVL") \ + EM(NETFS_INVALID_READ, "INVL") \ + EM(NETFS_UPLOAD_TO_SERVER, "UPLD") \ + EM(NETFS_WRITE_TO_CACHE, "WRIT") \ + E_(NETFS_INVALID_WRITE, "INVL")#define netfs_sreq_traces \ EM(netfs_sreq_trace_download_instead, "RDOWN") \
David Howells
maintainerPATCH v5 20/40 netfs: Add a hook to allow tell the netfs to update its i_size
In reply to David HowellsAdd a hook for netfslib's write helpers to call to tell the network filesystem that it should update its i_size.
--- include/linux/netfs.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/netfs.h +4 -0
@@ -243,6 +243,7 @@ struct netfs_request_ops {void (*free_request)(struct netfs_io_request *rreq);void (*free_subrequest)(struct netfs_io_subrequest *rreq); +/* Read request handling */ void (*expand_readahead)(struct netfs_io_request *rreq);bool (*clamp_length)(struct netfs_io_subrequest *subreq);void (*issue_read)(struct netfs_io_subrequest *subreq);
@@ -250,6 +251,9 @@ struct netfs_request_ops {int (*check_write_begin)(struct file *file,loff_t pos,unsigned len,struct folio **foliop,void **_fsdata);void (*done)(struct netfs_io_request *rreq); + +/* Modification handling */ +void (*update_i_size)(struct inode *inode,loff_t i_size); };/*
David Howells
maintainerPATCH v5 21/40 netfs: Make netfs_put_request() handle a NULL pointer
In reply to David HowellsMake netfs_put_request() just return if given a NULL request pointer.
--- fs/netfs/objects.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
fs/netfs/objects.c +13 -10
@@ -106,19 +106,22 @@ static void netfs_free_request(struct work_struct *work)void netfs_put_request (struct netfs_io_request *rreq,bool was_async,enum netfs_rreq_ref_trace what) { -unsigned int debug_id = rreq->debug_id; +unsigned int debug_id;bool dead;int r; - dead =__refcount_dec_and_test (&rreq->ref, &r); -trace_netfs_rreq_ref (debug_id, r -1 , what); -if (dead) { -if (was_async) { - rreq->work.func = netfs_free_request; -if (!queue_work (system_unbound_wq, &rreq->work)) -BUG (); - }else { -netfs_free_request (&rreq->work); +if (rreq) { + debug_id = rreq->debug_id; + dead =__refcount_dec_and_test (&rreq->ref, &r); +trace_netfs_rreq_ref (debug_id, r -1 , what); +if (dead) { +if (was_async) { + rreq->work.func = netfs_free_request; +if (!queue_work (system_unbound_wq, &rreq->work)) +BUG (); + }else { +netfs_free_request (&rreq->work); + } } } }
David Howells
maintainerPATCH v5 22/40 netfs: Make the refcounting of netfs_begin_read() easier to use
In reply to David HowellsMake the refcounting of netfs_begin_read() easier to use by not eating the caller's ref on the netfs_io_request it's given. This makes it easier to use when we need to look in the request struct after.
--- fs/netfs/buffered_read.c | 6 +++++- fs/netfs/io.c | 28 +++++++++++++--------------- include/trace/events/netfs.h | 9 +++++---- 3 files changed, 23 insertions(+), 20 deletions(-)
fs/netfs/buffered_read.c +5 -1
@@ -210,6 +210,7 @@ void netfs_readahead(struct readahead_control *ractl) ;netfs_begin_read (rreq, false); +netfs_put_request (rreq, false, netfs_rreq_trace_put_return);return ; cleanup_free:
@@ -260,7 +261,9 @@ int netfs_read_folio(struct file *file, struct folio *folio)iov_iter_xarray (&rreq->iter,ITER_DEST , &mapping->i_pages, rreq->start, rreq->len); -return netfs_begin_read (rreq, true); + ret =netfs_begin_read (rreq, true); +netfs_put_request (rreq, false, netfs_rreq_trace_put_return); +return ret; discard:netfs_put_request (rreq, false, netfs_rreq_trace_put_discard);
@@ -429,6 +432,7 @@ int netfs_write_begin(struct netfs_inode *ctx, ret =netfs_begin_read (rreq, true);if (ret <0 ) goto error; +netfs_put_request (rreq, false, netfs_rreq_trace_put_return); have_folio: ret =folio_wait_fscache_killable (folio);
fs/netfs/io.c +13 -15
@@ -362,6 +362,7 @@ static void netfs_rreq_assess(struct netfs_io_request *rreq, bool was_async)netfs_rreq_unlock_folios (rreq); +trace_netfs_rreq (rreq, netfs_rreq_trace_wake_ip);clear_bit_unlock (NETFS_RREQ_IN_PROGRESS , &rreq->flags);wake_up_bit (&rreq->flags,NETFS_RREQ_IN_PROGRESS );
@@ -657,7 +658,6 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync)if (rreq->len ==0 ) {pr_err ("Zero-sized read [R=%x]\n" , rreq->debug_id); -netfs_put_request (rreq, false, netfs_rreq_trace_put_zero_len);return -EIO ; }
@@ -665,12 +665,10 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync)INIT_WORK (&rreq->work, netfs_rreq_work); -if (sync) -netfs_get_request (rreq, netfs_rreq_trace_get_hold); -/* Chop the read into slices according to what the cache and the netfs * want and submit each one. */ +netfs_get_request (rreq, netfs_rreq_trace_get_for_outstanding);atomic_set (&rreq->nr_outstanding,1 ); io_iter = rreq->io_iter; do {
@@ -680,25 +678,25 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync) }while (rreq->submitted < rreq->len);if (sync) { -/* Keep nr_outstanding incremented so that the ref always belongs to -* us, and the service code isn't punted off to a random thread pool to -* process. +/* Keep nr_outstanding incremented so that the ref always +* belongs to us, and the service code isn't punted off to a +* random thread pool to process. Note that this might start +* further work, such as writing to the cache. */ -for (;;) { -wait_var_event (&rreq->nr_outstanding, -atomic_read (&rreq->nr_outstanding) ==1 ); +wait_var_event (&rreq->nr_outstanding, +atomic_read (&rreq->nr_outstanding) ==1 ); +if (atomic_dec_and_test (&rreq->nr_outstanding))netfs_rreq_assess (rreq, false); -if (!test_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags)) -break ; -cond_resched (); - } + +trace_netfs_rreq (rreq, netfs_rreq_trace_wait_ip); +wait_on_bit (&rreq->flags,NETFS_RREQ_IN_PROGRESS , +TASK_UNINTERRUPTIBLE ); ret = rreq->error;if (ret ==0 && rreq->submitted < rreq->len) {trace_netfs_failure (rreq,NULL , ret, netfs_fail_short_read); ret = -EIO ; } -netfs_put_request (rreq, false, netfs_rreq_trace_put_hold); }else {/* If we decrement nr_outstanding to 0, the ref belongs to us. */ if (atomic_dec_and_test (&rreq->nr_outstanding))
include/trace/events/netfs.h +5 -4
@@ -34,7 +34,9 @@ EM(netfs_rreq_trace_free, "FREE ") \ EM(netfs_rreq_trace_resubmit, "RESUBMT") \ EM(netfs_rreq_trace_unlock, "UNLOCK ") \ - E_(netfs_rreq_trace_unmark, "UNMARK ") + EM(netfs_rreq_trace_unmark, "UNMARK ") \ + EM(netfs_rreq_trace_wait_ip, "WAIT-IP") \ + E_(netfs_rreq_trace_wake_ip, "WAKE-IP")#define netfs_sreq_sources \ EM(NETFS_FILL_WITH_ZEROES, "ZERO") \
@@ -65,14 +67,13 @@ E_(netfs_fail_prepare_write, "prep-write")#define netfs_rreq_ref_traces \ - EM(netfs_rreq_trace_get_hold, "GET HOLD ") \ + EM(netfs_rreq_trace_get_for_outstanding,"GET OUTSTND") \ EM(netfs_rreq_trace_get_subreq, "GET SUBREQ ") \ EM(netfs_rreq_trace_put_complete, "PUT COMPLT ") \ EM(netfs_rreq_trace_put_discard, "PUT DISCARD") \ EM(netfs_rreq_trace_put_failed, "PUT FAILED ") \ - EM(netfs_rreq_trace_put_hold, "PUT HOLD ") \ + EM(netfs_rreq_trace_put_return, "PUT RETURN ") \ EM(netfs_rreq_trace_put_subreq, "PUT SUBREQ ") \ - EM(netfs_rreq_trace_put_zero_len, "PUT ZEROLEN") \ E_(netfs_rreq_trace_new, "NEW ")#define netfs_sreq_ref_traces \
David Howells
maintainerPATCH v5 23/40 netfs: Prep to use folio->private for write grouping and streaming write
In reply to David HowellsPrepare to use folio->private to hold information write grouping and streaming write. These are implemented in the same commit as they both make use of folio->private and will be both checked at the same time in several places.
"Write grouping" involves ordering the writeback of groups of writes, such as is needed for ceph snaps. A group is represented by a filesystem-supplied object which must contain a netfs_group struct. This contains just a refcount and a pointer to a destructor.
"Streaming write" is the storage of data in folios that are marked dirty, but not uptodate, to avoid unnecessary reads of data. This is represented by a netfs_folio struct. This contains the offset and length of the modified region plus the otherwise displaced write grouping pointer.
The way folio->private is multiplexed is:
(1) If private is NULL then neither is in operation on a dirty folio.
(2) If private is set, with bit 0 clear, then this points to a group.
(3) If private is set, with bit 0 set, then this points to a netfs_folio struct (with bit 0 AND'ed out).
--- fs/netfs/internal.h | 28 ++++++++++++++++++++++++++ fs/netfs/misc.c | 46 +++++++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 41 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+)
fs/netfs/internal.h +28 -0
@@ -149,6 +149,34 @@ static inline bool netfs_is_cache_enabled(struct netfs_inode *ctx)#endif } +/* +* Get a ref on a netfs group attached to a dirty page (e.g. a ceph snap). +*/ +static inline struct netfs_group *netfs_get_group (struct netfs_group *netfs_group) +{ +if (netfs_group) +refcount_inc (&netfs_group->ref); +return netfs_group; +} + +/* +* Dispose of a netfs group attached to a dirty page (e.g. a ceph snap). +*/ +static inline void netfs_put_group (struct netfs_group *netfs_group) +{ +if (netfs_group &&refcount_dec_and_test (&netfs_group->ref)) + netfs_group->free (netfs_group); +} + +/* +* Dispose of a netfs group attached to a dirty page (e.g. a ceph snap). +*/ +static inline void netfs_put_group_many (struct netfs_group *netfs_group,int nr) +{ +if (netfs_group &&refcount_sub_and_test (nr, &netfs_group->ref)) + netfs_group->free (netfs_group); +} +/* * fscache-cache.c */
fs/netfs/misc.c +46 -0
55 lines not on this page · raw message
include/linux/netfs.h +41 -0
47 lines not on this page · raw message
David Howells
maintainerPATCH v5 24/40 netfs: Dispatch write requests to process a writeback slice
In reply to David HowellsDispatch one or more write reqeusts to process a writeback slice, where a slice is tailored more to logical block divisions within the file (such as crypto blocks, an object layout or cache granules) than the protocol RPC maximum capacity.
The dispatch doesn't happen until throttling allows, at which point the entire writeback slice is processed and queued. A slice may be written to multiple destinations (one or more servers and the local cache) and the writes to each destination might be split up along different lines.
The writeback slice holds the required folios pinned. An iov_iter is provided in netfs_write_request that describes the buffer to be used. This may be part of the pagecache, may have auxiliary padding pages attached or may be a bounce buffer resulting from crypto or compression. Consequently, the filesystem must not twiddle the folio markings directly.
The following API is available to the filesystem:
(1) The ->create_write_requests() method is called to ask the filesystem to create the requests it needs. This is passed the writeback slice to be processed.
(2) The filesystem should then call netfs_create_write_request() to create the requests it needs.
(3) Once a request is initialised, netfs_queue_write_request() can be called to dispatch it asynchronously, if not completed immediately.
(4) netfs_write_request_completed() should be called to note the completion of a request.
(5) netfs_get_write_request() and netfs_put_write_request() are provided to refcount a request. These take constants from the netfs_wreq_trace enum for logging into ftrace.
(6) The ->free_write_request is method is called to ask the filesystem to clean up a request.
--- fs/netfs/Makefile | 3 +- fs/netfs/internal.h | 6 + fs/netfs/output.c | 363 +++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 13 ++ include/trace/events/netfs.h | 50 ++++- 5 files changed, 432 insertions(+), 3 deletions(-) create mode 100644 fs/netfs/output.c
fs/netfs/Makefile +2 -1
@@ -7,7 +7,8 @@ netfs-y := \ locking.o \ main.o \ misc.o \ - objects.o + objects.o \ + output.o netfs-$(CONFIG_NETFS_STATS) += stats.o
fs/netfs/internal.h +6 -0
@@ -88,6 +88,12 @@ static inline void netfs_see_request(struct netfs_io_request *rreq,trace_netfs_rreq_ref (rreq->debug_id,refcount_read (&rreq->ref), what); } +/* +* output.c +*/ +int netfs_begin_write (struct netfs_io_request *wreq,bool may_wait, +enum netfs_write_trace what); +/* * stats.c */
fs/netfs/output.c new file +363 -0
363 lines not on this page · raw message
include/linux/netfs.h +13 -0
@@ -250,6 +250,7 @@ struct netfs_io_request {__counted_by (direct_bv_count);unsigned int direct_bv_count;/* Number of elements in direct_bv[] */ unsigned int debug_id; +unsigned int wsize;/* Maximum write size (0 for none) */ unsigned int subreq_counter;/* Next subreq->debug_index */ atomic_t nr_outstanding;/* Number of ops in progress */ atomic_t nr_copy_ops;/* Number of copy-to-cache ops in progress */
@@ -272,6 +273,7 @@ struct netfs_io_request {#define NETFS_RREQ_WRITE_TO_CACHE 7/* Need to write to the cache */ #define NETFS_RREQ_UPLOAD_TO_SERVER 8/* Need to write to the server */ const struct netfs_request_ops *netfs_ops; +void (*cleanup)(struct netfs_io_request *req); };/*
@@ -295,6 +297,11 @@ struct netfs_request_ops {/* Modification handling */ void (*update_i_size)(struct inode *inode,loff_t i_size); + +/* Write request handling */ +void (*create_write_requests)(struct netfs_io_request *wreq, +loff_t start,size_t len); +void (*invalidate_cache)(struct netfs_io_request *wreq); };/*
@@ -383,6 +390,12 @@ ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len, iov_iter_extraction_t extraction_flags);size_t netfs_limit_iter (const struct iov_iter *iter,size_t start_offset,size_t max_size,size_t max_segs); +struct netfs_io_subrequest *netfs_create_write_request ( +struct netfs_io_request *wreq,enum netfs_io_source dest, +loff_t start,size_t len,work_func_t worker); +void netfs_write_subrequest_terminated (void *_op,ssize_t transferred_or_error, +bool was_async); +void netfs_queue_write_request (struct netfs_io_subrequest *subreq);int netfs_start_io_read (struct inode *inode);void netfs_end_io_read (struct inode *inode);
include/trace/events/netfs.h +48 -2
105 lines not on this page · raw message
David Howells
maintainerPATCH v5 25/40 netfs: Provide func to copy data to pagecache for buffered write
In reply to David HowellsProvide a netfs write helper, netfs_perform_write() to buffer data to be written in the pagecache and mark the modified folios dirty.
It will perform "streaming writes" for folios that aren't currently resident, if possible, storing data in partially modified folios that are marked dirty, but not uptodate. It will also tag pages as belonging to fs-specific write groups if so directed by the filesystem.
This is derived from generic_perform_write(), but doesn't use ->write_begin() and ->write_end(), having that logic rolled in instead.
--- fs/netfs/Makefile | 1 + fs/netfs/buffered_read.c | 49 ++++++ fs/netfs/buffered_write.c | 330 +++++++++++++++++++++++++++++++++++ fs/netfs/internal.h | 2 + fs/netfs/io.c | 1 + include/linux/netfs.h | 5 + include/trace/events/netfs.h | 73 ++++++++ 7 files changed, 461 insertions(+) create mode 100644 fs/netfs/buffered_write.c
fs/netfs/Makefile +1 -0
@@ -2,6 +2,7 @@ netfs-y := \ buffered_read.o \ + buffered_write.o \ io.o \ iterator.o \ locking.o \
fs/netfs/buffered_read.c +49 -0
58 lines not on this page · raw message
fs/netfs/buffered_write.c new file +330 -0
330 lines not on this page · raw message
fs/netfs/internal.h +2 -0
@@ -23,6 +23,8 @@* buffered_read.c */ void netfs_rreq_unlock_folios (struct netfs_io_request *rreq); +int netfs_prefetch_for_write (struct file *file,struct folio *folio, +size_t offset,size_t len);/* * io.c
fs/netfs/io.c +1 -0
@@ -125,6 +125,7 @@ static void netfs_rreq_unmark_after_write(struct netfs_io_request *rreq,if (have_unlocked &&folio_index (folio) <= unlocked)continue ; unlocked =folio_index (folio); +trace_netfs_folio (folio, netfs_folio_trace_end_copy);folio_end_fscache (folio); have_unlocked = true; }
include/linux/netfs.h +5 -0
@@ -368,6 +368,11 @@ struct netfs_cache_ops { loff_t *_data_start, size_t *_data_len); }; +/* High-level write API */ +ssize_t netfs_perform_write (struct kiocb *iocb,struct iov_iter *iter, +struct netfs_group *netfs_group); + +/* Address operations API */ struct readahead_control ;void netfs_readahead (struct readahead_control *);int netfs_read_folio (struct file *,struct folio *);
include/trace/events/netfs.h +73 -0
103 lines not on this page · raw message
David Howells
maintainerPATCH v5 26/40 netfs: Make netfs_read_folio() handle streaming-write pages
In reply to David Howellsnetfs_read_folio() needs to handle partially-valid pages that are marked dirty, but not uptodate in the event that someone tries to read a page was used to cache data by a streaming write.
In such a case, make netfs_read_folio() set up a bvec iterator that points to the parts of the folio that need filling and to a sink page for the data that should be discarded and use that instead of i_pages as the iterator to be written to.
This requires netfs_rreq_unlock_folios() to convert the page into a normal dirty uptodate page, getting rid of the partial write record and bumping the group pointer over to folio->private.
--- fs/netfs/buffered_read.c | 61 ++++++++++++++++++++++++++++++++++-- include/trace/events/netfs.h | 2 ++ 2 files changed, 60 insertions(+), 3 deletions(-)
fs/netfs/buffered_read.c +58 -3
@@ -16,6 +16,7 @@void netfs_rreq_unlock_folios (struct netfs_io_request *rreq) {struct netfs_io_subrequest *subreq; +struct netfs_folio *finfo;struct folio *folio;pgoff_t start_page = rreq->start /PAGE_SIZE ;pgoff_t last_page = ((rreq->start + rreq->len) /PAGE_SIZE ) -1 ;
@@ -87,6 +88,15 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq)if (!pg_failed) {flush_dcache_folio (folio); + finfo =netfs_folio_info (folio); +if (finfo) { +trace_netfs_folio (folio, netfs_folio_trace_filled_gaps); +if (finfo->netfs_group) +folio_change_private (folio, finfo->netfs_group); +else +folio_detach_private (folio); +kfree (finfo); + }folio_mark_uptodate (folio); }
@@ -239,6 +249,7 @@ int netfs_read_folio(struct file *file, struct folio *folio)struct address_space *mapping =folio_file_mapping (folio);struct netfs_io_request *rreq;struct netfs_inode *ctx =netfs_inode (mapping->host); +struct folio *sink =NULL ;int ret;_enter ("%lx" ,folio_index (folio));
@@ -259,12 +270,56 @@ int netfs_read_folio(struct file *file, struct folio *folio)trace_netfs_read (rreq, rreq->start, rreq->len, netfs_read_trace_readpage);/* Set up the output buffer */ -iov_iter_xarray (&rreq->iter,ITER_DEST , &mapping->i_pages, - rreq->start, rreq->len); +if (folio_test_dirty (folio)) { +/* Handle someone trying to read from an unflushed streaming +* write. We fiddle the buffer so that a gap at the beginning +* and/or a gap at the end get copied to, but the middle is +* discarded. +*/ +struct netfs_folio *finfo =netfs_folio_info (folio); +struct bio_vec *bvec; +unsigned int from = finfo->dirty_offset; +unsigned int to = from + finfo->dirty_len; +unsigned int off =0 , i =0 ; +size_t flen =folio_size (folio); +size_t nr_bvec = flen /PAGE_SIZE +2 ; +size_t part; + + ret = -ENOMEM ; + bvec =kmalloc_array (nr_bvec,sizeof (*bvec),GFP_KERNEL ); +if (!bvec) + goto discard; + + sink =folio_alloc (GFP_KERNEL ,0 ); +if (!sink) + goto discard; + +trace_netfs_folio (folio, netfs_folio_trace_read_gaps); + + rreq->direct_bv = bvec; + rreq->direct_bv_count = nr_bvec; +if (from >0 ) { +bvec_set_folio (&bvec[i++], folio, from,0 ); + off = from; + } +while (off < to) { + part =min_t (size_t, to - off,PAGE_SIZE ); +bvec_set_folio (&bvec[i++], sink, part,0 ); + off += part; + } +if (to < flen) +bvec_set_folio (&bvec[i++], folio, flen - to, to); +iov_iter_bvec (&rreq->iter,ITER_DEST , bvec, i, rreq->len); + }else { +iov_iter_xarray (&rreq->iter,ITER_DEST , &mapping->i_pages, + rreq->start, rreq->len); + } ret =netfs_begin_read (rreq, true); +if (sink) +folio_put (sink);netfs_put_request (rreq, false, netfs_rreq_trace_put_return); -return ret; +return ret <0 ? ret :0 ; discard:netfs_put_request (rreq, false, netfs_rreq_trace_put_discard);
include/trace/events/netfs.h +2 -0
@@ -118,9 +118,11 @@ EM(netfs_folio_trace_clear_g, "clear-g") \ EM(netfs_folio_trace_copy_to_cache, "copy") \ EM(netfs_folio_trace_end_copy, "end-copy") \ + EM(netfs_folio_trace_filled_gaps, "filled-gaps") \ EM(netfs_folio_trace_kill, "kill") \ EM(netfs_folio_trace_mkwrite, "mkwrite") \ EM(netfs_folio_trace_mkwrite_plus, "mkwrite+") \ + EM(netfs_folio_trace_read_gaps, "read-gaps") \ EM(netfs_folio_trace_redirty, "redirty") \ EM(netfs_folio_trace_redirtied, "redirtied") \EM (netfs_folio_trace_store,"store" ) \
David Howells
maintainerPATCH v5 27/40 netfs: Allocate multipage folios in the writepath
In reply to David HowellsAllocate a multipage folio when copying data into the pagecache if possible if there's sufficient data to warrant it.
--- fs/netfs/buffered_write.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/netfs/buffered_write.c +7 -2
@@ -84,14 +84,19 @@ static enum netfs_how_to_modify netfs_how_to_modify(struct netfs_inode *ctx, }/* -* Grab a folio for writing and lock it. +* Grab a folio for writing and lock it. Attempt to allocate as large a folio +* as possible to hold as much of the remaining length as possible in one go. */ static struct folio *netfs_grab_folio_for_write (struct address_space *mapping,loff_t pos,size_t part) {pgoff_t index = pos /PAGE_SIZE ; +fgf_t fgp_flags =FGP_WRITEBEGIN ; -return __filemap_get_folio (mapping, index,FGP_WRITEBEGIN , +if (mapping_large_folio_support (mapping)) + fgp_flags |=fgf_set_order (pos %PAGE_SIZE + part); + +return __filemap_get_folio (mapping, index, fgp_flags,mapping_gfp_mask (mapping)); }
David Howells
maintainerPATCH v5 28/40 netfs: Implement unbuffered/DIO read support
In reply to David HowellsImplement support for unbuffered and DIO reads in the netfs library, utilising the existing read helper code to do block splitting and individual queuing. The code also handles extraction of the destination buffer from the supplied iterator, allowing async unbuffered reads to take place.
The read will be split up according to the rsize setting and, if supplied, the ->clamp_length() method. Note that the next subrequest will be issued as soon as issue_op returns, without waiting for previous ones to finish. The network filesystem needs to pause or handle queuing them if it doesn't want to fire them all at the server simultaneously.
Once all the subrequests have finished, the state will be assessed and the amount of data to be indicated as having being obtained will be determined. As the subrequests may finish in any order, if an intermediate subrequest is short, any further subrequests may be copied into the buffer and then abandoned.
In the future, this will also take care of doing an unbuffered read from encrypted content, with the decryption being done by the library.
---
Notes:
Changes
=======
ver #5)
- Drop bounce buffer handling.fs/netfs/Makefile | 1 + fs/netfs/direct_read.c | 125 +++++++++++++++++++++++++++++++++++ fs/netfs/internal.h | 1 + fs/netfs/io.c | 83 ++++++++++++++++++++--- fs/netfs/main.c | 1 + fs/netfs/objects.c | 5 +- fs/netfs/stats.c | 4 +- include/linux/netfs.h | 9 +++ include/trace/events/netfs.h | 7 +- mm/filemap.c | 1 + 10 files changed, 226 insertions(+), 11 deletions(-) create mode 100644 fs/netfs/direct_read.c
fs/netfs/Makefile +1 -0
@@ -3,6 +3,7 @@ netfs-y := \ buffered_read.o \ buffered_write.o \ + direct_read.o \ io.o \ iterator.o \ locking.o \
fs/netfs/direct_read.c new file +125 -0
125 lines not on this page · raw message
fs/netfs/internal.h +1 -0
@@ -100,6 +100,7 @@ int netfs_begin_write(struct netfs_io_request *wreq, bool may_wait,* stats.c */ #ifdef CONFIG_NETFS_STATS +extern atomic_t netfs_n_rh_dio_read;extern atomic_t netfs_n_rh_readahead;extern atomic_t netfs_n_rh_readpage;extern atomic_t netfs_n_rh_rreq;
fs/netfs/io.c +75 -8
146 lines not on this page · raw message
fs/netfs/main.c +1 -0
@@ -30,6 +30,7 @@ static const char *netfs_origins[nr__netfs_io_origin] = { [NETFS_READPAGE] = "RP", [NETFS_READ_FOR_WRITE] = "RW", [NETFS_WRITEBACK] = "WB", + [NETFS_DIO_READ] = "DR", };/*
fs/netfs/objects.c +4 -1
@@ -20,7 +20,8 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping,struct inode *inode = file ?file_inode (file) : mapping->host;struct netfs_inode *ctx =netfs_inode (inode);struct netfs_io_request *rreq; -bool cached =netfs_is_cache_enabled (ctx); +bool is_dio = (origin ==NETFS_DIO_READ ); +bool cached = is_dio &&netfs_is_cache_enabled (ctx);int ret; rreq = kzalloc(ctx->ops->io_request_size ?: sizeof(struct netfs_io_request),
@@ -42,6 +43,8 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping,__set_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags);if (cached)__set_bit (NETFS_RREQ_WRITE_TO_CACHE , &rreq->flags); +if (file && file->f_flags &O_NONBLOCK ) +__set_bit (NETFS_RREQ_NONBLOCK , &rreq->flags);if (rreq->netfs_ops->init_request) { ret = rreq->netfs_ops->init_request (rreq, file);if (ret <0 ) {
fs/netfs/stats.c +3 -1
@@ -9,6 +9,7 @@#include <linux/seq_file.h> #include "internal.h" +atomic_t netfs_n_rh_dio_read;atomic_t netfs_n_rh_readahead;atomic_t netfs_n_rh_readpage;atomic_t netfs_n_rh_rreq;
@@ -36,7 +37,8 @@ atomic_t netfs_n_wh_write_failed;int netfs_stats_show (struct seq_file *m,void *v) { - seq_printf(m, "Netfs : RA=%u RP=%u WB=%u WBZ=%u rr=%u sr=%u\n", + seq_printf(m, "Netfs : DR=%u RA=%u RP=%u WB=%u WBZ=%u rr=%u sr=%u\n", + atomic_read(&netfs_n_rh_dio_read), atomic_read(&netfs_n_rh_readahead), atomic_read(&netfs_n_rh_readpage), atomic_read(&netfs_n_rh_write_begin),
include/linux/netfs.h +9 -0
@@ -226,6 +226,7 @@ enum netfs_io_origin {NETFS_READPAGE ,/* This read is a synchronous read */ NETFS_READ_FOR_WRITE ,/* This read is to prepare a write */ NETFS_WRITEBACK ,/* This write was triggered by writepages */ +NETFS_DIO_READ ,/* This is a direct I/O read */ nr__netfs_io_origin }__mode (byte);
@@ -240,6 +241,7 @@ struct netfs_io_request { };struct inode *inode;/* The file being accessed */ struct address_space *mapping;/* The mapping being accessed */ +struct kiocb *iocb;/* AIO completion vector */ struct netfs_cache_resources cache_resources;struct list_head proc_link;/* Link in netfs_iorequests */ struct list_head subrequests;/* Contributory I/O operations */
@@ -250,12 +252,14 @@ struct netfs_io_request {__counted_by (direct_bv_count);unsigned int direct_bv_count;/* Number of elements in direct_bv[] */ unsigned int debug_id; +unsigned int rsize;/* Maximum read size (0 for none) */ unsigned int wsize;/* Maximum write size (0 for none) */ unsigned int subreq_counter;/* Next subreq->debug_index */ atomic_t nr_outstanding;/* Number of ops in progress */ atomic_t nr_copy_ops;/* Number of copy-to-cache ops in progress */ size_t submitted;/* Amount submitted for I/O so far */ size_t len;/* Length of the request */ +size_t transferred;/* Amount to be indicated as transferred */ short error;/* 0 or error that occurred */ enum netfs_io_origin origin;/* Origin of the request */ bool direct_bv_unpin;/* T if direct_bv[] must be unpinned */
@@ -272,6 +276,8 @@ struct netfs_io_request {#define NETFS_RREQ_IN_PROGRESS 5/* Unlocked when the request completes */ #define NETFS_RREQ_WRITE_TO_CACHE 7/* Need to write to the cache */ #define NETFS_RREQ_UPLOAD_TO_SERVER 8/* Need to write to the server */ +#define NETFS_RREQ_NONBLOCK 9/* Don't block if possible (O_NONBLOCK) */ +#define NETFS_RREQ_BLOCKED 10/* We blocked */ const struct netfs_request_ops *netfs_ops;void (*cleanup)(struct netfs_io_request *req); };
@@ -368,6 +374,9 @@ struct netfs_cache_ops { loff_t *_data_start, size_t *_data_len); }; +/* High-level read API. */ +ssize_t netfs_unbuffered_read_iter (struct kiocb *iocb,struct iov_iter *iter); +/* High-level write API */ ssize_t netfs_perform_write (struct kiocb *iocb,struct iov_iter *iter,struct netfs_group *netfs_group);
include/trace/events/netfs.h +6 -1
@@ -16,6 +16,7 @@* Define enums for tracing information. */ #define netfs_read_traces \ + EM(netfs_read_trace_dio_read, "DIO-READ ") \ EM(netfs_read_trace_expanded, "EXPANDED ") \ EM(netfs_read_trace_readahead, "READAHEAD") \ EM(netfs_read_trace_readpage, "READPAGE ") \
@@ -31,7 +32,8 @@ EM(NETFS_READAHEAD, "RA") \ EM(NETFS_READPAGE, "RP") \ EM(NETFS_READ_FOR_WRITE, "RW") \ - E_(NETFS_WRITEBACK, "WB") + EM(NETFS_WRITEBACK, "WB") \ + E_(NETFS_DIO_READ, "DR")#define netfs_rreq_traces \ EM(netfs_rreq_trace_assess, "ASSESS ") \
@@ -70,6 +72,8 @@#define netfs_failures \ EM(netfs_fail_check_write_begin, "check-write-begin") \ EM(netfs_fail_copy_to_cache, "copy-to-cache") \ + EM(netfs_fail_dio_read_short, "dio-read-short") \ + EM(netfs_fail_dio_read_zero, "dio-read-zero") \ EM(netfs_fail_read, "read") \ EM(netfs_fail_short_read, "short-read") \ EM(netfs_fail_prepare_write, "prep-write") \
@@ -81,6 +85,7 @@ EM(netfs_rreq_trace_put_complete, "PUT COMPLT ") \ EM(netfs_rreq_trace_put_discard, "PUT DISCARD") \ EM(netfs_rreq_trace_put_failed, "PUT FAILED ") \ + EM(netfs_rreq_trace_put_no_submit, "PUT NO-SUBM") \ EM(netfs_rreq_trace_put_return, "PUT RETURN ") \ EM(netfs_rreq_trace_put_subreq, "PUT SUBREQ ") \EM (netfs_rreq_trace_put_work,"PUT WORK " ) \
mm/filemap.c +1 -0
@@ -2678,6 +2678,7 @@ int kiocb_write_and_wait(struct kiocb *iocb, size_t count)return filemap_write_and_wait_range (mapping, pos, end); } +EXPORT_SYMBOL_GPL (kiocb_write_and_wait);int kiocb_invalidate_pages (struct kiocb *iocb,size_t count) {
David Howells
maintainerPATCH v5 29/40 netfs: Implement unbuffered/DIO write support
In reply to David HowellsImplement support for unbuffered writes and direct I/O writes. If the write is misaligned with respect to the fscrypt block size, then RMW cycles are performed if necessary. DIO writes are a special case of unbuffered writes with extra restriction imposed, such as block size alignment requirements.
Also provide a field that can tell the code to add some extra space onto the bounce buffer for use by the filesystem in the case of a content-encrypted file.
--- fs/afs/inode.c | 2 +- fs/netfs/Makefile | 1 + fs/netfs/direct_write.c | 166 +++++++++++++++++++++++++++++++++++ fs/netfs/internal.h | 6 ++ fs/netfs/io.c | 2 +- fs/netfs/main.c | 12 +-- fs/netfs/objects.c | 6 +- fs/netfs/output.c | 30 +++++++ include/linux/netfs.h | 4 + include/trace/events/netfs.h | 4 +- mm/filemap.c | 1 + 11 files changed, 224 insertions(+), 10 deletions(-) create mode 100644 fs/netfs/direct_write.c
fs/afs/inode.c +1 -1
@@ -250,7 +250,7 @@ static void afs_apply_status(struct afs_operation *op,* what's on the server. */ vnode->netfs.remote_i_size = status->size; -if (change_size) { +if (change_size || status->size >i_size_read (inode)) {afs_set_i_size (vnode, status->size);inode_set_ctime_to_ts (inode, t);inode_set_atime_to_ts (inode, t);
fs/netfs/Makefile +1 -0
@@ -4,6 +4,7 @@ netfs-y := \ buffered_read.o \ buffered_write.o \ direct_read.o \ + direct_write.o \ io.o \ iterator.o \ locking.o \
fs/netfs/direct_write.c new file +166 -0
166 lines not on this page · raw message
fs/netfs/internal.h +6 -0
@@ -26,6 +26,12 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq);int netfs_prefetch_for_write (struct file *file,struct folio *folio,size_t offset,size_t len); +/* +* direct_write.c +*/ +ssize_t netfs_unbuffered_write_iter_locked (struct kiocb *iocb,struct iov_iter *iter, +struct netfs_group *netfs_group); +/* * io.c */
fs/netfs/io.c +1 -1
@@ -645,7 +645,7 @@ static bool netfs_rreq_submit_slice(struct netfs_io_request *rreq, subreq->debug_index = (*_debug_index)++; subreq->start = rreq->start + rreq->submitted; - subreq->len = rreq->len - rreq->submitted; + subreq->len = io_iter->count;_debug ("slice %llx,%zx,%zx" , subreq->start, subreq->len, rreq->submitted);list_add_tail (&subreq->rreq_link, &rreq->subrequests);
fs/netfs/main.c +7 -5
@@ -26,11 +26,13 @@ LIST_HEAD(netfs_io_requests);DEFINE_SPINLOCK (netfs_proc_lock);static const char *netfs_origins[nr__netfs_io_origin] = { - [NETFS_READAHEAD ] ="RA" , - [NETFS_READPAGE ] ="RP" , - [NETFS_READ_FOR_WRITE ] ="RW" , - [NETFS_WRITEBACK ] ="WB" , - [NETFS_DIO_READ ] ="DR" , + [NETFS_READAHEAD ] ="RA" , + [NETFS_READPAGE ] ="RP" , + [NETFS_READ_FOR_WRITE ] ="RW" , + [NETFS_WRITEBACK ] ="WB" , + [NETFS_UNBUFFERED_WRITE ] ="UW" , + [NETFS_DIO_READ ] ="DR" , + [NETFS_DIO_WRITE ] ="DW" , };/*
fs/netfs/objects.c +4 -2
@@ -20,8 +20,10 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping,struct inode *inode = file ?file_inode (file) : mapping->host;struct netfs_inode *ctx =netfs_inode (inode);struct netfs_io_request *rreq; -bool is_dio = (origin ==NETFS_DIO_READ ); -bool cached = is_dio &&netfs_is_cache_enabled (ctx); +bool is_unbuffered = (origin ==NETFS_UNBUFFERED_WRITE || + origin ==NETFS_DIO_READ || + origin ==NETFS_DIO_WRITE ); +bool cached = !is_unbuffered &&netfs_is_cache_enabled (ctx);int ret; rreq = kzalloc(ctx->ops->io_request_size ?: sizeof(struct netfs_io_request),
fs/netfs/output.c +30 -0
@@ -74,11 +74,21 @@ static void netfs_write_terminated(struct netfs_io_request *wreq, bool was_async {struct netfs_io_subrequest *subreq;struct netfs_inode *ctx =netfs_inode (wreq->inode); +size_t transferred =0 ;_enter ("R=%x[]" , wreq->debug_id);trace_netfs_rreq (wreq, netfs_rreq_trace_write_done); +list_for_each_entry (subreq, &wreq->subrequests, rreq_link) { +if (subreq->error || subreq->transferred ==0 ) +break ; + transferred += subreq->transferred; +if (subreq->transferred < subreq->len) +break ; + } + wreq->transferred = transferred; +list_for_each_entry (subreq, &wreq->subrequests, rreq_link) {if (!subreq->error)continue ;
@@ -110,11 +120,28 @@ static void netfs_write_terminated(struct netfs_io_request *wreq, bool was_async wreq->cleanup (wreq); +if (wreq->origin ==NETFS_DIO_WRITE && + wreq->mapping->nrpages) { +pgoff_t first = wreq->start >>PAGE_SHIFT ; +pgoff_t last = (wreq->start + wreq->transferred -1 ) >>PAGE_SHIFT ; +invalidate_inode_pages2_range (wreq->mapping, first, last); + } + +if (wreq->origin ==NETFS_DIO_WRITE ) +inode_dio_end (wreq->inode); +_debug ("finished" );trace_netfs_rreq (wreq, netfs_rreq_trace_wake_ip);clear_bit_unlock (NETFS_RREQ_IN_PROGRESS , &wreq->flags);wake_up_bit (&wreq->flags,NETFS_RREQ_IN_PROGRESS ); +if (wreq->iocb) { + wreq->iocb->ki_pos += transferred; +if (wreq->iocb->ki_complete) + wreq->iocb->ki_complete ( + wreq->iocb, wreq->error ? wreq->error : transferred); + } +netfs_clear_subrequests (wreq, was_async);netfs_put_request (wreq, was_async, netfs_rreq_trace_put_complete); }
@@ -329,6 +356,9 @@ int netfs_begin_write(struct netfs_io_request *wreq, bool may_wait,return -EIO ; } +if (wreq->origin ==NETFS_DIO_WRITE ) +inode_dio_begin (wreq->inode); + wreq->io_iter = wreq->iter;/* ->outstanding > 0 carries a ref */
include/linux/netfs.h +4 -0
@@ -138,6 +138,7 @@ struct netfs_inode {loff_t remote_i_size;/* Size of the remote file */ unsigned long flags;#define NETFS_ICTX_ODIRECT 0/* The file has DIO in progress */ +#define NETFS_ICTX_UNBUFFERED 1/* I/O should not use the pagecache */ };/*
@@ -226,7 +227,9 @@ enum netfs_io_origin {NETFS_READPAGE ,/* This read is a synchronous read */ NETFS_READ_FOR_WRITE ,/* This read is to prepare a write */ NETFS_WRITEBACK ,/* This write was triggered by writepages */ +NETFS_UNBUFFERED_WRITE ,/* This is an unbuffered write */ NETFS_DIO_READ ,/* This is a direct I/O read */ +NETFS_DIO_WRITE ,/* This is a direct I/O write */ nr__netfs_io_origin }__mode (byte);
@@ -380,6 +383,7 @@ ssize_t netfs_unbuffered_read_iter(struct kiocb *iocb, struct iov_iter *iter);/* High-level write API */ ssize_t netfs_perform_write (struct kiocb *iocb,struct iov_iter *iter,struct netfs_group *netfs_group); +ssize_t netfs_unbuffered_write_iter (struct kiocb *iocb,struct iov_iter *from);/* Address operations API */ struct readahead_control ;
include/trace/events/netfs.h +3 -1
@@ -33,7 +33,9 @@ EM(NETFS_READPAGE, "RP") \ EM(NETFS_READ_FOR_WRITE, "RW") \ EM(NETFS_WRITEBACK, "WB") \ - E_(NETFS_DIO_READ, "DR") + EM(NETFS_UNBUFFERED_WRITE, "UW") \ + EM(NETFS_DIO_READ, "DR") \ + E_(NETFS_DIO_WRITE, "DW")#define netfs_rreq_traces \ EM(netfs_rreq_trace_assess, "ASSESS ") \
mm/filemap.c +1 -0
@@ -2706,6 +2706,7 @@ int kiocb_invalidate_pages(struct kiocb *iocb, size_t count)return invalidate_inode_pages2_range (mapping, pos >>PAGE_SHIFT , end >>PAGE_SHIFT ); } +EXPORT_SYMBOL_GPL (kiocb_invalidate_pages);/** * generic_file_read_iter - generic filesystem read routine
David Howells
maintainerPATCH v5 30/40 netfs: Implement buffered write API
In reply to David HowellsInstitute a netfs write helper, netfs_file_write_iter(), to be pointed at by the network filesystem ->write_iter() call. Make it handled buffered writes by calling the previously defined netfs_perform_write() to copy the source data into the pagecache.
--- fs/netfs/buffered_write.c | 83 +++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 3 ++ 2 files changed, 86 insertions(+)
fs/netfs/buffered_write.c +83 -0
@@ -333,3 +333,86 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, goto out; }EXPORT_SYMBOL (netfs_perform_write); + +/** +* netfs_buffered_write_iter_locked - write data to a file +* @iocb: IO state structure (file, offset, etc.) +* @from: iov_iter with data to write +* @netfs_group: Grouping for dirty pages (eg. ceph snaps). +* +* This function does all the work needed for actually writing data to a +* file. It does all basic checks, removes SUID from the file, updates +* modification times and calls proper subroutines depending on whether we +* do direct IO or a standard buffered write. +* +* The caller must hold appropriate locks around this function and have called +* generic_write_checks() already. The caller is also responsible for doing +* any necessary syncing afterwards. +* +* This function does *not* take care of syncing data in case of O_SYNC write. +* A caller has to handle it. This is mainly due to the fact that we want to +* avoid syncing under i_rwsem. +* +* Return: +* * number of bytes written, even for truncated writes +* * negative error code if no data has been written at all +*/ +ssize_t netfs_buffered_write_iter_locked (struct kiocb *iocb,struct iov_iter *from, +struct netfs_group *netfs_group) +{ +struct file *file = iocb->ki_filp; +ssize_t ret; + +trace_netfs_write_iter (iocb, from); + + ret =file_remove_privs (file); +if (ret) +return ret; + + ret =file_update_time (file); +if (ret) +return ret; + +return netfs_perform_write (iocb, from, netfs_group); +} +EXPORT_SYMBOL (netfs_buffered_write_iter_locked); + +/** +* netfs_file_write_iter - write data to a file +* @iocb: IO state structure +* @from: iov_iter with data to write +* +* Perform a write to a file, writing into the pagecache if possible and doing +* an unbuffered write instead if not. +* +* Return: +* * Negative error code if no data has been written at all of +* vfs_fsync_range() failed for a synchronous write +* * Number of bytes written, even for truncated writes +*/ +ssize_t netfs_file_write_iter (struct kiocb *iocb,struct iov_iter *from) +{ +struct file *file = iocb->ki_filp; +struct inode *inode = file->f_mapping->host; +struct netfs_inode *ictx =netfs_inode (inode); +ssize_t ret; + +_enter ("%llx,%zx,%llx" , iocb->ki_pos,iov_iter_count (from),i_size_read (inode)); + +if ((iocb->ki_flags &IOCB_DIRECT ) || +test_bit (NETFS_ICTX_UNBUFFERED , &ictx->flags)) +return netfs_unbuffered_write_iter (iocb, from); + + ret =netfs_start_io_write (inode); +if (ret <0 ) +return ret; + + ret =generic_write_checks (iocb, from); +if (ret >0 ) + ret =netfs_buffered_write_iter_locked (iocb, from,NULL ); +netfs_end_io_write (inode); +if (ret >0 ) + ret =generic_write_sync (iocb, ret); +return ret; +} +EXPORT_SYMBOL (netfs_file_write_iter);
include/linux/netfs.h +3 -0
@@ -383,7 +383,10 @@ ssize_t netfs_unbuffered_read_iter(struct kiocb *iocb, struct iov_iter *iter);/* High-level write API */ ssize_t netfs_perform_write (struct kiocb *iocb,struct iov_iter *iter,struct netfs_group *netfs_group); +ssize_t netfs_buffered_write_iter_locked (struct kiocb *iocb,struct iov_iter *from, +struct netfs_group *netfs_group);ssize_t netfs_unbuffered_write_iter (struct kiocb *iocb,struct iov_iter *from); +ssize_t netfs_file_write_iter (struct kiocb *iocb,struct iov_iter *from);/* Address operations API */ struct readahead_control ;
David Howells
maintainerPATCH v5 31/40 netfs: Allow buffered shared-writeable mmap through netfs_page_mkwrite()
In reply to David HowellsProvide an entry point to delegate a filesystem's ->page_mkwrite() to. This checks for conflicting writes, then attached any netfs-specific group marking (e.g. ceph snap) to the page to be considered dirty.
--- fs/netfs/buffered_write.c | 59 +++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 4 +++ 2 files changed, 63 insertions(+)
fs/netfs/buffered_write.c +59 -0
@@ -416,3 +416,62 @@ ssize_t netfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)return ret; }EXPORT_SYMBOL (netfs_file_write_iter); + +/* +* Notification that a previously read-only page is about to become writable. +* Note that the caller indicates a single page of a multipage folio. +*/ +vm_fault_t netfs_page_mkwrite (struct vm_fault *vmf,struct netfs_group *netfs_group) +{ +struct folio *folio =page_folio (vmf->page); +struct file *file = vmf->vma->vm_file; +struct inode *inode =file_inode (file); +vm_fault_t ret =VM_FAULT_RETRY ; +int err; + +_enter ("%lx" , folio->index); + +sb_start_pagefault (inode->i_sb); + +if (folio_wait_writeback_killable (folio)) + goto out; + +if (folio_lock_killable (folio) <0 ) + goto out; + +/* Can we see a streaming write here? */ +if (WARN_ON (!folio_test_uptodate (folio))) { + ret =VM_FAULT_SIGBUS |VM_FAULT_LOCKED ; + goto out; + } + +if (netfs_folio_group (folio) != netfs_group) { +folio_unlock (folio); + err =filemap_fdatawait_range (inode->i_mapping, +folio_pos (folio), +folio_pos (folio) +folio_size (folio)); +switch (err) { +case 0 : + ret =VM_FAULT_RETRY ; + goto out; +case -ENOMEM : + ret =VM_FAULT_OOM ; + goto out; +default : + ret =VM_FAULT_SIGBUS ; + goto out; + } + } + +if (folio_test_dirty (folio)) +trace_netfs_folio (folio, netfs_folio_trace_mkwrite_plus); +else +trace_netfs_folio (folio, netfs_folio_trace_mkwrite); +netfs_set_group (folio, netfs_group); +file_update_time (file); + ret =VM_FAULT_LOCKED ; +out: +sb_end_pagefault (inode->i_sb); +return ret; +} +EXPORT_SYMBOL (netfs_page_mkwrite);
include/linux/netfs.h +4 -0
@@ -401,6 +401,10 @@ void netfs_clear_inode_writeback(struct inode *inode, const void *aux);void netfs_invalidate_folio (struct folio *folio,size_t offset,size_t length);bool netfs_release_folio (struct folio *folio,gfp_t gfp); +/* VMA operations API. */ +vm_fault_t netfs_page_mkwrite (struct vm_fault *vmf,struct netfs_group *netfs_group); + +/* (Sub)request management API. */ void netfs_subreq_terminated (struct netfs_io_subrequest *,ssize_t ,bool );void netfs_get_subrequest (struct netfs_io_subrequest *subreq,enum netfs_sreq_ref_trace what);
David Howells
maintainerPATCH v5 32/40 netfs: Provide netfs_file_read_iter()
In reply to David HowellsProvide a top-level-ish function that can be pointed to directly by ->read_iter file op.
--- fs/netfs/buffered_read.c | 73 ++++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 2 ++ 2 files changed, 75 insertions(+)
fs/netfs/buffered_read.c +73 -0
@@ -558,3 +558,76 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio,_leave (" = %d" , ret);return ret; } + +/** +* netfs_buffered_read_iter - Filesystem buffered I/O read routine +* @iocb: kernel I/O control block +* @iter: destination for the data read +* +* This is the ->read_iter() routine for all filesystems that can use the page +* cache directly. +* +* The IOCB_NOWAIT flag in iocb->ki_flags indicates that -EAGAIN shall be +* returned when no data can be read without waiting for I/O requests to +* complete; it doesn't prevent readahead. +* +* The IOCB_NOIO flag in iocb->ki_flags indicates that no new I/O requests +* shall be made for the read or for readahead. When no data can be read, +* -EAGAIN shall be returned. When readahead would be triggered, a partial, +* possibly empty read shall be returned. +* +* Return: +* * number of bytes copied, even for partial reads +* * negative error code (or 0 if IOCB_NOIO) if nothing was read +*/ +ssize_t netfs_buffered_read_iter (struct kiocb *iocb,struct iov_iter *iter) +{ +struct inode *inode =file_inode (iocb->ki_filp); +struct netfs_inode *ictx =netfs_inode (inode); +ssize_t ret; + +if (WARN_ON_ONCE ((iocb->ki_flags &IOCB_DIRECT ) || +test_bit (NETFS_ICTX_UNBUFFERED , &ictx->flags))) +return -EINVAL ; + + ret =netfs_start_io_read (inode); +if (ret ==0 ) { + ret =filemap_read (iocb, iter,0 ); +netfs_end_io_read (inode); + } +return ret; +} +EXPORT_SYMBOL (netfs_buffered_read_iter); + +/** +* netfs_file_read_iter - Generic filesystem read routine +* @iocb: kernel I/O control block +* @iter: destination for the data read +* +* This is the ->read_iter() routine for all filesystems that can use the page +* cache directly. +* +* The IOCB_NOWAIT flag in iocb->ki_flags indicates that -EAGAIN shall be +* returned when no data can be read without waiting for I/O requests to +* complete; it doesn't prevent readahead. +* +* The IOCB_NOIO flag in iocb->ki_flags indicates that no new I/O requests +* shall be made for the read or for readahead. When no data can be read, +* -EAGAIN shall be returned. When readahead would be triggered, a partial, +* possibly empty read shall be returned. +* +* Return: +* * number of bytes copied, even for partial reads +* * negative error code (or 0 if IOCB_NOIO) if nothing was read +*/ +ssize_t netfs_file_read_iter (struct kiocb *iocb,struct iov_iter *iter) +{ +struct netfs_inode *ictx =netfs_inode (iocb->ki_filp->f_mapping->host); + +if ((iocb->ki_flags &IOCB_DIRECT ) || +test_bit (NETFS_ICTX_UNBUFFERED , &ictx->flags)) +return netfs_unbuffered_read_iter (iocb, iter); + +return netfs_buffered_read_iter (iocb, iter); +} +EXPORT_SYMBOL (netfs_file_read_iter);
include/linux/netfs.h +2 -0
@@ -379,6 +379,8 @@ struct netfs_cache_ops {/* High-level read API. */ ssize_t netfs_unbuffered_read_iter (struct kiocb *iocb,struct iov_iter *iter); +ssize_t netfs_buffered_read_iter (struct kiocb *iocb,struct iov_iter *iter); +ssize_t netfs_file_read_iter (struct kiocb *iocb,struct iov_iter *iter);/* High-level write API */ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,
David Howells
maintainerPATCH v5 33/40 netfs, cachefiles: Pass upper bound length to allow expansion
In reply to David HowellsMake netfslib pass the maximum length to the ->prepare_write() op to tell the cache how much it can expand the length of a write to. This allows a write to the server at the end of a file to be limited to a few bytes whilst writing an entire block to the cache (something required by direct I/O).
--- fs/cachefiles/internal.h | 2 +- fs/cachefiles/io.c | 10 ++++++---- fs/cachefiles/ondemand.c | 2 +- fs/netfs/fscache_io.c | 2 +- fs/netfs/io.c | 2 +- fs/netfs/objects.c | 1 + fs/netfs/output.c | 25 ++++++++++--------------- fs/smb/client/fscache.c | 2 +- include/linux/netfs.h | 5 +++-- 9 files changed, 25 insertions(+), 26 deletions(-)
fs/cachefiles/internal.h +1 -1
@@ -233,7 +233,7 @@ extern bool cachefiles_begin_operation(struct netfs_cache_resources *cres, enum fscache_want_state want_state);extern int __cachefiles_prepare_write (struct cachefiles_object *object,struct file *file, -loff_t *_start,size_t *_len, +loff_t *_start,size_t *_len,size_t upper_len,bool no_space_allocated_yet); extern int __cachefiles_write(struct cachefiles_object *object, struct file *file,
fs/cachefiles/io.c +6 -4
@@ -518,7 +518,7 @@ cachefiles_prepare_ondemand_read(struct netfs_cache_resources *cres,*/ int __cachefiles_prepare_write (struct cachefiles_object *object,struct file *file, -loff_t *_start,size_t *_len, +loff_t *_start,size_t *_len,size_t upper_len,bool no_space_allocated_yet) {struct cachefiles_cache *cache = object->volume->cache;
@@ -530,6 +530,8 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, down = start -round_down (start,PAGE_SIZE ); *_start = start - down; *_len =round_up (down + len,PAGE_SIZE ); +if (down < start || *_len > upper_len) +return -ENOBUFS ;/* We need to work out whether there's sufficient disk space to perform * the write - but we can skip that check if we have space already
@@ -592,8 +594,8 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, }static int cachefiles_prepare_write (struct netfs_cache_resources *cres, -loff_t *_start,size_t *_len,loff_t i_size, -bool no_space_allocated_yet) +loff_t *_start,size_t *_len,size_t upper_len, +loff_t i_size,bool no_space_allocated_yet) {struct cachefiles_object *object =cachefiles_cres_object (cres);struct cachefiles_cache *cache = object->volume->cache;
@@ -609,7 +611,7 @@ static int cachefiles_prepare_write(struct netfs_cache_resources *cres,cachefiles_begin_secure (cache, &saved_cred); ret =__cachefiles_prepare_write (object,cachefiles_cres_file (cres), - _start, _len, + _start, _len, upper_len, no_space_allocated_yet);cachefiles_end_secure (cache, saved_cred);return ret;
fs/cachefiles/ondemand.c +1 -1
@@ -52,7 +52,7 @@ static ssize_t cachefiles_ondemand_fd_write_iter(struct kiocb *kiocb,return -ENOBUFS ;cachefiles_begin_secure (cache, &saved_cred); - ret =__cachefiles_prepare_write (object, file, &pos, &len, true); + ret =__cachefiles_prepare_write (object, file, &pos, &len, len, true);cachefiles_end_secure (cache, saved_cred);if (ret <0 )return ret;
fs/netfs/fscache_io.c +1 -1
@@ -237,7 +237,7 @@ void __fscache_write_to_cache(struct fscache_cookie *cookie, fscache_access_io_write) < 0) goto abandon_free; - ret = cres->ops->prepare_write (cres, &start, &len, i_size, false); + ret = cres->ops->prepare_write (cres, &start, &len, len, i_size, false);if (ret <0 ) goto abandon_end;
fs/netfs/io.c +1 -1
@@ -199,7 +199,7 @@ static void netfs_rreq_do_write_to_cache(struct netfs_io_request *rreq) } ret = cres->ops->prepare_write (cres, &subreq->start, &subreq->len, - rreq->i_size, true); + subreq->len, rreq->i_size, true);if (ret <0 ) {trace_netfs_failure (rreq, subreq, ret, netfs_fail_prepare_write);trace_netfs_sreq (subreq, netfs_sreq_trace_write_skip);
fs/netfs/objects.c +1 -0
@@ -33,6 +33,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, rreq->start = start; rreq->len = len; + rreq->upper_len = len; rreq->origin = origin; rreq->netfs_ops = ctx->ops; rreq->mapping = mapping;
fs/netfs/output.c +10 -15
@@ -280,7 +280,7 @@ EXPORT_SYMBOL(netfs_queue_write_request);*/ static void netfs_set_up_write_to_cache (struct netfs_io_request *wreq) { -struct netfs_cache_resources *cres; +struct netfs_cache_resources *cres = &wreq->cache_resources;struct netfs_io_subrequest *subreq;struct netfs_inode *ctx =netfs_inode (wreq->inode);struct fscache_cookie *cookie =netfs_i_cookie (ctx);
@@ -294,26 +294,21 @@ static void netfs_set_up_write_to_cache(struct netfs_io_request *wreq) }_debug ("write to cache" ); - subreq =netfs_create_write_request (wreq,NETFS_WRITE_TO_CACHE , start, len, - netfs_write_to_cache_op_worker); -if (!subreq) + ret =fscache_begin_write_operation (cres, cookie); +if (ret <0 )return ; - cres = &wreq->cache_resources; - ret =fscache_begin_read_operation (cres, cookie); -if (ret <0 ) { -netfs_write_subrequest_terminated (subreq, ret, false); + ret = cres->ops->prepare_write (cres, &start, &len, wreq->upper_len, +i_size_read (wreq->inode), true); +if (ret <0 )return ; - } - ret = cres->ops->prepare_write (cres, &start, &len,i_size_read (wreq->inode), - true); -if (ret <0 ) { -netfs_write_subrequest_terminated (subreq, ret, false); + subreq =netfs_create_write_request (wreq,NETFS_WRITE_TO_CACHE , start, len, + netfs_write_to_cache_op_worker); +if (!subreq)return ; - } -netfs_queue_write_request (subreq); +netfs_write_to_cache_op (subreq); }/*
fs/smb/client/fscache.c +1 -1
@@ -180,7 +180,7 @@ static int fscache_fallback_write_pages(struct inode *inode, loff_t start, size_if (ret <0 )return ret; - ret = cres.ops->prepare_write (&cres, &start, &len,i_size_read (inode), + ret = cres.ops->prepare_write (&cres, &start, &len, len,i_size_read (inode), no_space_allocated_yet);if (ret ==0 ) ret =fscache_write (&cres, start, &iter,NULL ,NULL );
include/linux/netfs.h +3 -2
@@ -262,6 +262,7 @@ struct netfs_io_request {atomic_t nr_copy_ops;/* Number of copy-to-cache ops in progress */ size_t submitted;/* Amount submitted for I/O so far */ size_t len;/* Length of the request */ +size_t upper_len;/* Length can be extended to here */ size_t transferred;/* Amount to be indicated as transferred */ short error;/* 0 or error that occurred */ enum netfs_io_origin origin;/* Origin of the request */
@@ -358,8 +359,8 @@ struct netfs_cache_ops {* actually do. */ int (*prepare_write)(struct netfs_cache_resources *cres, -loff_t *_start,size_t *_len,loff_t i_size, -bool no_space_allocated_yet); +loff_t *_start,size_t *_len,size_t upper_len, +loff_t i_size,bool no_space_allocated_yet);/* Prepare an on-demand read operation, shortening it to a cached/uncached * boundary as appropriate.
Re: [PATCH v5 33/40] netfs, cachefiles: Pass upper bound length to allow expansion
Hi David,
Quoted 50 lines · David Howells
Make netfslib pass the maximum length to the ->prepare_write() op to tell the cache how much it can expand the length of a write to. This allows a write to the server at the end of a file to be limited to a few bytes whilst writing an entire block to the cache (something required by direct I/O).
Signed-off-by David Howells <[email protected]>Reviewed-by Jeff Layton <[email protected]>--- fs/cachefiles/internal.h | 2 +- fs/cachefiles/io.c | 10 ++++++---- fs/cachefiles/ondemand.c | 2 +- fs/netfs/fscache_io.c | 2 +- fs/netfs/io.c | 2 +- fs/netfs/objects.c | 1 + fs/netfs/output.c | 25 ++++++++++--------------- fs/smb/client/fscache.c | 2 +- include/linux/netfs.h | 5 +++-- 9 files changed, 25 insertions(+), 26 deletions(-)fs/cachefiles/internal.h +1
-1@@ -233,7 +233,7 @@ extern bool cachefiles_begin_operation(struct netfs_cache_resources *cres, enum fscache_want_state want_state);extern int __cachefiles_prepare_write (struct cachefiles_object *object,struct file *file, -loff_t *_start,size_t *_len, +loff_t *_start,size_t *_len,size_t upper_len,bool no_space_allocated_yet); extern int __cachefiles_write(struct cachefiles_object *object, struct file *file,fs/cachefiles/io.c +1
-1@@ -518,7 +518,7 @@ cachefiles_prepare_ondemand_read(struct netfs_cache_resources *cres,*/ int __cachefiles_prepare_write (struct cachefiles_object *object,struct file *file, -loff_t *_start,size_t *_len, +loff_t *_start,size_t *_len,size_t upper_len,bool no_space_allocated_yet) {struct cachefiles_cache *cache = object->volume->cache;
fs/cachefiles/io.c int __cachefiles_prepare_write(struct cachefiles_object *object, · line 534
Quoted 5 lines
fs/cachefiles/io.c +2
-0@@ -530,6 +530,8 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, down = start -round_down (start,PAGE_SIZE ); *_start = start - down; *_len =round_up (down + len,PAGE_SIZE ); +if (down < start || *_len > upper_len) +return -ENOBUFS ;
Sorry for bothering. We just found some strange when testing today-next EROFS over fscache.
I'm not sure the meaning of
if (down < start
For example, if start is page-aligned, down == 0.
so as long as start > 0 and page-aligned, it will return -ENOBUFS. Does it an intended behavior?
Thanks,
Gao Xiang
David Howells
maintainerRe: [PATCH v5 33/40] netfs, cachefiles: Pass upper bound length to allow expansion
Quoted 9 lines · Gao Xiang
Review
Quoted 5 lines
down = start - round_down(start, PAGE_SIZE); *_start = start - down; *_len = round_up(down + len, PAGE_SIZE);(quoted diff) +2
-0+ if (down < start || *_len > upper_len) + return -ENOBUFS;Sorry for bothering. We just found some strange when testing today-next EROFS over fscache.
Quoted 7 lines
I'm not sure the meaning of
if (down < startFor example, if start is page-aligned, down == 0.
so as long as start > 0 and page-aligned, it will return
-ENOBUFS. Does it an intended behavior?
Yeah, I think that's wrong.
Does the attached help?
David
---
fs/cachefiles/io.c +17 -11
@@ -522,16 +522,22 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, bool no_space_allocated_yet) {struct cachefiles_cache *cache = object->volume->cache; -loff_t start = *_start, pos; -size_t len = *_len, down; +unsigned long long start = *_start, pos; +size_t len = *_len;int ret;/* Round to DIO size */ - down = start -round_down (start,PAGE_SIZE ); - *_start = start - down; - *_len =round_up (down + len,PAGE_SIZE ); -if (down < start || *_len > upper_len) + start =round_down (*_start,PAGE_SIZE ); +if (start != *_start) { +kleave (" = -ENOBUFS [down]" ); +return -ENOBUFS ; + } +if (*_len > upper_len) { +kleave (" = -ENOBUFS [up]" );return -ENOBUFS ; + } + + *_len =round_up (len,PAGE_SIZE );/* We need to work out whether there's sufficient disk space to perform * the write - but we can skip that check if we have space already
@@ -542,7 +548,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, pos =cachefiles_inject_read_error ();if (pos ==0 ) - pos =vfs_llseek (file, *_start,SEEK_DATA ); + pos =vfs_llseek (file, start,SEEK_DATA );if (pos <0 && pos >= (loff_t)-MAX_ERRNO ) {if (pos == -ENXIO ) goto check_space;/* Unallocated tail */
@@ -550,7 +556,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, cachefiles_trace_seek_error);return pos; } -if ((u64 )pos >= (u64)*_start + *_len) +if (pos >= start + *_len) goto check_space;/* Unallocated region */ /* We have a block that's at least partially filled - if we're low on
@@ -563,13 +569,13 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, pos =cachefiles_inject_read_error ();if (pos ==0 ) - pos =vfs_llseek (file, *_start,SEEK_HOLE ); + pos =vfs_llseek (file, start,SEEK_HOLE );if (pos <0 && pos >= (loff_t)-MAX_ERRNO ) {trace_cachefiles_io_error (object,file_inode (file), pos, cachefiles_trace_seek_error);return pos; } -if ((u64 )pos >= (u64)*_start + *_len) +if (pos >= start + *_len)return 0 ;/* Fully allocated */ /* Partially allocated, but insufficient space: cull. */
@@ -577,7 +583,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, ret =cachefiles_inject_remove_error ();if (ret ==0 ) ret =vfs_fallocate (file,FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE , - *_start, *_len); + start, *_len);if (ret <0 ) {trace_cachefiles_io_error (object,file_inode (file), ret, cachefiles_trace_fallocate_error);
Re: [PATCH v5 33/40] netfs, cachefiles: Pass upper bound length to allow expansion
Quoted 14 lines · David Howells
Quoted 12 lines · Gao Xiang
Review
Quoted 5 lines
down = start - round_down(start, PAGE_SIZE); *_start = start - down; *_len = round_up(down + len, PAGE_SIZE);(quoted diff) +2
-0+ if (down < start || *_len > upper_len) + return -ENOBUFS;Sorry for bothering. We just found some strange when testing today-next EROFS over fscache.
I'm not sure the meaning of
if (down < start
Quoted 8 lines
Quoted 4 lines
For example, if start is page-aligned, down == 0.
so as long as start > 0 and page-aligned, it will return
-ENOBUFS. Does it an intended behavior?Yeah, I think that's wrong.
Does the attached help?
(+cc more people for testing)
Will test and feedback later.
Thanks,
Gao Xiang
Quoted 81 lines
David
---fs/cachefiles/io.c +17
-11@@ -522,16 +522,22 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, bool no_space_allocated_yet) {struct cachefiles_cache *cache = object->volume->cache; -loff_t start = *_start, pos; -size_t len = *_len, down; +unsigned long long start = *_start, pos; +size_t len = *_len;int ret;/* Round to DIO size */ - down = start -round_down (start,PAGE_SIZE ); - *_start = start - down; - *_len =round_up (down + len,PAGE_SIZE ); -if (down < start || *_len > upper_len) + start =round_down (*_start,PAGE_SIZE ); +if (start != *_start) { +kleave (" = -ENOBUFS [down]" ); +return -ENOBUFS ; + } +if (*_len > upper_len) { +kleave (" = -ENOBUFS [up]" );return -ENOBUFS ; + } + + *_len =round_up (len,PAGE_SIZE );/* We need to work out whether there's sufficient disk space to perform * the write - but we can skip that check if we have space already @@ -542,7 +548,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, pos =cachefiles_inject_read_error ();if (pos ==0 ) - pos =vfs_llseek (file, *_start,SEEK_DATA ); + pos =vfs_llseek (file, start,SEEK_DATA );if (pos <0 && pos >= (loff_t)-MAX_ERRNO ) {if (pos == -ENXIO ) goto check_space;/* Unallocated tail */ @@ -550,7 +556,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, cachefiles_trace_seek_error);return pos; } -if ((u64 )pos >= (u64)*_start + *_len) +if (pos >= start + *_len) goto check_space;/* Unallocated region */ /* We have a block that's at least partially filled - if we're low on @@ -563,13 +569,13 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, pos =cachefiles_inject_read_error ();if (pos ==0 ) - pos =vfs_llseek (file, *_start,SEEK_HOLE ); + pos =vfs_llseek (file, start,SEEK_HOLE );if (pos <0 && pos >= (loff_t)-MAX_ERRNO ) {trace_cachefiles_io_error (object,file_inode (file), pos, cachefiles_trace_seek_error);return pos; } -if ((u64 )pos >= (u64)*_start + *_len) +if (pos >= start + *_len)return 0 ;/* Fully allocated */ /* Partially allocated, but insufficient space: cull. */ @@ -577,7 +583,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, ret =cachefiles_inject_remove_error ();if (ret ==0 ) ret =vfs_fallocate (file,FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE , - *_start, *_len); + start, *_len);if (ret <0 ) {trace_cachefiles_io_error (object,file_inode (file), ret, cachefiles_trace_fallocate_error);
Yiqun Leng
Tested-byRe: [PATCH v5 33/40] netfs, cachefiles: Pass upper bound length to allow expansion
Please get more test details in this link: https://tone.openanolis.cn/ws/nrh4nnio/test_result/106066
Thanks and Regards,
Yiqun Leng
Quoted 114 lines · Gao Xiang
Quoted 14 lines · David Howells
Quoted 12 lines · Gao Xiang
Quoted 5 lines
down = start -
round_down(start, PAGE_SIZE);*_start= start - down;
*_len=round_up(down + len, PAGE_SIZE); + if (down < start ||*_len>upper_len) + return-ENOBUFS;Sorry for bothering. We just found some strange when testing today-next EROFS over fscache.
I'm not sure the meaning of
if (down < startQuoted 8 lines
Quoted 4 lines
For example, if start is page-aligned, down == 0.
so as long as start > 0 and page-aligned, it will return -ENOBUFS. Does it an intended behavior?
Yeah, I think that's wrong.
Does the attached help?
(+cc more people for testing)
Will test and feedback later.
Thanks,
Gao XiangQuoted 80 lines
David
---fs/cachefiles/io.c +13
-7@@ -522,16 +522,22 @@ int __cachefiles_prepare_write(structcachefiles_object *object, bool no_space_allocated_yet) { struct cachefiles_cache *cache = object->volume->cache; - loff_t start = *_start, pos; - size_t len = *_len, down; + unsigned long long start = *_start, pos; + size_t len = *_len; int ret; /* Round to DIO size */ - down = start - round_down(start, PAGE_SIZE); - *_start = start - down; - *_len = round_up(down + len, PAGE_SIZE); - if (down < start || *_len > upper_len) + start = round_down(*_start, PAGE_SIZE); + if (start != *_start) { + kleave(" = -ENOBUFS [down]"); + return -ENOBUFS; + } + if (*_len > upper_len) { + kleave(" = -ENOBUFS [up]"); return -ENOBUFS; + } + + *_len = round_up(len, PAGE_SIZE); /* We need to work out whether there's sufficient disk space to perform* the write - but we can skip that check if we have space already @@ -542,7 +548,7 @@ int __cachefiles_prepare_write(structcachefiles_object *object, pos = cachefiles_inject_read_error(); if (pos == 0) - pos = vfs_llseek(file, *_start, SEEK_DATA); + pos = vfs_llseek(file, start, SEEK_DATA); if (pos < 0 && pos >= (loff_t)-MAX_ERRNO) { if (pos == -ENXIO)goto
check_space; /* Unallocated tail */fs/cachefiles/io.c +1
-1@@ -550,7 +556,7 @@ int __cachefiles_prepare_write(structcachefiles_object *object, cachefiles_trace_seek_error); return pos; } - if ((u64)pos >= (u64)*_start + *_len) + if (pos >= start + *_len)goto
check_space; /* Unallocated region */
/* We have a block that's at least partially filled - if we're low onfs/cachefiles/io.c +2
-2@@ -563,13 +569,13 @@ int __cachefiles_prepare_write(structcachefiles_object *object, pos = cachefiles_inject_read_error(); if (pos == 0) - pos = vfs_llseek(file, *_start, SEEK_HOLE); + pos = vfs_llseek(file, start, SEEK_HOLE); if (pos < 0 && pos >= (loff_t)-MAX_ERRNO) { trace_cachefiles_io_error(object, file_inode(file), pos, cachefiles_trace_seek_error); return pos; } - if ((u64)pos >= (u64)*_start + *_len) + if (pos >= start + *_len)return 0; /* Fully allocated */
/* Partially allocated, but insufficient space: cull. */fs/cachefiles/io.c +1
-1@@ -577,7 +583,7 @@ int __cachefiles_prepare_write(structcachefiles_object *object, ret = cachefiles_inject_remove_error(); if (ret == 0) ret = vfs_fallocate(file, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, - *_start, *_len); + start, *_len); if (ret < 0) { trace_cachefiles_io_error(object, file_inode(file), ret,
cachefiles_trace_fallocate_error);
Jia Zhu
Tested-byRe: Re: [PATCH v5 33/40] netfs, cachefiles: Pass upper bound length to allow expansion
In reply to David HowellsQuoted 19 lines · David Howells
Quoted 9 lines · Gao Xiang
Review
Quoted 5 lines
down = start - round_down(start, PAGE_SIZE); *_start = start - down; *_len = round_up(down + len, PAGE_SIZE);(quoted diff) +2
-0+ if (down < start || *_len > upper_len) + return -ENOBUFS;Sorry for bothering. We just found some strange when testing today-next EROFS over fscache.
Quoted 7 lines
I'm not sure the meaning of
if (down < startFor example, if start is page-aligned, down == 0.
so as long as start > 0 and page-aligned, it will return
-ENOBUFS. Does it an intended behavior?
Quoted 6 lines
Yeah, I think that's wrong.
Does the attached help?
David
---
Quoted 78 lines
fs/cachefiles/io.c +17
-11@@ -522,16 +522,22 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, bool no_space_allocated_yet) {struct cachefiles_cache *cache = object->volume->cache; -loff_t start = *_start, pos; -size_t len = *_len, down; +unsigned long long start = *_start, pos; +size_t len = *_len;int ret;/* Round to DIO size */ - down = start -round_down (start,PAGE_SIZE ); - *_start = start - down; - *_len =round_up (down + len,PAGE_SIZE ); -if (down < start || *_len > upper_len) + start =round_down (*_start,PAGE_SIZE ); +if (start != *_start) { +kleave (" = -ENOBUFS [down]" ); +return -ENOBUFS ; + } +if (*_len > upper_len) { +kleave (" = -ENOBUFS [up]" );return -ENOBUFS ; + } + + *_len =round_up (len,PAGE_SIZE );/* We need to work out whether there's sufficient disk space to perform * the write - but we can skip that check if we have space already @@ -542,7 +548,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, pos =cachefiles_inject_read_error ();if (pos ==0 ) - pos =vfs_llseek (file, *_start,SEEK_DATA ); + pos =vfs_llseek (file, start,SEEK_DATA );if (pos <0 && pos >= (loff_t)-MAX_ERRNO ) {if (pos == -ENXIO ) goto check_space;/* Unallocated tail */ @@ -550,7 +556,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, cachefiles_trace_seek_error);return pos; } -if ((u64 )pos >= (u64)*_start + *_len) +if (pos >= start + *_len) goto check_space;/* Unallocated region */ /* We have a block that's at least partially filled - if we're low on @@ -563,13 +569,13 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, pos =cachefiles_inject_read_error ();if (pos ==0 ) - pos =vfs_llseek (file, *_start,SEEK_HOLE ); + pos =vfs_llseek (file, start,SEEK_HOLE );if (pos <0 && pos >= (loff_t)-MAX_ERRNO ) {trace_cachefiles_io_error (object,file_inode (file), pos, cachefiles_trace_seek_error);return pos; } -if ((u64 )pos >= (u64)*_start + *_len) +if (pos >= start + *_len)return 0 ;/* Fully allocated */ /* Partially allocated, but insufficient space: cull. */ @@ -577,7 +583,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, ret =cachefiles_inject_remove_error ();if (ret ==0 ) ret =vfs_fallocate (file,FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE , - *_start, *_len); + start, *_len);if (ret <0 ) {trace_cachefiles_io_error (object,file_inode (file), ret, cachefiles_trace_fallocate_error);
David Howells
maintainerPATCH v5 34/40 netfs: Provide a writepages implementation
In reply to David HowellsProvide an implementation of writepages for network filesystems to delegate to.
---
Notes:
Changes
=======
ver #5)
- Use netfs_folio_info() rather than open-coding pointer mangling.
- Use folio_get_private() rather than using folio->private.
- Don't check the folio private pointer before taking the folio ref during writeback pagecache RCU xarray walk.
fs/netfs/buffered_write.c | 636 ++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 2 + 2 files changed, 638 insertions(+)
fs/netfs/buffered_write.c +636 -0
@@ -32,6 +32,18 @@ static void netfs_set_group(struct folio *folio, struct netfs_group *netfs_groupfolio_attach_private (folio,netfs_get_group (netfs_group)); } +#if IS_ENABLED (CONFIG_FSCACHE ) +static void netfs_folio_start_fscache (bool caching,struct folio *folio) +{ +if (caching) +folio_start_fscache (folio); +} +#else +static void netfs_folio_start_fscache (bool caching,struct folio *folio) +{ +} +#endif +/* * Decide how we should modify a folio. We might be attempting to do * write-streaming, in which case we don't want to a local RMW cycle if we can
@@ -475,3 +487,627 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_grreturn ret; }EXPORT_SYMBOL (netfs_page_mkwrite); + +/* +* Kill all the pages in the given range +*/ +static void netfs_kill_pages (struct address_space *mapping, +loff_t start,loff_t len) +{ +struct folio *folio; +pgoff_t index = start /PAGE_SIZE ; +pgoff_t last = (start + len -1 ) /PAGE_SIZE , next; + +_enter ("%llx-%llx" , start, start + len -1 ); + +do { +_debug ("kill %lx (to %lx)" , index, last); + + folio =filemap_get_folio (mapping, index); +if (IS_ERR (folio)) { + next = index +1 ; +continue ; + } + + next =folio_next_index (folio); + +trace_netfs_folio (folio, netfs_folio_trace_kill); +folio_clear_uptodate (folio); +if (folio_test_fscache (folio)) +folio_end_fscache (folio); +folio_end_writeback (folio); +folio_lock (folio); +generic_error_remove_page (mapping, &folio->page); +folio_unlock (folio); +folio_put (folio); + + }while (index = next, index <= last); + +_leave ("" ); +} + +/* +* Redirty all the pages in a given range. +*/ +static void netfs_redirty_pages (struct address_space *mapping, +loff_t start,loff_t len) +{ +struct folio *folio; +pgoff_t index = start /PAGE_SIZE ; +pgoff_t last = (start + len -1 ) /PAGE_SIZE , next; + +_enter ("%llx-%llx" , start, start + len -1 ); + +do { +_debug ("redirty %llx @%llx" , len, start); + + folio =filemap_get_folio (mapping, index); +if (IS_ERR (folio)) { + next = index +1 ; +continue ; + } + + next =folio_next_index (folio); +trace_netfs_folio (folio, netfs_folio_trace_redirty); +filemap_dirty_folio (mapping, folio); +if (folio_test_fscache (folio)) +folio_end_fscache (folio); +folio_end_writeback (folio); +folio_put (folio); + }while (index = next, index <= last); + +balance_dirty_pages_ratelimited (mapping); + +_leave ("" ); +} + +/* +* Completion of write to server +*/ +static void netfs_pages_written_back (struct netfs_io_request *wreq) +{ +struct address_space *mapping = wreq->mapping; +struct netfs_folio *finfo; +struct netfs_group *group =NULL ; +struct folio *folio; +pgoff_t last; +int gcount =0 ; + +XA_STATE (xas, &mapping->i_pages, wreq->start /PAGE_SIZE ); + +_enter ("%llx-%llx" , wreq->start, wreq->start + wreq->len); + +rcu_read_lock (); + + last = (wreq->start + wreq->len -1 ) /PAGE_SIZE ; +xas_for_each (&xas, folio, last) { +WARN (!folio_test_writeback (folio), +"bad %zx @%llx page %lx %lx\n" , + wreq->len, wreq->start,folio_index (folio), last); + +if ((finfo =netfs_folio_info (folio))) { +/* Streaming writes cannot be redirtied whilst under +* writeback, so discard the streaming record. +*/ +folio_detach_private (folio); + group = finfo->netfs_group; + gcount++; +trace_netfs_folio (folio, netfs_folio_trace_clear_s); +kfree (finfo); + }else if ((group =netfs_folio_group (folio))) { +/* Need to detach the group pointer if the page didn't +* get redirtied. If it has been redirtied, then it +* must be within the same group. +*/ +if (folio_test_dirty (folio)) { +trace_netfs_folio (folio, netfs_folio_trace_redirtied); + goto end_wb; + } +if (folio_trylock (folio)) { +if (!folio_test_dirty (folio)) { +folio_detach_private (folio); + gcount++; +trace_netfs_folio (folio, netfs_folio_trace_clear_g); + }else { +trace_netfs_folio (folio, netfs_folio_trace_redirtied); + } +folio_unlock (folio); + goto end_wb; + } + +xas_pause (&xas); +rcu_read_unlock (); +folio_lock (folio); +if (!folio_test_dirty (folio)) { +folio_detach_private (folio); + gcount++; +trace_netfs_folio (folio, netfs_folio_trace_clear_g); + }else { +trace_netfs_folio (folio, netfs_folio_trace_redirtied); + } +folio_unlock (folio); +rcu_read_lock (); + }else { +trace_netfs_folio (folio, netfs_folio_trace_clear); + } + end_wb: +if (folio_test_fscache (folio)) +folio_end_fscache (folio); +folio_end_writeback (folio); + } + +rcu_read_unlock (); +netfs_put_group_many (group, gcount); +_leave ("" ); +} + +/* +* Deal with the disposition of the folios that are under writeback to close +* out the operation. +*/ +static void netfs_cleanup_buffered_write (struct netfs_io_request *wreq) +{ +struct address_space *mapping = wreq->mapping; + +_enter ("" ); + +switch (wreq->error) { +case 0 : +netfs_pages_written_back (wreq); +break ; + +default : +pr_notice ("R=%08x Unexpected error %d\n" , wreq->debug_id, wreq->error); + fallthrough; +case -EACCES : +case -EPERM : +case -ENOKEY : +case -EKEYEXPIRED : +case -EKEYREJECTED : +case -EKEYREVOKED : +case -ENETRESET : +case -EDQUOT : +case -ENOSPC : +netfs_redirty_pages (mapping, wreq->start, wreq->len); +break ; + +case -EROFS : +case -EIO : +case -EREMOTEIO : +case -EFBIG : +case -ENOENT : +case -ENOMEDIUM : +case -ENXIO : +netfs_kill_pages (mapping, wreq->start, wreq->len); +break ; + } + +if (wreq->error) +mapping_set_error (mapping, wreq->error); +if (wreq->netfs_ops->done) + wreq->netfs_ops->done (wreq); +} + +/* +* Extend the region to be written back to include subsequent contiguously +* dirty pages if possible, but don't sleep while doing so. +* +* If this page holds new content, then we can include filler zeros in the +* writeback. +*/ +static void netfs_extend_writeback (struct address_space *mapping, +struct netfs_group *group, +struct xa_state *xas, +long *_count, +loff_t start, +loff_t max_len, +bool caching, +size_t *_len, +size_t *_top) +{ +struct netfs_folio *finfo; +struct folio_batch fbatch; +struct folio *folio; +unsigned int i; +pgoff_t index = (start + *_len) /PAGE_SIZE ; +size_t len; +void *priv; +bool stop = true; + +folio_batch_init (&fbatch); + +do { +/* Firstly, we gather up a batch of contiguous dirty pages +* under the RCU read lock - but we can't clear the dirty flags +* there if any of those pages are mapped. +*/ +rcu_read_lock (); + +xas_for_each (xas, folio,ULONG_MAX ) { + stop = true; +if (xas_retry (xas, folio)) +continue ; +if (xa_is_value (folio)) +break ; +if (folio_index (folio) != index) { +xas_reset (xas); +break ; + } + +if (!folio_try_get_rcu (folio)) { +xas_reset (xas); +continue ; + } + +/* Has the folio moved or been split? */ +if (unlikely (folio !=xas_reload (xas))) { +folio_put (folio); +xas_reset (xas); +break ; + } + +if (!folio_trylock (folio)) { +folio_put (folio); +xas_reset (xas); +break ; + } +if (!folio_test_dirty (folio) || +folio_test_writeback (folio) || +folio_test_fscache (folio)) { +folio_unlock (folio); +folio_put (folio); +xas_reset (xas); +break ; + } + + stop = false; + len =folio_size (folio); + priv =folio_get_private (folio); +if ((const struct netfs_group *)priv != group) { + stop = true; + finfo =netfs_folio_info (folio); +if (finfo->netfs_group != group || + finfo->dirty_offset >0 ) { +folio_unlock (folio); +folio_put (folio); +xas_reset (xas); +break ; + } + len = finfo->dirty_len; + } + + *_top +=folio_size (folio); + index +=folio_nr_pages (folio); + *_count -=folio_nr_pages (folio); + *_len += len; +if (*_len >= max_len || *_count <=0 ) + stop = true; + +if (!folio_batch_add (&fbatch, folio)) +break ; +if (stop) +break ; + } + +xas_pause (xas); +rcu_read_unlock (); + +/* Now, if we obtained any folios, we can shift them to being +* writable and mark them for caching. +*/ +if (!folio_batch_count (&fbatch)) +break ; + +for (i =0 ; i <folio_batch_count (&fbatch); i++) { + folio = fbatch.folios[i]; +trace_netfs_folio (folio, netfs_folio_trace_store_plus); + +if (!folio_clear_dirty_for_io (folio)) +BUG (); +folio_start_writeback (folio); +netfs_folio_start_fscache (caching, folio); +folio_unlock (folio); + } + +folio_batch_release (&fbatch); +cond_resched (); + }while (!stop); +} + +/* +* Synchronously write back the locked page and any subsequent non-locked dirty +* pages. +*/ +static ssize_t netfs_write_back_from_locked_folio (struct address_space *mapping, +struct writeback_control *wbc, +struct netfs_group *group, +struct xa_state *xas, +struct folio *folio, +unsigned long long start, +unsigned long long end) +{ +struct netfs_io_request *wreq; +struct netfs_folio *finfo; +struct netfs_inode *ctx =netfs_inode (mapping->host); +unsigned long long i_size =i_size_read (&ctx->inode); +size_t len, max_len; +bool caching =netfs_is_cache_enabled (ctx); +long count = wbc->nr_to_write; +int ret; + +_enter (",%lx,%llx-%llx,%u" ,folio_index (folio), start, end, caching); + + wreq =netfs_alloc_request (mapping,NULL , start,folio_size (folio), +NETFS_WRITEBACK ); +if (IS_ERR (wreq)) { +folio_unlock (folio); +return PTR_ERR (wreq); + } + +if (!folio_clear_dirty_for_io (folio)) +BUG (); +folio_start_writeback (folio); +netfs_folio_start_fscache (caching, folio); + + count -=folio_nr_pages (folio); + +/* Find all consecutive lockable dirty pages that have contiguous +* written regions, stopping when we find a page that is not +* immediately lockable, is not dirty or is missing, or we reach the +* end of the range. +*/ +trace_netfs_folio (folio, netfs_folio_trace_store); + + len = wreq->len; + finfo =netfs_folio_info (folio); +if (finfo) { + start += finfo->dirty_offset; +if (finfo->dirty_offset + finfo->dirty_len != len) { + len = finfo->dirty_len; + goto cant_expand; + } + len = finfo->dirty_len; + } + +if (start < i_size) { +/* Trim the write to the EOF; the extra data is ignored. Also +* put an upper limit on the size of a single storedata op. +*/ + max_len =65536 *4096 ; + max_len = min_t(unsigned long long, max_len, end - start + 1); + max_len = min_t(unsigned long long, max_len, i_size - start); + +if (len < max_len) +netfs_extend_writeback (mapping, group, xas, &count, start, + max_len, caching, &len, &wreq->upper_len); + } + +cant_expand: + len = min_t(unsigned long long, len, i_size - start); + +/* We now have a contiguous set of dirty pages, each with writeback +* set; the first page is still locked at this point, but all the rest +* have been unlocked. +*/ +folio_unlock (folio); + wreq->start = start; + wreq->len = len; + +if (start < i_size) { +_debug ("write back %zx @%llx [%llx]" , len, start, i_size); + +/* Speculatively write to the cache. We have to fix this up +* later if the store fails. +*/ + wreq->cleanup = netfs_cleanup_buffered_write; + +iov_iter_xarray (&wreq->iter,ITER_SOURCE , &mapping->i_pages, start, + wreq->upper_len); +__set_bit (NETFS_RREQ_UPLOAD_TO_SERVER , &wreq->flags); + ret =netfs_begin_write (wreq, true, netfs_write_trace_writeback); +if (ret ==0 || ret == -EIOCBQUEUED ) + wbc->nr_to_write -= len /PAGE_SIZE ; + }else { +_debug ("write discard %zx @%llx [%llx]" , len, start, i_size); + +/* The dirty region was entirely beyond the EOF. */ +fscache_clear_page_bits (mapping, start, len, caching); +netfs_pages_written_back (wreq); + ret =0 ; + } + +netfs_put_request (wreq, false, netfs_rreq_trace_put_return); +_leave (" = 1" ); +return 1 ; +} + +/* +* Write a region of pages back to the server +*/ +static ssize_t netfs_writepages_begin (struct address_space *mapping, +struct writeback_control *wbc, +struct netfs_group *group, +struct xa_state *xas, +unsigned long long *_start, +unsigned long long end) +{ +const struct netfs_folio *finfo; +struct folio *folio; +unsigned long long start = *_start; +ssize_t ret; +void *priv; +int skips =0 ; + +_enter ("%llx,%llx," , start, end); + +search_again: +/* Find the first dirty page in the group. */ +rcu_read_lock (); + +for (;;) { + folio =xas_find_marked (xas, end /PAGE_SIZE ,PAGECACHE_TAG_DIRTY ); +if (xas_retry (xas, folio) ||xa_is_value (folio)) +continue ; +if (!folio) +break ; + +if (!folio_try_get_rcu (folio)) { +xas_reset (xas); +continue ; + } + +if (unlikely (folio !=xas_reload (xas))) { +folio_put (folio); +xas_reset (xas); +continue ; + } + +/* Skip any dirty folio that's not in the group of interest. */ + priv =folio_get_private (folio); +if ((const struct netfs_group *)priv != group) { + finfo =netfs_folio_info (folio); +if (finfo->netfs_group != group) { +folio_put (folio); +continue ; + } + } + +xas_pause (xas); +break ; + } +rcu_read_unlock (); +if (!folio) +return 0 ; + + start =folio_pos (folio);/* May regress with THPs */ + +_debug ("wback %lx" ,folio_index (folio)); + +/* At this point we hold neither the i_pages lock nor the page lock: +* the page may be truncated or invalidated (changing page->mapping to +* NULL), or even swizzled back from swapper_space to tmpfs file +* mapping +*/ +lock_again: +if (wbc->sync_mode !=WB_SYNC_NONE ) { + ret =folio_lock_killable (folio); +if (ret <0 ) +return ret; + }else { +if (!folio_trylock (folio)) + goto search_again; + } + +if (folio->mapping != mapping || + !folio_test_dirty (folio)) { + start +=folio_size (folio); +folio_unlock (folio); + goto search_again; + } + +if (folio_test_writeback (folio) || +folio_test_fscache (folio)) { +folio_unlock (folio); +if (wbc->sync_mode !=WB_SYNC_NONE ) { +folio_wait_writeback (folio); +#ifdef CONFIG_NETFS_FSCACHE +folio_wait_fscache (folio); +#endif + goto lock_again; + } + + start +=folio_size (folio); +if (wbc->sync_mode ==WB_SYNC_NONE ) { +if (skips >=5 ||need_resched ()) { + ret =0 ; + goto out; + } + skips++; + } + goto search_again; + } + + ret =netfs_write_back_from_locked_folio (mapping, wbc, group, xas, + folio, start, end); +out: +if (ret >0 ) + *_start = start + ret; +_leave (" = %zd [%llx]" , ret, *_start); +return ret; +} + +/* +* Write a region of pages back to the server +*/ +static int netfs_writepages_region (struct address_space *mapping, +struct writeback_control *wbc, +struct netfs_group *group, +unsigned long long *_start, +unsigned long long end) +{ +ssize_t ret; + +XA_STATE (xas, &mapping->i_pages, *_start /PAGE_SIZE ); + +do { + ret =netfs_writepages_begin (mapping, wbc, group, &xas, + _start, end); +if (ret >0 && wbc->nr_to_write >0 ) +cond_resched (); + }while (ret >0 && wbc->nr_to_write >0 ); + +return ret >0 ?0 : ret; +} + +/* +* write some of the pending data back to the server +*/ +int netfs_writepages (struct address_space *mapping, +struct writeback_control *wbc) +{ +struct netfs_group *group =NULL ; +loff_t start, end; +int ret; + +_enter ("" ); + +/* We have to be careful as we can end up racing with setattr() +* truncating the pagecache since the caller doesn't take a lock here +* to prevent it. +*/ + +if (wbc->range_cyclic && mapping->writeback_index) { + start = mapping->writeback_index *PAGE_SIZE ; + ret =netfs_writepages_region (mapping, wbc, group, + &start,LLONG_MAX ); +if (ret <0 ) + goto out; + +if (wbc->nr_to_write <=0 ) { + mapping->writeback_index = start /PAGE_SIZE ; + goto out; + } + + start =0 ; + end = mapping->writeback_index *PAGE_SIZE ; + mapping->writeback_index =0 ; + ret =netfs_writepages_region (mapping, wbc, group, &start, end); +if (ret ==0 ) + mapping->writeback_index = start /PAGE_SIZE ; + }else if (wbc->range_start ==0 && wbc->range_end ==LLONG_MAX ) { + start =0 ; + ret =netfs_writepages_region (mapping, wbc, group, + &start,LLONG_MAX ); +if (wbc->nr_to_write >0 && ret ==0 ) + mapping->writeback_index = start /PAGE_SIZE ; + }else { + start = wbc->range_start; + ret =netfs_writepages_region (mapping, wbc, group, + &start, wbc->range_end); + } + +out: +_leave (" = %d" , ret); +return ret; +} +EXPORT_SYMBOL (netfs_writepages);
include/linux/netfs.h +2 -0
@@ -398,6 +398,8 @@ int netfs_read_folio(struct file *, struct folio *);int netfs_write_begin (struct netfs_inode *,struct file *,struct address_space *,loff_t pos,unsigned int len,struct folio **,void **fsdata); +int netfs_writepages (struct address_space *mapping, +struct writeback_control *wbc);bool netfs_dirty_folio (struct address_space *mapping,struct folio *folio);int netfs_unpin_writeback (struct inode *inode,struct writeback_control *wbc);void netfs_clear_inode_writeback (struct inode *inode,const void *aux);
David Howells
maintainerPATCH v5 35/40 netfs: Provide a launder_folio implementation
In reply to David HowellsProvide a launder_folio implementation for netfslib.
--- fs/netfs/buffered_write.c | 74 ++++++++++++++++++++++++++++++++++++ fs/netfs/main.c | 1 + include/linux/netfs.h | 2 + include/trace/events/netfs.h | 3 ++ 4 files changed, 80 insertions(+)
fs/netfs/buffered_write.c +74 -0
@@ -1111,3 +1111,77 @@ int netfs_writepages(struct address_space *mapping,return ret; }EXPORT_SYMBOL (netfs_writepages); + +/* +* Deal with the disposition of a laundered folio. +*/ +static void netfs_cleanup_launder_folio (struct netfs_io_request *wreq) +{ +if (wreq->error) { +pr_notice ("R=%08x Laundering error %d\n" , wreq->debug_id, wreq->error); +mapping_set_error (wreq->mapping, wreq->error); + } +} + +/** +* netfs_launder_folio - Clean up a dirty folio that's being invalidated +* @folio: The folio to clean +* +* This is called to write back a folio that's being invalidated when an inode +* is getting torn down. Ideally, writepages would be used instead. +*/ +int netfs_launder_folio (struct folio *folio) +{ +struct netfs_io_request *wreq; +struct address_space *mapping = folio->mapping; +struct netfs_folio *finfo =netfs_folio_info (folio); +struct netfs_group *group =netfs_folio_group (folio); +struct bio_vec bvec; +unsigned long long i_size =i_size_read (mapping->host); +unsigned long long start =folio_pos (folio); +size_t offset =0 , len; +int ret =0 ; + +if (finfo) { + offset = finfo->dirty_offset; + start += offset; + len = finfo->dirty_len; + }else { + len =folio_size (folio); + } + len = min_t(unsigned long long, len, i_size - start); + + wreq =netfs_alloc_request (mapping,NULL , start, len,NETFS_LAUNDER_WRITE ); +if (IS_ERR (wreq)) { + ret =PTR_ERR (wreq); + goto out; + } + +if (!folio_clear_dirty_for_io (folio)) + goto out_put; + +trace_netfs_folio (folio, netfs_folio_trace_launder); + +_debug ("launder %llx-%llx" , start, start + len -1 ); + +/* Speculatively write to the cache. We have to fix this up later if +* the store fails. +*/ + wreq->cleanup = netfs_cleanup_launder_folio; + +bvec_set_folio (&bvec, folio, len, offset); +iov_iter_bvec (&wreq->iter,ITER_SOURCE , &bvec,1 , len); +__set_bit (NETFS_RREQ_UPLOAD_TO_SERVER , &wreq->flags); + ret =netfs_begin_write (wreq, true, netfs_write_trace_launder); + +out_put: +folio_detach_private (folio); +netfs_put_group (group); +kfree (finfo); +netfs_put_request (wreq, false, netfs_rreq_trace_put_return); +out: +folio_wait_fscache (folio); +_leave (" = %d" , ret); +return ret; +} +EXPORT_SYMBOL (netfs_launder_folio);
fs/netfs/main.c +1 -0
@@ -30,6 +30,7 @@ static const char *netfs_origins[nr__netfs_io_origin] = { [NETFS_READPAGE] = "RP", [NETFS_READ_FOR_WRITE] = "RW", [NETFS_WRITEBACK] = "WB", + [NETFS_LAUNDER_WRITE] = "LW", [NETFS_UNBUFFERED_WRITE] = "UW", [NETFS_DIO_READ] = "DR", [NETFS_DIO_WRITE] = "DW",
include/linux/netfs.h +2 -0
@@ -227,6 +227,7 @@ enum netfs_io_origin {NETFS_READPAGE ,/* This read is a synchronous read */ NETFS_READ_FOR_WRITE ,/* This read is to prepare a write */ NETFS_WRITEBACK ,/* This write was triggered by writepages */ +NETFS_LAUNDER_WRITE ,/* This is triggered by ->launder_folio() */ NETFS_UNBUFFERED_WRITE ,/* This is an unbuffered write */ NETFS_DIO_READ ,/* This is a direct I/O read */ NETFS_DIO_WRITE, /* This is a direct I/O write */
@@ -405,6 +406,7 @@ int netfs_unpin_writeback(struct inode *inode, struct writeback_control *wbc);void netfs_clear_inode_writeback (struct inode *inode,const void *aux);void netfs_invalidate_folio (struct folio *folio,size_t offset,size_t length);bool netfs_release_folio (struct folio *folio,gfp_t gfp); +int netfs_launder_folio (struct folio *folio);/* VMA operations API. */ vm_fault_t netfs_page_mkwrite (struct vm_fault *vmf,struct netfs_group *netfs_group);
include/trace/events/netfs.h +3 -0
@@ -25,6 +25,7 @@#define netfs_write_traces \ EM(netfs_write_trace_dio_write, "DIO-WRITE") \ + EM(netfs_write_trace_launder, "LAUNDER ") \ EM(netfs_write_trace_unbuffered_write, "UNB-WRITE") \ E_(netfs_write_trace_writeback, "WRITEBACK")
@@ -33,6 +34,7 @@ EM(NETFS_READPAGE, "RP") \ EM(NETFS_READ_FOR_WRITE, "RW") \ EM(NETFS_WRITEBACK, "WB") \ + EM(NETFS_LAUNDER_WRITE, "LW") \ EM(NETFS_UNBUFFERED_WRITE, "UW") \ EM(NETFS_DIO_READ, "DR") \E_ (NETFS_DIO_WRITE ,"DW" )
@@ -127,6 +129,7 @@ EM(netfs_folio_trace_end_copy, "end-copy") \ EM(netfs_folio_trace_filled_gaps, "filled-gaps") \ EM(netfs_folio_trace_kill, "kill") \ + EM(netfs_folio_trace_launder, "launder") \ EM(netfs_folio_trace_mkwrite, "mkwrite") \ EM(netfs_folio_trace_mkwrite_plus, "mkwrite+") \EM (netfs_folio_trace_read_gaps,"read-gaps" ) \
David Howells
maintainerPATCH v5 36/40 netfs: Implement a write-through caching option
In reply to David HowellsProvide a flag whereby a filesystem may request that cifs_perform_write() perform write-through caching. This involves putting pages directly into writeback rather than dirty and attaching them to a write operation as we go.
Further, the writes being made are limited to the byte range being written rather than whole folios being written. This can be used by cifs, for example, to deal with strict byte-range locking.
This can't be used with content encryption as that may require expansion of the write RPC beyond the write being made.
This doesn't affect writes via mmap - those are written back in the normal way; similarly failed writethrough writes are marked dirty and left to writeback to retry. Another option would be to simply invalidate them, but the contents can be simultaneously accessed by read() and through mmap.
--- fs/netfs/buffered_write.c | 69 +++++++++++++++++++++++---- fs/netfs/internal.h | 3 ++ fs/netfs/main.c | 1 + fs/netfs/objects.c | 1 + fs/netfs/output.c | 90 ++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 2 + include/trace/events/netfs.h | 8 +++- 7 files changed, 162 insertions(+), 12 deletions(-)
fs/netfs/buffered_write.c +59 -10
@@ -26,6 +26,8 @@ enum netfs_how_to_modify { NETFS_FLUSH_CONTENT, /* Flush incompatible content. */ }; +static void netfs_cleanup_buffered_write (struct netfs_io_request *wreq); +static void netfs_set_group (struct folio *folio,struct netfs_group *netfs_group) {if (netfs_group && !folio_get_private (folio))
@@ -133,6 +135,14 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,struct inode *inode =file_inode (file);struct address_space *mapping = inode->i_mapping;struct netfs_inode *ctx =netfs_inode (inode); +struct writeback_control wbc = { + .sync_mode =WB_SYNC_NONE , + .for_sync = true, + .nr_to_write =LONG_MAX , + .range_start = iocb->ki_pos, + .range_end = iocb->ki_pos + iter->count, + }; +struct netfs_io_request *wreq =NULL ;struct netfs_folio *finfo;struct folio *folio;enum netfs_how_to_modify howto;
@@ -143,6 +153,30 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,size_t max_chunk =PAGE_SIZE <<MAX_PAGECACHE_ORDER ;bool maybe_trouble = false; +if (unlikely (test_bit (NETFS_ICTX_WRITETHROUGH , &ctx->flags) || + iocb->ki_flags & (IOCB_DSYNC |IOCB_SYNC )) + ) { +if (pos <i_size_read (inode)) { + ret =filemap_write_and_wait_range (mapping, pos, pos + iter->count); +if (ret <0 ) { + goto out; + } + } + +wbc_attach_fdatawrite_inode (&wbc, mapping->host); + + wreq =netfs_begin_writethrough (iocb, iter->count); +if (IS_ERR (wreq)) { +wbc_detach_inode (&wbc); + ret =PTR_ERR (wreq); + wreq =NULL ; + goto out; + } +if (!is_sync_kiocb (iocb)) + wreq->iocb = iocb; + wreq->cleanup = netfs_cleanup_buffered_write; + } + do { size_t flen; size_t offset; /* Offset into pagecache folio */
@@ -315,7 +349,25 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, } written += copied; -folio_mark_dirty (folio); +if (likely (!wreq)) { +folio_mark_dirty (folio); + }else { +if (folio_test_dirty (folio)) +/* Sigh. mmap. */ +folio_clear_dirty_for_io (folio); +/* We make multiple writes to the folio... */ +if (!folio_test_writeback (folio)) { +folio_wait_fscache (folio); +folio_start_writeback (folio); +folio_start_fscache (folio); +if (wreq->iter.count ==0 ) +trace_netfs_folio (folio, netfs_folio_trace_wthru); +else +trace_netfs_folio (folio, netfs_folio_trace_wthru_plus); + } +netfs_advance_writethrough (wreq, copied, + offset + copied == flen); + } retry:folio_unlock (folio);folio_put (folio);
@@ -325,17 +377,14 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, }while (iov_iter_count (iter)); out: -if (likely (written)) { -/* Flush and wait for a write that requires immediate synchronisation. */ -if (iocb->ki_flags & (IOCB_DSYNC |IOCB_SYNC )) { -_debug ("dsync" ); - ret =filemap_fdatawait_range (mapping, iocb->ki_pos, - iocb->ki_pos + written); - } - - iocb->ki_pos += written; +if (unlikely (wreq)) { + ret =netfs_end_writethrough (wreq, iocb); +wbc_detach_inode (&wbc); +if (ret == -EIOCBQUEUED ) +return ret; } + iocb->ki_pos += written;_leave (" = %zd [%zd]" , written, ret);return written ? written : ret;
fs/netfs/internal.h +3 -0
@@ -101,6 +101,9 @@ static inline void netfs_see_request(struct netfs_io_request *rreq,*/ int netfs_begin_write (struct netfs_io_request *wreq,bool may_wait,enum netfs_write_trace what); +struct netfs_io_request *netfs_begin_writethrough (struct kiocb *iocb,size_t len); +int netfs_advance_writethrough (struct netfs_io_request *wreq,size_t copied,bool to_page_end); +int netfs_end_writethrough (struct netfs_io_request *wreq,struct kiocb *iocb);/* * stats.c
fs/netfs/main.c +1 -0
@@ -30,6 +30,7 @@ static const char *netfs_origins[nr__netfs_io_origin] = { [NETFS_READPAGE] = "RP", [NETFS_READ_FOR_WRITE] = "RW", [NETFS_WRITEBACK] = "WB", + [NETFS_WRITETHROUGH] = "WT", [NETFS_LAUNDER_WRITE] = "LW", [NETFS_UNBUFFERED_WRITE] = "UW", [NETFS_DIO_READ] = "DR",
fs/netfs/objects.c +1 -0
@@ -41,6 +41,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, rreq->i_size =i_size_read (inode); rreq->debug_id =atomic_inc_return (&debug_ids);INIT_LIST_HEAD (&rreq->subrequests); +INIT_WORK (&rreq->work,NULL );refcount_set (&rreq->ref,1 );__set_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags);
fs/netfs/output.c +90 -0
93 lines not on this page · raw message
include/linux/netfs.h +2 -0
@@ -139,6 +139,7 @@ struct netfs_inode {unsigned long flags;#define NETFS_ICTX_ODIRECT 0/* The file has DIO in progress */ #define NETFS_ICTX_UNBUFFERED 1/* I/O should not use the pagecache */ +#define NETFS_ICTX_WRITETHROUGH 2/* Write-through caching */ };/*
@@ -227,6 +228,7 @@ enum netfs_io_origin {NETFS_READPAGE ,/* This read is a synchronous read */ NETFS_READ_FOR_WRITE ,/* This read is to prepare a write */ NETFS_WRITEBACK ,/* This write was triggered by writepages */ +NETFS_WRITETHROUGH ,/* This write was made by netfs_perform_write() */ NETFS_LAUNDER_WRITE ,/* This is triggered by ->launder_folio() */ NETFS_UNBUFFERED_WRITE ,/* This is an unbuffered write */ NETFS_DIO_READ, /* This is a direct I/O read */
include/trace/events/netfs.h +6 -2
@@ -27,13 +27,15 @@ EM(netfs_write_trace_dio_write, "DIO-WRITE") \ EM(netfs_write_trace_launder, "LAUNDER ") \ EM(netfs_write_trace_unbuffered_write, "UNB-WRITE") \ - E_(netfs_write_trace_writeback, "WRITEBACK") + EM(netfs_write_trace_writeback, "WRITEBACK") \ + E_(netfs_write_trace_writethrough, "WRITETHRU")#define netfs_rreq_origins \ EM(NETFS_READAHEAD, "RA") \ EM(NETFS_READPAGE, "RP") \ EM(NETFS_READ_FOR_WRITE, "RW") \ EM(NETFS_WRITEBACK, "WB") \ + EM(NETFS_WRITETHROUGH, "WT") \ EM(NETFS_LAUNDER_WRITE, "LW") \ EM(NETFS_UNBUFFERED_WRITE, "UW") \ EM(NETFS_DIO_READ, "DR") \
@@ -136,7 +138,9 @@ EM(netfs_folio_trace_redirty, "redirty") \ EM(netfs_folio_trace_redirtied, "redirtied") \ EM(netfs_folio_trace_store, "store") \ - E_(netfs_folio_trace_store_plus, "store+") + EM(netfs_folio_trace_store_plus, "store+") \ + EM(netfs_folio_trace_wthru, "wthru") \ + E_(netfs_folio_trace_wthru_plus, "wthru+")#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
David Howells
maintainerPATCH v5 37/40 netfs: Optimise away reads above the point at which there can be no data
In reply to David HowellsTrack the file position above which the server is not expected to have any data (the "zero point") and preemptively assume that we can satisfy requests by filling them with zeroes locally rather than attempting to download them if they're over that line - even if we've written data back to the server. Assume that any data that was written back above that position is held in the local cache. Note that we have to split requests that straddle the line.
Make use of this to optimise away some reads from the server. We need to set the zero point in the following circumstances:
(1) When we see an extant remote inode and have no cache for it, we set the zero_point to i_size.
(2) On local inode creation, we set zero_point to 0.
(3) On local truncation down, we reduce zero_point to the new i_size if the new i_size is lower.
(4) On local truncation up, we don't change zero_point.
(5) On local modification, we don't change zero_point.
(6) On remote invalidation, we set zero_point to the new i_size.
(7) If stored data is discarded from the pagecache or culled from fscache, we must set zero_point above that if the data also got written to the server.
(8) If dirty data is written back to the server, but not fscache, we must set zero_point above that.
(9) If a direct I/O write is made, set zero_point above that.
Assuming the above, any read from the server at or above the zero_point position will return all zeroes.
The zero_point value can be stored in the cache, provided the above rules are applied to it by any code that culls part of the local cache.
--- fs/afs/inode.c | 22 +++++++++++++--------- fs/netfs/buffered_write.c | 2 +- fs/netfs/direct_write.c | 4 ++++ fs/netfs/io.c | 10 ++++++++++ fs/netfs/misc.c | 5 +++++ fs/smb/client/cifsfs.c | 4 ++-- include/linux/netfs.h | 14 ++++++++++++-- 7 files changed, 47 insertions(+), 14 deletions(-)
fs/afs/inode.c +13 -9
@@ -168,6 +168,7 @@ static void afs_apply_status(struct afs_operation *op,struct inode *inode = &vnode->netfs.inode;struct timespec64 t;umode_t mode; +bool unexpected_jump = false;bool data_changed = false;bool change_size = vp->set_size;
@@ -231,6 +232,7 @@ static void afs_apply_status(struct afs_operation *op, } change_size = true; data_changed = true; + unexpected_jump = true; }else if (vnode->status.type ==AFS_FTYPE_DIR ) {/* Expected directory change is handled elsewhere so * that we can locally edit the directory and save on a
@@ -252,6 +254,8 @@ static void afs_apply_status(struct afs_operation *op, vnode->netfs.remote_i_size = status->size;if (change_size || status->size >i_size_read (inode)) {afs_set_i_size (vnode, status->size); +if (unexpected_jump) + vnode->netfs.zero_point = status->size;inode_set_ctime_to_ts (inode, t);inode_set_atime_to_ts (inode, t); }
@@ -865,17 +869,17 @@ static void afs_setattr_success(struct afs_operation *op)static void afs_setattr_edit_file (struct afs_operation *op) {struct afs_vnode_param *vp = &op->file[0 ]; -struct inode *inode = &vp->vnode->netfs.inode; +struct afs_vnode *vnode = vp->vnode;if (op->setattr.attr->ia_valid &ATTR_SIZE ) {loff_t size = op->setattr.attr->ia_size;loff_t i_size = op->setattr.old_i_size; -if (size < i_size) -truncate_pagecache (inode, size); -if (size != i_size) -fscache_resize_cookie (afs_vnode_cache (vp->vnode), - vp->scb.status.size); +if (size != i_size) { +truncate_setsize (&vnode->netfs.inode, size); +netfs_resize_file (&vnode->netfs, size, true); +fscache_resize_cookie (afs_vnode_cache (vnode), size); + } } }
@@ -943,11 +947,11 @@ int afs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,*/ if (!(attr->ia_valid & (supported & ~ATTR_SIZE & ~ATTR_MTIME )) && attr->ia_size < i_size && - attr->ia_size > vnode->status.size) { -truncate_pagecache (inode, attr->ia_size); + attr->ia_size > vnode->netfs.remote_i_size) { +truncate_setsize (inode, attr->ia_size); +netfs_resize_file (&vnode->netfs, size, false);fscache_resize_cookie (afs_vnode_cache (vnode), attr->ia_size); -i_size_write (inode, attr->ia_size); ret =0 ; goto out_unlock; }
fs/netfs/buffered_write.c +1 -1
@@ -73,7 +73,7 @@ static enum netfs_how_to_modify netfs_how_to_modify(struct netfs_inode *ctx,if (folio_test_uptodate (folio))return NETFS_FOLIO_IS_UPTODATE ; -if (pos >= ctx->remote_i_size) +if (pos >= ctx->zero_point)return NETFS_MODIFY_AND_CLEAR ;if (!maybe_trouble && offset ==0 && len >= flen)
fs/netfs/direct_write.c +4 -0
@@ -134,6 +134,7 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)struct file *file = iocb->ki_filp;struct inode *inode = file->f_mapping->host;struct netfs_inode *ictx =netfs_inode (inode); +unsigned long long end;ssize_t ret;_enter ("%llx,%zx,%llx" , iocb->ki_pos,iov_iter_count (from),i_size_read (inode));
@@ -155,6 +156,9 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from) ret =kiocb_invalidate_pages (iocb,iov_iter_count (from));if (ret <0 ) goto out; + end = iocb->ki_pos +iov_iter_count (from); +if (end > ictx->zero_point) + ictx->zero_point = end;fscache_invalidate (netfs_i_cookie (ictx),NULL ,i_size_read (inode),FSCACHE_INVAL_DIO_WRITE );
fs/netfs/io.c +10 -0
@@ -569,6 +569,7 @@ netfs_rreq_prepare_read(struct netfs_io_request *rreq, struct iov_iter *io_iter) {enum netfs_io_source source =NETFS_DOWNLOAD_FROM_SERVER ; +struct netfs_inode *ictx =netfs_inode (rreq->inode);size_t lsize;_enter ("%llx-%llx,%llx" , subreq->start, subreq->start + subreq->len, rreq->i_size);
@@ -586,6 +587,14 @@ netfs_rreq_prepare_read(struct netfs_io_request *rreq,* to make serial calls, it can indicate a short read and then * we will call it again. */ +if (rreq->origin !=NETFS_DIO_READ ) { +if (subreq->start >= ictx->zero_point) { + source =NETFS_FILL_WITH_ZEROES ; + goto set; + } +if (subreq->len > ictx->zero_point - subreq->start) + subreq->len = ictx->zero_point - subreq->start; + }if (subreq->len > rreq->i_size - subreq->start) subreq->len = rreq->i_size - subreq->start;if (rreq->rsize && subreq->len > rreq->rsize)
@@ -607,6 +616,7 @@ netfs_rreq_prepare_read(struct netfs_io_request *rreq, } } +set:if (subreq->len > rreq->len) pr_warn("R=%08x[%u] SREQ>RREQ %zx > %zx\n", rreq->debug_id, subreq->debug_index,
fs/netfs/misc.c +5 -0
@@ -240,6 +240,11 @@ EXPORT_SYMBOL(netfs_invalidate_folio);bool netfs_release_folio (struct folio *folio,gfp_t gfp) {struct netfs_inode *ctx =netfs_inode (folio_inode (folio)); +unsigned long long end; + + end =folio_pos (folio) +folio_size (folio); +if (end > ctx->zero_point) + ctx->zero_point = end;if (folio_test_private (folio))return false;
fs/smb/client/cifsfs.c +2 -2
@@ -1220,7 +1220,7 @@ static int cifs_precopy_set_eof(struct inode *src_inode, struct cifsInodeInfo *sif (rc <0 ) goto set_failed; -netfs_resize_file (&src_cifsi->netfs, src_end); +netfs_resize_file (&src_cifsi->netfs, src_end, true);fscache_resize_cookie (cifs_inode_cookie (src_inode), src_end);return 0 ;
@@ -1351,7 +1351,7 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off, smb_file_src, smb_file_target, off, len, destoff);if (rc ==0 && new_size >i_size_read (target_inode)) {truncate_setsize (target_inode, new_size); -netfs_resize_file (&target_cifsi->netfs, new_size); +netfs_resize_file (&target_cifsi->netfs, new_size, true);fscache_resize_cookie (cifs_inode_cookie (target_inode), new_size); }
include/linux/netfs.h +12 -2
@@ -136,6 +136,8 @@ struct netfs_inode {struct fscache_cookie *cache;#endif loff_t remote_i_size;/* Size of the remote file */ +loff_t zero_point;/* Size after which we assume there's no data +* on the server */ unsigned long flags;#define NETFS_ICTX_ODIRECT 0/* The file has DIO in progress */ #define NETFS_ICTX_UNBUFFERED 1/* I/O should not use the pagecache */
@@ -463,22 +465,30 @@ static inline void netfs_inode_init(struct netfs_inode *ctx, { ctx->ops = ops; ctx->remote_i_size =i_size_read (&ctx->inode); + ctx->zero_point = ctx->remote_i_size; ctx->flags =0 ;#if IS_ENABLED (CONFIG_FSCACHE ) ctx->cache =NULL ;#endif +/* ->releasepage() drives zero_point */ +mapping_set_release_always (ctx->inode.i_mapping); }/** * netfs_resize_file - Note that a file got resized * @ctx: The netfs inode being resized * @new_i_size: The new file size +* @changed_on_server: The change was applied to the server * * Inform the netfs lib that a file got resized so that it can adjust its state. */ -static inline void netfs_resize_file (struct netfs_inode *ctx,loff_t new_i_size) +static inline void netfs_resize_file (struct netfs_inode *ctx,loff_t new_i_size, +bool changed_on_server) { - ctx->remote_i_size = new_i_size; +if (changed_on_server) + ctx->remote_i_size = new_i_size; +if (new_i_size < ctx->zero_point) + ctx->zero_point = new_i_size; }/**
Re: [PATCH v5 37/40] netfs: Optimise away reads above the point at which there can be no data
Hi David,
Quoted 46 lines · David Howells
Track the file position above which the server is not expected to have any data (the "zero point") and preemptively assume that we can satisfy requests by filling them with zeroes locally rather than attempting to download them if they're over that line - even if we've written data back to the server. Assume that any data that was written back above that position is held in the local cache. Note that we have to split requests that straddle the line.
Make use of this to optimise away some reads from the server. We need to set the zero point in the following circumstances:
(1) When we see an extant remote inode and have no cache for it, we set the
zero_pointtoi_size.(2) On local inode creation, we set
zero_pointto 0.(3) On local truncation down, we reduce
zero_pointto the newi_sizeif the newi_sizeis lower.(4) On local truncation up, we don't change
zero_point.(5) On local modification, we don't change
zero_point.(6) On remote invalidation, we set
zero_pointto the newi_size.(7) If stored data is discarded from the pagecache or culled from fscache, we must set
zero_pointabove that if the data also got written to the server.(8) If dirty data is written back to the server, but not fscache, we must set
zero_pointabove that.(9) If a direct I/O write is made, set
zero_pointabove that.Assuming the above, any read from the server at or above the
zero_pointposition will return all zeroes.The
zero_pointvalue can be stored in the cache, provided the above rules are applied to it by any code that culls part of the local cache.Signed-off-by David Howells <[email protected]>cc Jeff Layton <[email protected]>---
<snip>
Quoted 15 lines
include/linux/netfs.h +2
-0@@ -136,6 +136,8 @@ struct netfs_inode {struct fscache_cookie *cache;#endif loff_t remote_i_size;/* Size of the remote file */ +loff_t zero_point;/* Size after which we assume there's no data +* on the server */ unsigned long flags;#define NETFS_ICTX_ODIRECT 0/* The file has DIO in progress */ #define NETFS_ICTX_UNBUFFERED 1/* I/O should not use the pagecache */ @@ -463,22 +465,30 @@ static inline void netfs_inode_init(struct netfs_inode *ctx, {
include/linux/netfs.h static inline void netfs_inode_init(struct netfs_inode *ctx, · line 475
Quoted 10 lines
include/linux/netfs.h +3
-0ctx->ops = ops; ctx->remote_i_size =i_size_read (&ctx->inode); + ctx->zero_point = ctx->remote_i_size; ctx->flags =0 ;#if IS_ENABLED (CONFIG_FSCACHE ) ctx->cache =NULL ;#endif +/* ->releasepage() drives zero_point */ +mapping_set_release_always (ctx->inode.i_mapping); }
I bisected a crash that I see when trying to mount an NFS volume to this change as commit 6e3c8451f624 ("netfs: Optimise away reads above the point at which there can be no data") in next-20231221:
[ 45.964963] BUG: kernel NULL pointer dereference, address: 0000000000000078 [ 45.964975] #PF: supervisor write access in kernel mode [ 45.964982] #PF: error_code(0x0002) - not-present page [ 45.964987] PGD 0 P4D 0 [ 45.964996] Oops: 0002 [#1] PREEMPT SMP NOPTI [ 45.965004] CPU: 2 PID: 2419 Comm: mount.nfs Not tainted 6.7.0-rc6-next-20231221-debug-09925-g857647efa9be #1 adbbe7bc5037c662bc8f9b8e78ccf16be15b5e58 [ 45.965014] Hardware name: HP HP Desktop M01-F1xxx/87D6, BIOS F.12 12/17/2020 [ 45.965019] RIP: 0010:nfs_alloc_inode+0xa2/0xc0 [nfs] [ 45.965092] Code: 80 b0 01 00 00 00 00 00 00 48 c7 80 38 04 00 00 00 f7 1e c2 48 c7 80 58 04 00 00 00 00 00 00 48 c7 80 40 04 00 00 00 00 00 00 <f0> 80 0a 80 48 05 b8 01 00 00 e9 5f 2b 20 f5 66 66 2e 0f 1f 84 00 [ 45.965099] RSP: 0018:ffffc900058f7bc0 EFLAGS: 00010286 [ 45.965107] RAX: ffff8881958c7290 RBX: ffff888168f0f800 RCX: 0000000000000000 [ 45.965112] RDX: 0000000000000078 RSI: ffffffffc2140a71 RDI: ffff88817a12b880 [ 45.965118] RBP: ffff888168f0f800 R08: ffffc900058f7b70 R09: 88728c958188ffff [ 45.965123] R10: 000000000003a5c0 R11: 0000000000000005 R12: ffffffffc22f1a80 [ 45.965128] R13: ffffc900058f7c30 R14: 0000000000000000 R15: 0000000000000002 [ 45.965134] FS: 00007ff78c318740(0000) GS:ffff8887ff280000(0000) knlGS:0000000000000000 [ 45.965140] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 45.965146] CR2: 0000000000000078 CR3: 000000018a514000 CR4: 0000000000350ef0 [ 45.965152] Call Trace: [ 45.965160] <TASK> [ 45.965167] ? __die+0x23/0x70 [ 45.965183] ? page_fault_oops+0x173/0x4e0 [ 45.965197] ? nfs_alloc_inode+0x21/0xc0 [nfs aac4a012b174ef6e5996d0df3638a0616e82eb47] [ 45.965279] ? exc_page_fault+0x7e/0x180 [ 45.965291] ? asm_exc_page_fault+0x26/0x30 [ 45.965308] ? nfs_alloc_inode+0x21/0xc0 [nfs aac4a012b174ef6e5996d0df3638a0616e82eb47] [ 45.965374] ? nfs_alloc_inode+0xa2/0xc0 [nfs aac4a012b174ef6e5996d0df3638a0616e82eb47] [ 45.965441] alloc_inode+0x1e/0xc0 [ 45.965452] ? __pfx_nfs_find_actor+0x10/0x10 [nfs aac4a012b174ef6e5996d0df3638a0616e82eb47] [ 45.965517] iget5_locked+0x97/0xf0 [ 45.965525] ? __pfx_nfs_init_locked+0x10/0x10 [nfs aac4a012b174ef6e5996d0df3638a0616e82eb47] [ 45.965593] nfs_fhget+0xe4/0x700 [nfs aac4a012b174ef6e5996d0df3638a0616e82eb47] [ 45.965666] nfs_get_root+0xc6/0x4a0 [nfs aac4a012b174ef6e5996d0df3638a0616e82eb47] [ 45.965732] ? kernfs_rename_ns+0x85/0x210 [ 45.965754] nfs_get_tree_common+0xc7/0x520 [nfs aac4a012b174ef6e5996d0df3638a0616e82eb47] [ 45.965826] vfs_get_tree+0x29/0xf0 [ 45.965836] fc_mount+0x12/0x40 [ 45.965846] do_nfs4_mount+0x12e/0x370 [nfsv4 9bac1f2bd94d7294fbbaf875b7b5cec5adc527f5] [ 45.965946] nfs4_try_get_tree+0x48/0xd0 [nfsv4 9bac1f2bd94d7294fbbaf875b7b5cec5adc527f5] [ 45.966034] vfs_get_tree+0x29/0xf0 [ 45.966041] ? srso_return_thunk+0x5/0x5f [ 45.966051] path_mount+0x4ca/0xb10 [ 45.966063] __x64_sys_mount+0x11a/0x150 [ 45.966074] do_syscall_64+0x64/0xe0 [ 45.966083] ? do_syscall_64+0x70/0xe0 [ 45.966090] ? syscall_exit_to_user_mode+0x2b/0x40 [ 45.966098] ? srso_return_thunk+0x5/0x5f [ 45.966106] ? do_syscall_64+0x70/0xe0 [ 45.966113] ? srso_return_thunk+0x5/0x5f [ 45.966121] ? exc_page_fault+0x7e/0x180 [ 45.966130] entry_SYSCALL_64_after_hwframe+0x6c/0x74 [ 45.966138] RIP: 0033:0x7ff78c5f2a1e ...
It appears that ctx->inode.i_mapping is NULL in netfs_inode_init(). This patch appears to cure the problem for me but I am not sure if it is proper or not.
Cheers,
Nathan
include/linux/netfs.h +2 -1
@@ -471,7 +471,8 @@ static inline void netfs_inode_init(struct netfs_inode *ctx, ctx->cache =NULL ;#endif /* ->releasepage() drives zero_point */ -mapping_set_release_always (ctx->inode.i_mapping); +if (ctx->inode.i_mapping) +mapping_set_release_always (ctx->inode.i_mapping); }/**
David Howells
maintainerRe: [PATCH v5 37/40] netfs: Optimise away reads above the point at which there can be no data
Quoted 3 lines · Nathan Chancellor
It appears that
ctx->inode.i_mappingis NULL innetfs_inode_init(). This patch appears to cure the problem for me but I am not sure if it is proper or not.
I'm not sure that's the best way. It kind of indicates that nfs_netfs_inode_init() is not being called in the right place - it should really be called after alloc_inode() has called inode_init_always().
However, mapping_set_release_always() makes ->release_folio() and ->invalidate_folio() always called for an inode's folios, even if PG_private is not set - the idea being that this allows netfslib to update the "zero_point" when a page we've written to the server gets invalidated here, thereby requiring us to go fetch it again.
Now, NFS doesn't make use of this feature and fscache and cachefiles don't use it directly, so we might not want to call mapping_set_release_always() for NFS.
I'm not sure NFS can even reliably make use of it unless it's using a lease unless it gets change notifications from the server.
So I'm thinking of applying your patch but add a comment to say why we're doing it. A better way, though, is to move the call to nfs_netfs_inode_init() and give it a flag to say whether or not we want the facility.
David
David Howells
maintainerPATCH 1/1 Fix oops in NFS
Quoted 2 lines · David Howells
A better way, though, is to move the call to
nfs_netfs_inode_init()and give it a flag to say whether or not we want the facility.
Okay, I think I'll fold in the attached change.
David
---
fs/9p/vfs_inode.c +1 -1
@@ -249,7 +249,7 @@ void v9fs_free_inode(struct inode *inode)static void v9fs_set_netfs_context (struct inode *inode) {struct v9fs_inode *v9inode =V9FS_I (inode); -netfs_inode_init (&v9inode->netfs, &v9fs_req_ops); +netfs_inode_init (&v9inode->netfs, &v9fs_req_ops, true); } int v9fs_init_inode(struct v9fs_session_info *v9ses,
fs/afs/dynroot.c +1 -1
@@ -76,7 +76,7 @@ struct inode *afs_iget_pseudo_dir(struct super_block *sb, bool root)/* there shouldn't be an existing inode */ BUG_ON (!(inode->i_state &I_NEW )); -netfs_inode_init (&vnode->netfs,NULL ); +netfs_inode_init (&vnode->netfs,NULL , false); inode->i_size =0 ; inode->i_mode =S_IFDIR |S_IRUGO |S_IXUGO ;if (root) {
fs/afs/inode.c +1 -1
@@ -58,7 +58,7 @@ static noinline void dump_vnode(struct afs_vnode *vnode, struct afs_vnode *paren*/ static void afs_set_netfs_context (struct afs_vnode *vnode) { -netfs_inode_init (&vnode->netfs, &afs_req_ops); +netfs_inode_init (&vnode->netfs, &afs_req_ops, true); }/*
fs/ceph/inode.c +1 -1
@@ -574,7 +574,7 @@ struct inode *ceph_alloc_inode(struct super_block *sb)doutc (fsc->client,"%p\n" , &ci->netfs.inode);/* Set parameters for the netfs library */ -netfs_inode_init (&ci->netfs, &ceph_netfs_ops); +netfs_inode_init (&ci->netfs, &ceph_netfs_ops, false);spin_lock_init (&ci->i_ceph_lock);
fs/nfs/fscache.h +1 -1
@@ -80,7 +80,7 @@ static inline void nfs_netfs_put(struct nfs_netfs_io_data *netfs) }static inline void nfs_netfs_inode_init (struct nfs_inode *nfsi) { -netfs_inode_init (&nfsi->netfs, &nfs_netfs_ops); +netfs_inode_init (&nfsi->netfs, &nfs_netfs_ops, false); }extern void nfs_netfs_initiate_read (struct nfs_pgio_header *hdr);extern void nfs_netfs_read_completion (struct nfs_pgio_header *hdr);
include/linux/netfs.h +8 -3
@@ -456,22 +456,27 @@ static inline struct netfs_inode *netfs_inode(struct inode *inode)* netfs_inode_init - Initialise a netfslib inode context * @ctx: The netfs inode to initialise * @ops: The netfs's operations list +* @use_zero_point: True to use the zero_point read optimisation * * Initialise the netfs library context struct. This is expected to follow on * directly from the VFS inode struct. */ static inline void netfs_inode_init (struct netfs_inode *ctx, -const struct netfs_request_ops *ops) +const struct netfs_request_ops *ops, +bool use_zero_point) { ctx->ops = ops; ctx->remote_i_size =i_size_read (&ctx->inode); - ctx->zero_point = ctx->remote_i_size; + ctx->zero_point =LLONG_MAX ; ctx->flags =0 ;#if IS_ENABLED (CONFIG_FSCACHE ) ctx->cache =NULL ;#endif /* ->releasepage() drives zero_point */ -mapping_set_release_always (ctx->inode.i_mapping); +if (use_zero_point) { + ctx->zero_point = ctx->remote_i_size; +mapping_set_release_always (ctx->inode.i_mapping); + } }/**
Matthew Wilcox
maintainerRe: [PATCH] Fix oops in NFS
Quoted 6 lines · David Howells
Quoted 2 lines · David Howells
A better way, though, is to move the call to
nfs_netfs_inode_init()and give it a flag to say whether or not we want the facility.Okay, I think I'll fold in the attached change.
This commit (100ccd18bb41 in linux-next 20240104) is bad for me. After it, running xfstests gives me first a bunch of errors along these lines:
00004 depmod: ERROR: failed to load symbols from /lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/fs/gfs2/gfs2.ko: Exec format error 00004 depmod: ERROR: failed to load symbols from /lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/fs/zonefs/zonefs.ko: Exec format error 00004 depmod: ERROR: failed to load symbols from /lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/security/keys/encrypted-keys/encrypted-keys.ko: Exec format error
and then later:
00016 generic/001 run fstests generic/001 at 2024-01-05 04:50:46
00017 [not run] this test requires a valid $TEST_DEV
00017 generic/002 run fstests generic/002 at 2024-01-05 04:50:46
00017 [not run] this test requires a valid $TEST_DEV
00017 generic/003 run fstests generic/003 at 2024-01-05 04:50:47
00018 [not run] this test requires a valid $SCRATCH_DEV
...
so I think that's page cache corruption of some kind.
David Howells
maintainerRe: [PATCH] Fix oops in NFS
Quoted 17 lines · Matthew Wilcox
This commit (
100ccd18bb41in linux-next 20240104) is bad for me. After it, running xfstests gives me first a bunch of errors along these lines:00004 depmod: ERROR: failed to load symbols from
/lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/fs/gfs2/gfs2.ko: Exec format error 00004 depmod: ERROR: failed to load symbols from/lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/fs/zonefs/zonefs.ko: Exec format error 00004 depmod: ERROR: failed to load symbols from/lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/security/keys/encrypted-keys/encrypted-keys.ko: Exec format errorand then later:
00016 generic/001 run fstests generic/001 at 2024-01-05 04:50:46
00017 [not run] this test requires a valid $TEST_DEV
00017 generic/002 run fstests generic/002 at 2024-01-05 04:50:46
00017 [not run] this test requires a valid $TEST_DEV
00017 generic/003 run fstests generic/003 at 2024-01-05 04:50:47
00018 [not run] this test requires a valid $SCRATCH_DEV
...
Quoted 1 line
so I think that's page cache corruption of some kind.
Is that being run on NFS? Is /lib on NFS?
David
Matthew Wilcox
maintainerRe: [PATCH] Fix oops in NFS
Quoted 19 lines · David Howells
Quoted 17 lines · Matthew Wilcox
This commit (
100ccd18bb41in linux-next 20240104) is bad for me. After it, running xfstests gives me first a bunch of errors along these lines:00004 depmod: ERROR: failed to load symbols from
/lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/fs/gfs2/gfs2.ko: Exec format error 00004 depmod: ERROR: failed to load symbols from/lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/fs/zonefs/zonefs.ko: Exec format error 00004 depmod: ERROR: failed to load symbols from/lib/modules/6.7.0-rc7-00037-g100ccd18bb41/kernel/security/keys/encrypted-keys/encrypted-keys.ko: Exec format errorand then later:
00016 generic/001 run fstests generic/001 at 2024-01-05 04:50:46
00017 [not run] this test requires a valid $TEST_DEV
00017 generic/002 run fstests generic/002 at 2024-01-05 04:50:46
00017 [not run] this test requires a valid $TEST_DEV
00017 generic/003 run fstests generic/003 at 2024-01-05 04:50:47
00018 [not run] this test requires a valid $SCRATCH_DEV
...
Quoted 3 lines
Quoted 1 line
so I think that's page cache corruption of some kind.
Is that being run on NFS? Is /lib on NFS?
No NFS involvement; this is supposed to be an XFS test ...
/dev/sda on / type ext4 (rw,relatime)
host on /host type 9p (rw,relatime,access=client,trans=virtio)/dev/sdb on /mnt/test type xfs (rw,relatime,attr2,inode64,logbufs=8,logbsize=32k,noquota)
CONFIG_NETFS_SUPPORT=y
# CONFIG_NETFS_STATS is not set
# CONFIG_FSCACHE is not setCONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
# CONFIG_CEPH_FS is not set
# CONFIG_CIFS is not set
# CONFIG_SMB_SERVER is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not setCONFIG_9P_FS=y
# CONFIG_9P_FS_POSIX_ACL is not set
# CONFIG_9P_FS_SECURITY is not setCONFIG_NLS=y
David Howells
maintainerRe: [PATCH] Fix oops in NFS
In reply to Matthew WilcoxDo you have CONFIG_NFS_FSCACHE set? Are you using a cache?
David
David Howells
maintainerRe: [PATCH] Fix oops in NFS
In reply to Matthew WilcoxQuoted 2 lines · Matthew Wilcox
This commit (
100ccd18bb41in linux-next 20240104) is bad for me. After it, running xfstests gives me first a bunch of errors along these lines:
This may be related to a patch that is in linux-next 20240105, but not 20240104 ("9p: Fix initialisation of netfs_inode for 9p").
David
Dominique Martinet
maintainerRe: [PATCH] Fix oops in NFS
Matthew Wilcox wrote on Fri, Jan 05, 2024 at 01:17:36PM +0000:
Quoted 1 line
host on /host type 9p (rw,relatime,access=client,trans=virtio)
David Howells wrote on Fri, Jan 05, 2024 at 02:33:32PM +0000:
Quoted 5 lines
Quoted 2 lines
This commit (
100ccd18bb41in linux-next 20240104) is bad for me. After it, running xfstests gives me first a bunch of errors along these lines:This may be related to a patch that is in linux-next 20240105, but not 20240104 ("9p: Fix initialisation of
netfs_inodefor 9p").
Yes, you'd be reading zeroes without that patch because the netfs code thinks the file has 0 size and doesn't bother reading, that'd explain the exec format error loading other modules...
One thing that surprised me is that this also affects cache=none, I thought we had different file ops going straight to p9_client_read in this case?
But turning my brain on this would be the read-only mmap case that we need to support for execs, which module loading also uses, so this came biting there alright.
Signature · 1 line
Dominique Martinet | Asmadeus
David Howells
maintainerPATCH v5 38/40 netfs: Export the netfs_sreq tracepoint
In reply to David HowellsExport the netfs_sreq tracepoint so that it can be called directly from client filesystems/cache backend modules.
--- fs/netfs/main.c | 2 ++ 1 file changed, 2 insertions(+)
fs/netfs/main.c +2 -0
@@ -17,6 +17,8 @@ MODULE_DESCRIPTION("Network fs support");MODULE_AUTHOR ("Red Hat, Inc." );MODULE_LICENSE ("GPL" ); +EXPORT_TRACEPOINT_SYMBOL (netfs_sreq); +unsigned netfs_debug;module_param_named (debug, netfs_debug, uint,S_IWUSR |S_IRUGO );MODULE_PARM_DESC (netfs_debug,"Netfs support debugging mask" );
David Howells
maintainerPATCH v5 39/40 afs: Use the netfs write helpers
In reply to David HowellsMake afs use the netfs write helpers.
--- fs/afs/file.c | 70 +++- fs/afs/internal.h | 10 +- fs/afs/write.c | 707 ++----------------------------------- include/trace/events/afs.h | 23 -- 4 files changed, 84 insertions(+), 726 deletions(-)
fs/afs/file.c +54 -16
@@ -34,7 +34,7 @@ const struct file_operations afs_file_operations = { .release = afs_release, .llseek = generic_file_llseek, .read_iter = afs_file_read_iter, - .write_iter = afs_file_write, + .write_iter = netfs_file_write_iter, .mmap = afs_file_mmap, .splice_read = afs_file_splice_read, .splice_write = iter_file_splice_write,
@@ -50,16 +50,15 @@ const struct inode_operations afs_file_inode_operations = { };const struct address_space_operations afs_file_aops = { + .direct_IO = noop_direct_IO, .read_folio = netfs_read_folio, .readahead = netfs_readahead, .dirty_folio = netfs_dirty_folio, - .launder_folio = afs_launder_folio, + .launder_folio = netfs_launder_folio, .release_folio = netfs_release_folio, .invalidate_folio = netfs_invalidate_folio, - .write_begin = afs_write_begin, - .write_end = afs_write_end, - .writepages = afs_writepages, .migrate_folio = filemap_migrate_folio, + .writepages = afs_writepages, };const struct address_space_operations afs_symlink_aops = {
@@ -355,7 +354,10 @@ static int afs_symlink_read_folio(struct file *file, struct folio *folio)static int afs_init_request (struct netfs_io_request *rreq,struct file *file) { - rreq->netfs_priv =key_get (afs_file_key (file)); +if (file) + rreq->netfs_priv =key_get (afs_file_key (file)); + rreq->rsize =256 *1024 ; + rreq->wsize =256 *1024 ;return 0 ; }
@@ -372,11 +374,36 @@ static void afs_free_request(struct netfs_io_request *rreq)key_put (rreq->netfs_priv); } +static void afs_update_i_size (struct inode *inode,loff_t new_i_size) +{ +struct afs_vnode *vnode =AFS_FS_I (inode); +loff_t i_size; + +write_seqlock (&vnode->cb_lock); + i_size =i_size_read (&vnode->netfs.inode); +if (new_i_size > i_size) { +i_size_write (&vnode->netfs.inode, new_i_size); +inode_set_bytes (&vnode->netfs.inode, new_i_size); + } +write_sequnlock (&vnode->cb_lock); +fscache_update_cookie (afs_vnode_cache (vnode),NULL , &new_i_size); +} + +static void afs_netfs_invalidate_cache (struct netfs_io_request *wreq) +{ +struct afs_vnode *vnode =AFS_FS_I (wreq->inode); + +afs_invalidate_cache (vnode,0 ); +} +const struct netfs_request_ops afs_req_ops = { .init_request = afs_init_request, .free_request = afs_free_request, .check_write_begin = afs_check_write_begin, .issue_read = afs_issue_read, + .update_i_size = afs_update_i_size, + .invalidate_cache = afs_netfs_invalidate_cache, + .create_write_requests = afs_create_write_requests, };static void afs_add_open_mmap (struct afs_vnode *vnode)
@@ -445,28 +472,39 @@ static vm_fault_t afs_vm_map_pages(struct vm_fault *vmf, pgoff_t start_pgoff, pgstatic ssize_t afs_file_read_iter (struct kiocb *iocb,struct iov_iter *iter) { -struct afs_vnode *vnode =AFS_FS_I (file_inode (iocb->ki_filp)); +struct inode *inode =file_inode (iocb->ki_filp); +struct afs_vnode *vnode =AFS_FS_I (inode);struct afs_file *af = iocb->ki_filp->private_data; -int ret; +ssize_t ret; - ret =afs_validate (vnode, af->key); +if (iocb->ki_flags &IOCB_DIRECT ) +return netfs_unbuffered_read_iter (iocb, iter); + + ret =netfs_start_io_read (inode);if (ret <0 )return ret; - -return generic_file_read_iter (iocb, iter); + ret =afs_validate (vnode, af->key); +if (ret ==0 ) + ret =filemap_read (iocb, iter,0 ); +netfs_end_io_read (inode); +return ret; }static ssize_t afs_file_splice_read (struct file *in,loff_t *ppos,struct pipe_inode_info *pipe,size_t len,unsigned int flags) { -struct afs_vnode *vnode =AFS_FS_I (file_inode (in)); +struct inode *inode =file_inode (in); +struct afs_vnode *vnode =AFS_FS_I (inode);struct afs_file *af = in->private_data; -int ret; +ssize_t ret; - ret =afs_validate (vnode, af->key); + ret =netfs_start_io_read (inode);if (ret <0 )return ret; - -return filemap_splice_read (in, ppos, pipe, len, flags); + ret =afs_validate (vnode, af->key); +if (ret ==0 ) + ret =filemap_splice_read (in, ppos, pipe, len, flags); +netfs_end_io_read (inode); +return ret; }
fs/afs/internal.h +1 -9
@@ -1463,19 +1463,11 @@ extern int afs_check_volume_status(struct afs_volume *, struct afs_operation *);/* * write.c */ -extern int afs_write_begin (struct file *file,struct address_space *mapping, -loff_t pos,unsigned len, -struct page **pagep,void **fsdata); -extern int afs_write_end (struct file *file,struct address_space *mapping, -loff_t pos,unsigned len,unsigned copied, -struct page *page,void *fsdata); -extern int afs_writepage (struct page *,struct writeback_control *);extern int afs_writepages (struct address_space *,struct writeback_control *); -extern ssize_t afs_file_write (struct kiocb *,struct iov_iter *);extern int afs_fsync (struct file *,loff_t ,loff_t ,int );extern vm_fault_t afs_page_mkwrite (struct vm_fault *vmf);extern void afs_prune_wb_keys (struct afs_vnode *); -int afs_launder_folio (struct folio *); +void afs_create_write_requests (struct netfs_io_request *wreq,loff_t start,size_t len);/* * xattr.c
fs/afs/write.c +29 -678
773 lines not on this page · raw message
include/trace/events/afs.h +0 -23
@@ -837,29 +837,6 @@ TRACE_EVENT(afs_dir_check_failed, __entry->vnode, __entry->off, __entry->i_size) ); -TRACE_EVENT (afs_folio_dirty, - TP_PROTO(struct afs_vnode *vnode, const char *where, struct folio *folio), - -TP_ARGS (vnode, where, folio), - -TP_STRUCT__entry ( - __field(struct afs_vnode *, vnode) - __field(const char *, where) - __field(pgoff_t, index) -__field (size_t, size) - ), - -TP_fast_assign ( - __entry->vnode = vnode; - __entry->where = where; - __entry->index = folio_index(folio); - __entry->size = folio_size(folio); - ), - -TP_printk ("vn=%p ix=%05lx s=%05lx %s" , - __entry->vnode, __entry->index, __entry->size, __entry->where) - ); - TRACE_EVENT(afs_call_state, TP_PROTO(struct afs_call *call, enum afs_call_state from,
David Howells
maintainerPATCH v5 40/40 9p: Use netfslib read/write_iter
In reply to David HowellsUse netfslib's read and write iteration helpers, allowing netfslib to take over the management of the page cache for 9p files and to manage local disk caching. In particular, this eliminates write_begin, write_end, writepage and all mentions of struct page and struct folio from 9p.
Note that netfslib now offers the possibility of write-through caching if that is desirable for 9p: just set the NETFS_ICTX_WRITETHROUGH flag in v9inode->netfs.flags in v9fs_set_netfs_context().
Note also this is untested as I can't get ganesha.nfsd to correctly parse the config to turn on 9p support.
---
Notes:
Changes
=======
ver #5)
- Added some missing remote_i_size setting.
- Added missing writepages (else mmap write never written back).
fs/9p/vfs_addr.c | 293 ++++++++++------------------------------- fs/9p/vfs_file.c | 89 ++----------- fs/9p/vfs_inode.c | 5 +- fs/9p/vfs_inode_dotl.c | 7 +- 4 files changed, 85 insertions(+), 309 deletions(-)
fs/9p/vfs_addr.c +69 -224
@@ -19,12 +19,48 @@#include <linux/netfs.h> #include <net/9p/9p.h> #include <net/9p/client.h> +#include <trace/events/netfs.h> #include "v9fs.h" #include "v9fs_vfs.h" #include "cache.h" #include "fid.h" +static void v9fs_upload_to_server (struct netfs_io_subrequest *subreq) +{ +struct inode *inode = subreq->rreq->inode; +struct v9fs_inode __maybe_unused *v9inode =V9FS_I (inode); +struct p9_fid *fid = subreq->rreq->netfs_priv; +int err; + +trace_netfs_sreq (subreq, netfs_sreq_trace_submit); +p9_client_write (fid, subreq->start, &subreq->io_iter, &err); +netfs_write_subrequest_terminated (subreq, err <0 ? err : subreq->len, + false); +} + +static void v9fs_upload_to_server_worker (struct work_struct *work) +{ +struct netfs_io_subrequest *subreq = + container_of(work, struct netfs_io_subrequest, work); + +v9fs_upload_to_server (subreq); +} + +/* +* Set up write requests for a writeback slice. We need to add a write request +* for each write we want to make. +*/ +static void v9fs_create_write_requests (struct netfs_io_request *wreq,loff_t start,size_t len) +{ +struct netfs_io_subrequest *subreq; + + subreq =netfs_create_write_request (wreq,NETFS_UPLOAD_TO_SERVER , + start, len, v9fs_upload_to_server_worker); +if (subreq) +netfs_queue_write_request (subreq); +} +/** * v9fs_issue_read - Issue a read from 9P * @subreq: The read to make
@@ -33,14 +69,10 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq) {struct netfs_io_request *rreq = subreq->rreq;struct p9_fid *fid = rreq->netfs_priv; -struct iov_iter to; -loff_t pos = subreq->start + subreq->transferred; -size_t len = subreq->len - subreq->transferred;int total, err; -iov_iter_xarray (&to,ITER_DEST , &rreq->mapping->i_pages, pos, len); - - total =p9_client_read (fid, pos, &to, &err); + total =p9_client_read (fid, subreq->start + subreq->transferred, + &subreq->io_iter, &err);/* if we just extended the file size, any portion not in * cache won't be on server and is zeroes */
@@ -50,23 +82,37 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq) }/** -* v9fs_init_request - Initialise a read request +* v9fs_init_request - Initialise a request * @rreq: The read request * @file: The file being read from */ static int v9fs_init_request (struct netfs_io_request *rreq,struct file *file) { -struct p9_fid *fid = file->private_data; - -BUG_ON (!fid); +struct p9_fid *fid; +bool writing = (rreq->origin ==NETFS_READ_FOR_WRITE || + rreq->origin ==NETFS_WRITEBACK || + rreq->origin ==NETFS_WRITETHROUGH || + rreq->origin ==NETFS_LAUNDER_WRITE || + rreq->origin ==NETFS_UNBUFFERED_WRITE || + rreq->origin ==NETFS_DIO_WRITE ); + +if (file) { + fid = file->private_data; +BUG_ON (!fid); +p9_fid_get (fid); + }else { + fid =v9fs_fid_find_inode (rreq->inode, writing,INVALID_UID , true); +if (!fid) { +WARN_ONCE (1 ,"folio expected an open fid inode->i_private=%p\n" , + rreq->inode->i_private); +return -EINVAL ; + } + }/* we might need to read from a fid that was opened write-only * for read-modify-write of page cache, use the writeback fid * for that */ -WARN_ON (rreq->origin ==NETFS_READ_FOR_WRITE && - !(fid->mode &P9_ORDWR )); - -p9_fid_get (fid); +WARN_ON (writing && !(fid->mode &P9_ORDWR )); rreq->netfs_priv = fid;return 0 ; }
@@ -86,217 +132,16 @@ const struct netfs_request_ops v9fs_req_ops = { .init_request = v9fs_init_request, .free_request = v9fs_free_request, .issue_read = v9fs_issue_read, + .create_write_requests = v9fs_create_write_requests, }; -#ifdef CONFIG_9P_FSCACHE -static void v9fs_write_to_cache_done (void *priv,ssize_t transferred_or_error, -bool was_async) -{ -struct v9fs_inode *v9inode = priv; -__le32 version; - -if (IS_ERR_VALUE (transferred_or_error) && - transferred_or_error != -ENOBUFS ) { - version =cpu_to_le32 (v9inode->qid.version); -fscache_invalidate (v9fs_inode_cookie (v9inode), &version, -i_size_read (&v9inode->netfs.inode),0 ); - } -} -#endif - -static int v9fs_vfs_write_folio_locked (struct folio *folio) -{ -struct inode *inode =folio_inode (folio); -loff_t start =folio_pos (folio); -loff_t i_size =i_size_read (inode); -struct iov_iter from; -size_t len =folio_size (folio); -struct p9_fid *writeback_fid; -int err; -struct v9fs_inode __maybe_unused *v9inode =V9FS_I (inode); -struct fscache_cookie __maybe_unused *cookie =v9fs_inode_cookie (v9inode); - -if (start >= i_size) -return 0 ;/* Simultaneous truncation occurred */ - - len =min_t (loff_t, i_size - start, len); - -iov_iter_xarray (&from,ITER_SOURCE , &folio_mapping (folio)->i_pages, start, len); - - writeback_fid =v9fs_fid_find_inode (inode, true,INVALID_UID , true); -if (!writeback_fid) { -WARN_ONCE (1 ,"folio expected an open fid inode->i_private=%p\n" , - inode->i_private); -return -EINVAL ; - } - -folio_wait_fscache (folio); -folio_start_writeback (folio); - -p9_client_write (writeback_fid, start, &from, &err); - -#ifdef CONFIG_9P_FSCACHE -if (err ==0 && -fscache_cookie_enabled (cookie) && -test_bit (FSCACHE_COOKIE_IS_CACHING , &cookie->flags)) { -folio_start_fscache (folio); -fscache_write_to_cache (v9fs_inode_cookie (v9inode), -folio_mapping (folio), start, len, i_size, - v9fs_write_to_cache_done, v9inode, - true); - } -#endif - -folio_end_writeback (folio); -p9_fid_put (writeback_fid); - -return err; -} - -static int v9fs_vfs_writepage (struct page *page,struct writeback_control *wbc) -{ -struct folio *folio =page_folio (page); -int retval; - -p9_debug (P9_DEBUG_VFS ,"folio %p\n" , folio); - - retval =v9fs_vfs_write_folio_locked (folio); -if (retval <0 ) { -if (retval == -EAGAIN ) { -folio_redirty_for_writepage (wbc, folio); - retval =0 ; - }else { -mapping_set_error (folio_mapping (folio), retval); - } - }else - retval =0 ; - -folio_unlock (folio); -return retval; -} - -static int v9fs_launder_folio (struct folio *folio) -{ -int retval; - -if (folio_clear_dirty_for_io (folio)) { - retval =v9fs_vfs_write_folio_locked (folio); -if (retval) -return retval; - } -folio_wait_fscache (folio); -return 0 ; -} - -/** -* v9fs_direct_IO - 9P address space operation for direct I/O -* @iocb: target I/O control block -* @iter: The data/buffer to use -* -* The presence of v9fs_direct_IO() in the address space ops vector -* allowes open() O_DIRECT flags which would have failed otherwise. -* -* In the non-cached mode, we shunt off direct read and write requests before -* the VFS gets them, so this method should never be called. -* -* Direct IO is not 'yet' supported in the cached mode. Hence when -* this routine is called through generic_file_aio_read(), the read/write fails -* with an error. -* -*/ -static ssize_t -v9fs_direct_IO (struct kiocb *iocb,struct iov_iter *iter) -{ -struct file *file = iocb->ki_filp; -loff_t pos = iocb->ki_pos; -ssize_t n; -int err =0 ; - -if (iov_iter_rw (iter) ==WRITE ) { - n =p9_client_write (file->private_data, pos, iter, &err); -if (n) { -struct inode *inode =file_inode (file); -loff_t i_size =i_size_read (inode); - -if (pos + n > i_size) -inode_add_bytes (inode, pos + n - i_size); - } - }else { - n =p9_client_read (file->private_data, pos, iter, &err); - } -return n ? n : err; -} - -static int v9fs_write_begin (struct file *filp,struct address_space *mapping, -loff_t pos,unsigned int len, -struct page **subpagep,void **fsdata) -{ -int retval; -struct folio *folio; -struct v9fs_inode *v9inode =V9FS_I (mapping->host); - -p9_debug (P9_DEBUG_VFS ,"filp %p, mapping %p\n" , filp, mapping); - -/* Prefetch area to be written into the cache if we're caching this -* file. We need to do this before we get a lock on the page in case -* there's more than one writer competing for the same cache block. -*/ - retval =netfs_write_begin (&v9inode->netfs, filp, mapping, pos, len, &folio, fsdata); -if (retval <0 ) -return retval; - - *subpagep = &folio->page; -return retval; -} - -static int v9fs_write_end (struct file *filp,struct address_space *mapping, -loff_t pos,unsigned int len,unsigned int copied, -struct page *subpage,void *fsdata) -{ -loff_t last_pos = pos + copied; -struct folio *folio =page_folio (subpage); -struct inode *inode = mapping->host; - -p9_debug (P9_DEBUG_VFS ,"filp %p, mapping %p\n" , filp, mapping); - -if (!folio_test_uptodate (folio)) { -if (unlikely (copied < len)) { - copied =0 ; - goto out; - } - -folio_mark_uptodate (folio); - } - -/* -* No need to use i_size_read() here, the i_size -* cannot change under us because we hold the i_mutex. -*/ -if (last_pos > inode->i_size) { -inode_add_bytes (inode, last_pos - inode->i_size); -i_size_write (inode, last_pos); -#ifdef CONFIG_9P_FSCACHE -fscache_update_cookie (v9fs_inode_cookie (V9FS_I (inode)),NULL , - &last_pos); -#endif - } -folio_mark_dirty (folio); -out: -folio_unlock (folio); -folio_put (folio); - -return copied; -} -const struct address_space_operations v9fs_addr_operations = { - .read_folio = netfs_read_folio, - .readahead = netfs_readahead, - .dirty_folio = netfs_dirty_folio, - .writepage = v9fs_vfs_writepage, - .write_begin = v9fs_write_begin, - .write_end = v9fs_write_end, - .release_folio = netfs_release_folio, - .invalidate_folio = netfs_invalidate_folio, - .launder_folio = v9fs_launder_folio, - .direct_IO = v9fs_direct_IO, + .read_folio = netfs_read_folio, + .readahead = netfs_readahead, + .dirty_folio = netfs_dirty_folio, + .release_folio = netfs_release_folio, + .invalidate_folio = netfs_invalidate_folio, + .launder_folio = netfs_launder_folio, + .direct_IO = noop_direct_IO, + .writepages = netfs_writepages, };
fs/9p/vfs_file.c +9 -80
116 lines not on this page · raw message
fs/9p/vfs_inode.c +2 -3
@@ -374,10 +374,8 @@ void v9fs_evict_inode(struct inode *inode)truncate_inode_pages_final (&inode->i_data); -#ifdef CONFIG_9P_FSCACHE version =cpu_to_le32 (v9inode->qid.version);netfs_clear_inode_writeback (inode, &version); -#endif clear_inode (inode);filemap_fdatawrite (&inode->i_data);
@@ -1112,7 +1110,7 @@ static int v9fs_vfs_setattr(struct mnt_idmap *idmap,if ((iattr->ia_valid &ATTR_SIZE ) && iattr->ia_size !=i_size_read (inode)) {truncate_setsize (inode, iattr->ia_size); -truncate_pagecache (inode, iattr->ia_size); +netfs_resize_file (netfs_inode (inode), iattr->ia_size, true);#ifdef CONFIG_9P_FSCACHE if (v9ses->cache &CACHE_FSCACHE ) {
@@ -1180,6 +1178,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, mode |= inode->i_mode & ~S_IALLUGO ; inode->i_mode = mode; + v9inode->netfs.remote_i_size = stat->length;if (!(flags &V9FS_STAT2INODE_KEEP_ISIZE ))v9fs_i_size_write (inode, stat->length);/* not real number of blocks, but 512 byte ones ... */
fs/9p/vfs_inode_dotl.c +5 -2
@@ -598,7 +598,7 @@ int v9fs_vfs_setattr_dotl(struct mnt_idmap *idmap,if ((iattr->ia_valid &ATTR_SIZE ) && iattr->ia_size !=i_size_read (inode)) {truncate_setsize (inode, iattr->ia_size); -truncate_pagecache (inode, iattr->ia_size); +netfs_resize_file (netfs_inode (inode), iattr->ia_size, true);#ifdef CONFIG_9P_FSCACHE if (v9ses->cache &CACHE_FSCACHE )
@@ -655,6 +655,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode, mode |= inode->i_mode & ~S_IALLUGO ; inode->i_mode = mode; + v9inode->netfs.remote_i_size = stat->st_size;if (!(flags &V9FS_STAT2INODE_KEEP_ISIZE ))v9fs_i_size_write (inode, stat->st_size); inode->i_blocks = stat->st_blocks;
@@ -683,8 +684,10 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode, inode->i_mode = mode; }if (!(flags &V9FS_STAT2INODE_KEEP_ISIZE ) && - stat->st_result_mask &P9_STATS_SIZE ) + stat->st_result_mask &P9_STATS_SIZE ) { + v9inode->netfs.remote_i_size = stat->st_size;v9fs_i_size_write (inode, stat->st_size); + }if (stat->st_result_mask &P9_STATS_BLOCKS ) inode->i_blocks = stat->st_blocks; }
David Howells
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
Hi Eric, Latchesar, Dominique,
Would you have any chance to look at the 9p patch before the merge window opens? If not, what should I do with the patch? Should I keep it, or should I drop it for now and give it to you to take through the 9p tree if Linus accepts the rest of the patchset?
Thanks,
David
David Howells
maintainerPATCH 1/1 9p: Fix initialisation of netfs_inode for 9p
In reply to David HowellsThis needs a fix that I would fold in. Somehow it gets through xfstests without it, but it seems problems can be caused with executables.
David
---
9p: Fix initialisation of netfs_inode for 9p
The 9p filesystem is calling netfs_inode_init() in v9fs_init_inode() - before the struct inode fields have been initialised from the obtained file stats (ie. after v9fs_stat2inode*() has been called), but netfslib wants to set a couple of its fields from i_size.
--- fs/9p/v9fs_vfs.h | 1 + fs/9p/vfs_inode.c | 6 +++--- fs/9p/vfs_inode_dotl.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-)
fs/9p/v9fs_vfs.h +1 -0
@@ -42,6 +42,7 @@ struct inode *v9fs_alloc_inode(struct super_block *sb);void v9fs_free_inode (struct inode *inode);struct inode *v9fs_get_inode (struct super_block *sb,umode_t mode,dev_t rdev); +void v9fs_set_netfs_context (struct inode *inode);int v9fs_init_inode (struct v9fs_session_info *v9ses,struct inode *inode,umode_t mode,dev_t rdev);void v9fs_evict_inode (struct inode *inode);
fs/9p/vfs_inode.c +3 -3
@@ -246,7 +246,7 @@ void v9fs_free_inode(struct inode *inode)/* * Set parameters for the netfs library */ -static void v9fs_set_netfs_context (struct inode *inode) +void v9fs_set_netfs_context (struct inode *inode) {struct v9fs_inode *v9inode =V9FS_I (inode);netfs_inode_init (&v9inode->netfs, &v9fs_req_ops, true);
@@ -326,8 +326,6 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses, err = -EINVAL ; goto error; } - -v9fs_set_netfs_context (inode); error:return err;
@@ -359,6 +357,7 @@ struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode, dev_t rdev)iput (inode);return ERR_PTR (err); } +v9fs_set_netfs_context (inode);return inode; }
@@ -461,6 +460,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, goto error;v9fs_stat2inode (st, inode, sb,0 ); +v9fs_set_netfs_context (inode);v9fs_cache_inode_get_cookie (inode);unlock_new_inode (inode);return inode;
fs/9p/vfs_inode_dotl.c +1 -0
@@ -128,6 +128,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb, goto error;v9fs_stat2inode_dotl (st, inode,0 ); +v9fs_set_netfs_context (inode);v9fs_cache_inode_get_cookie (inode); retval =v9fs_get_acl (inode, fid);if (retval)
Re: [PATCH] 9p: Fix initialisation of netfs_inode for 9p
David Howells wrote on Tue, Jan 02, 2024 at 09:49:39PM +0000:
Quoted 2 lines
This needs a fix that I would fold in. Somehow it gets through xfstests without it, but it seems problems can be caused with executables.
Looking at a file without that patch we seem to be reading just zeroes off pre-existing files; I'm surprised xfstest doesn't have a write something/umount/mount/check content is identical test...
(You're probably aware of this, but note for others this breaks with the rest of the patch series even if the big 9p patch isn't applied -- this is the main reason I'd rather just get the patch in this cycle, as the new patches got more tests with the full series than with the 9p writes patch dropped.)
Quoted 6 lines
9p: Fix initialisation of
netfs_inodefor 9pThe 9p filesystem is calling
netfs_inode_init()inv9fs_init_inode()- before the struct inode fields have been initialised from the obtained file stats (ie. after v9fs_stat2inode*() has been called), but netfslib wants to set a couple of its fields fromi_size.
Would it make sense to just always update netfs's ctx->remote_i_size in the various stat2inode calls instead?
We don't have any cache coherency so if a file changes beneath us through an edit on the server (or through another client) hell will break loose anyway, but stat would update the inode's i_size so it'll likely be weird that the remote_i_size doesn't get updated.
Quoted 6 lines
Reported-by Marc Dionne <[email protected]>Signed-off-by David Howells <[email protected]>Tested-by Marc Dionne <[email protected]>cc Eric Van Hensbergen <[email protected]>cc Latchesar Ionkov <[email protected]>cc Dominique Martinet <[email protected]>
With that being said, it seems to do the immediate job:
Signature · 1 line
Dominique Martinet | Asmadeus
David Howells
maintainerRe: [PATCH] 9p: Fix initialisation of netfs_inode for 9p
Quoted 2 lines · Dominique Martinet
Would it make sense to just always update netfs's
ctx->remote_i_sizein the various stat2inode calls instead?
Yeah, that's probably a good idea.
David
David Howells
maintainerRe: [PATCH] 9p: Fix initialisation of netfs_inode for 9p
In reply to Dominique MartinetQuoted 2 lines · Dominique Martinet
Would it make sense to just always update netfs's
ctx->remote_i_sizein the various stat2inode calls instead?
Btw, v9fs_i_size_write() should be redundant. It should be sufficient to just use i_size_write() as long as you use i_size_read().
David
Re: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
In reply to David HowellsDavid Howells wrote on Thu, Dec 21, 2023 at 01:23:35PM +0000:
Quoted 11 lines
Use netfslib's read and write iteration helpers, allowing netfslib to take over the management of the page cache for 9p files and to manage local disk caching. In particular, this eliminates
write_begin,write_end, writepage and all mentions of struct page and struct folio from 9p.Note that netfslib now offers the possibility of write-through caching if that is desirable for 9p: just set the
NETFS_ICTX_WRITETHROUGHflag inv9inode->netfs.flagsinv9fs_set_netfs_context().Note also this is untested as I can't get ganesha.nfsd to correctly parse the config to turn on 9p support.
(that's appparently no longer true and might need updating)
Quoted 5 lines
Signed-off-by David Howells <[email protected]>Reviewed-by Jeff Layton <[email protected]>cc Eric Van Hensbergen <[email protected]>cc Latchesar Ionkov <[email protected]>cc Dominique Martinet <[email protected]>
At quite high level, I've played with this a bit and see no obvious regression with the extra patch
I've also manually confirmed one of the big improvements I'd been asking for (that writes in cached modes, which used to be chunked to 4k, and are now properly aggregated, so e.g 'dd bs=1M count=1' will properly issue a minimal number of TWRITE calls capped by msize) -- this is great!
I've noticed we don't cache xattrs are all, so with the default mount options on a kernel built with 9P_FS_SECURITY we'll get a gazillion lookups for security.capabilities... But that's another problem, and this is still an improvement so no reason to hold back.
I've got a couple of questions below, but:
(I'd still be extremly thanksful if Christian and/or Eric would have time to check as well, but I won't push back to merging it this merge window next week if they don't have time... I'll also keep trying to run some more tests as time allows)
Quoted 28 lines
cc Christian Schoenebeck <[email protected]>---
Notes:
Changes
=======
ver #5)
- Added some missingremote_i_sizesetting.
- Added missing writepages (else mmap write never written back).fs/9p/vfs_addr.c | 293 ++++++++++------------------------------- fs/9p/vfs_file.c | 89 ++----------- fs/9p/vfs_inode.c | 5 +- fs/9p/vfs_inode_dotl.c | 7 +- 4 files changed, 85 insertions(+), 309 deletions(-)fs/9p/vfs_addr.c +1
-0@@ -19,12 +19,48 @@#include <linux/netfs.h> #include <net/9p/9p.h> #include <net/9p/client.h> +#include <trace/events/netfs.h>
fs/9p/vfs_addr.c line 32
Quoted 10 lines
fs/9p/vfs_addr.c +4
-0#include "v9fs.h" #include "v9fs_vfs.h" #include "cache.h" #include "fid.h" +static void v9fs_upload_to_server (struct netfs_io_subrequest *subreq) +{ +struct inode *inode = subreq->rreq->inode; +struct v9fs_inode __maybe_unused *v9inode =V9FS_I (inode);
Any reason to have this variable assignment at all?
(I assume it'll get optimized away, but it looks like that's not a maybe here so was a bit surprised -- I guess it's just been copy-pasted from the old code getting the fscache cookie?)
fs/9p/vfs_addr.c line 37
Quoted 5 lines
fs/9p/vfs_addr.c +5
-0+struct p9_fid *fid = subreq->rreq->netfs_priv; +int err; + +trace_netfs_sreq (subreq, netfs_sreq_trace_submit); +p9_client_write (fid, subreq->start, &subreq->io_iter, &err);
p9_client_write return value should always be subreq->len, but I believe we should use it unless err is set.
(It's also possible for partial writes to happen, e.g. p9_client_write looped a few times and then failed, at which point the size returned would be the amount that actually got through -- we probably should do something with that?)
Quoted 33 lines
fs/9p/vfs_addr.c +26
-0+netfs_write_subrequest_terminated (subreq, err <0 ? err : subreq->len, + false); +} + +static void v9fs_upload_to_server_worker (struct work_struct *work) +{ +struct netfs_io_subrequest *subreq = + container_of(work, struct netfs_io_subrequest, work); + +v9fs_upload_to_server (subreq); +} + +/* +* Set up write requests for a writeback slice. We need to add a write request +* for each write we want to make. +*/ +static void v9fs_create_write_requests (struct netfs_io_request *wreq,loff_t start,size_t len) +{ +struct netfs_io_subrequest *subreq; + + subreq =netfs_create_write_request (wreq,NETFS_UPLOAD_TO_SERVER , + start, len, v9fs_upload_to_server_worker); +if (subreq) +netfs_queue_write_request (subreq); +} +/** * v9fs_issue_read - Issue a read from 9P * @subreq: The read to make @@ -33,14 +69,10 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq) {struct netfs_io_request *rreq = subreq->rreq;struct p9_fid *fid = rreq->netfs_priv;
fs/9p/vfs_addr.c static void v9fs_issue_read(struct netfs_io_subrequest *subreq) · line 75
Quoted 10 lines
fs/9p/vfs_addr.c +2
-6-struct iov_iter to; -loff_t pos = subreq->start + subreq->transferred; -size_t len = subreq->len - subreq->transferred;int total, err; -iov_iter_xarray (&to,ITER_DEST , &rreq->mapping->i_pages, pos, len); - - total =p9_client_read (fid, pos, &to, &err); + total =p9_client_read (fid, subreq->start + subreq->transferred, + &subreq->io_iter, &err);
Just to clarify: subreq->io_iter didn't exist (or some conditions to use it weren't cleared) before?
Quoted 18 lines
fs/9p/vfs_addr.c +2
-4/* if we just extended the file size, any portion not in * cache won't be on server and is zeroes */ @@ -50,23 +82,37 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq) }/** -* v9fs_init_request - Initialise a read request +* v9fs_init_request - Initialise a request * @rreq: The read request * @file: The file being read from */ static int v9fs_init_request (struct netfs_io_request *rreq,struct file *file) { -struct p9_fid *fid = file->private_data; - -BUG_ON (!fid); +struct p9_fid *fid;
fs/9p/vfs_addr.c static void v9fs_issue_read(struct netfs_io_subrequest *subreq) · line 101
Quoted 10 lines
fs/9p/vfs_addr.c +10
-0+bool writing = (rreq->origin ==NETFS_READ_FOR_WRITE || + rreq->origin ==NETFS_WRITEBACK || + rreq->origin ==NETFS_WRITETHROUGH || + rreq->origin ==NETFS_LAUNDER_WRITE || + rreq->origin ==NETFS_UNBUFFERED_WRITE || + rreq->origin ==NETFS_DIO_WRITE ); + +if (file) { + fid = file->private_data; +BUG_ON (!fid);
This probably should be WARN + return EINVAL like find by inode? It's certainly a huge problem, but we should avoid BUG if possible...
fs/9p/vfs_addr.c static void v9fs_issue_read(struct netfs_io_subrequest *subreq) · line 107
Quoted 6 lines
fs/9p/vfs_addr.c +6
-0+p9_fid_get (fid); + }else { + fid =v9fs_fid_find_inode (rreq->inode, writing,INVALID_UID , true); +if (!fid) { +WARN_ONCE (1 ,"folio expected an open fid inode->i_private=%p\n" , + rreq->inode->i_private);
nit: not sure what's cleaner?
Since there's a message that makes for a bit awkward if...
if (WARN_ONCE(!fid, "folio expected an open fid inode->i_private=%p\n",
rreq->inode->i_private)) return -EINVAL;
(as a side note, I'm not sure what to make of this i_private pointer here, but if that'll help you figure something out sure..)
fs/9p/vfs_addr.c static void v9fs_issue_read(struct netfs_io_subrequest *subreq) · line 115
Quoted 12 lines
fs/9p/vfs_addr.c +4
-4+return -EINVAL ; + } + }/* we might need to read from a fid that was opened write-only * for read-modify-write of page cache, use the writeback fid * for that */ -WARN_ON (rreq->origin ==NETFS_READ_FOR_WRITE && - !(fid->mode &P9_ORDWR )); - -p9_fid_get (fid); +WARN_ON (writing && !(fid->mode &P9_ORDWR ));
This is as follow on your netfs-lib branch:
- WARN_ON(rreq->origin == NETFS_READ_FOR_WRITE &&
- !(fid->mode & P9_ORDWR));
-
- p9_fid_get(fid);
+ WARN_ON(rreq->origin == NETFS_READ_FOR_WRITE && !(fid->mode & P9_ORDWR));
So the WARN_ON has been reverted back with only indentation changed; I guess there were patterns that were writing despite the fid not having been open as RDWR?
Do you still have details about these?
If a file has been open without the write bit it might not go through, and it's incredibly difficult to get such users back to userspace in async cases (e.g. mmap flushes), so would like to understand that.
Quoted 23 lines
fs/9p/vfs_addr.c +0
-0rreq->netfs_priv = fid;return 0 ; }fs/9p/vfs_file.c +0
-8@@ -353,25 +353,15 @@ static ssize_t v9fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) { struct p9_fid *fid = iocb->ki_filp->private_data; -int ret, err =0 ;p9_debug (P9_DEBUG_VFS ,"fid %d count %zu offset %lld\n" , fid->fid,iov_iter_count (to), iocb->ki_pos); -if (!(fid->mode &P9L_DIRECT )) { -p9_debug (P9_DEBUG_VFS ,"(cached)\n" ); -return generic_file_read_iter (iocb, to); - } - -if (iocb->ki_filp->f_flags &O_NONBLOCK ) - ret =p9_client_read_once (fid, iocb->ki_pos, to, &err);
fs/9p/vfs_file.c static ssize_t · line 363
Quoted 10 lines
fs/9p/vfs_file.c +3
-6-else - ret =p9_client_read (fid, iocb->ki_pos, to, &err); -if (!ret) -return err; +if (fid->mode &P9L_DIRECT ) +return netfs_unbuffered_read_iter (iocb, to); - iocb->ki_pos += ret; -return ret; +p9_debug (P9_DEBUG_VFS ,"(cached)\n" );
(Not a new problem so no need to address here, but having just "(cached)" on a split line is a bit weird.. We first compute cached or not as a bool and make it %s + cached ? " (cached)" : "" or something... I'll send a patch after this gets in to avoid conflicts)
Quoted 80 lines
fs/9p/vfs_file.c +5
-57+return netfs_file_read_iter (iocb, to); }/* @@ -407,46 +397,14 @@ v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) {struct file *file = iocb->ki_filp;struct p9_fid *fid = file->private_data; -ssize_t retval; -loff_t origin; -int err =0 ;p9_debug (P9_DEBUG_VFS ,"fid %d\n" , fid->fid); -if (!(fid->mode & (P9L_DIRECT |P9L_NOWRITECACHE ))) { -p9_debug (P9_DEBUG_CACHE ,"(cached)\n" ); -return generic_file_write_iter (iocb, from); - } +if (fid->mode & (P9L_DIRECT |P9L_NOWRITECACHE )) +return netfs_unbuffered_write_iter (iocb, from); - retval =generic_write_checks (iocb, from); -if (retval <=0 ) -return retval; - - origin = iocb->ki_pos; - retval =p9_client_write (file->private_data, iocb->ki_pos, from, &err); -if (retval >0 ) { -struct inode *inode =file_inode (file); -loff_t i_size; -unsigned long pg_start, pg_end; - - pg_start = origin >>PAGE_SHIFT ; - pg_end = (origin + retval -1 ) >>PAGE_SHIFT ; -if (inode->i_mapping && inode->i_mapping->nrpages) -invalidate_inode_pages2_range (inode->i_mapping, - pg_start, pg_end); - iocb->ki_pos += retval; - i_size =i_size_read (inode); -if (iocb->ki_pos > i_size) { -inode_add_bytes (inode, iocb->ki_pos - i_size); -/* -* Need to serialize against i_size_write() in -* v9fs_stat2inode() -*/ -v9fs_i_size_write (inode, iocb->ki_pos); - } -return retval; - } -return err; +p9_debug (P9_DEBUG_CACHE ,"(cached)\n" ); +return netfs_file_write_iter (iocb, from); } static int v9fs_file_fsync(struct file *filp, loff_t start, loff_t end,@@ -519,36 +477,7 @@ v9fs_file_mmap(struct file *filp, struct vm_area_struct *vma)static vm_fault_t v9fs_vm_page_mkwrite (struct vm_fault *vmf) { -struct folio *folio =page_folio (vmf->page); -struct file *filp = vmf->vma->vm_file; -struct inode *inode =file_inode (filp); - - -p9_debug (P9_DEBUG_VFS ,"folio %p fid %lx\n" , - folio, (unsigned long )filp->private_data); - -/* Wait for the page to be written to the cache before we allow it to -* be modified. We then assume the entire page will need writing back. -*/ -#ifdef CONFIG_9P_FSCACHE -if (folio_test_fscache (folio) && -folio_wait_fscache_killable (folio) <0 ) -return VM_FAULT_NOPAGE ; -#endif - -/* Update file times before taking page lock */ -file_update_time (filp); - -if (folio_lock_killable (folio) <0 )
fs/9p/vfs_file.c v9fs_file_mmap(struct file *filp, struct vm_area_struct *vma) · line 480
Quoted 10 lines
fs/9p/vfs_file.c +1
-9-return VM_FAULT_RETRY ; -if (folio_mapping (folio) != inode->i_mapping) - goto out_unlock; -folio_wait_stable (folio); - -return VM_FAULT_LOCKED ; -out_unlock: -folio_unlock (folio); -return VM_FAULT_NOPAGE ; +return netfs_page_mkwrite (vmf,NULL );
(I guess there's no helper that could be used directly in .page_mkwrite op?)
Quoted 69 lines
fs/9p/vfs_file.c +0
-0}static void v9fs_mmap_vm_close (struct vm_area_struct *vma)fs/9p/vfs_inode.c +2
-3@@ -374,10 +374,8 @@ void v9fs_evict_inode(struct inode *inode)truncate_inode_pages_final (&inode->i_data); -#ifdef CONFIG_9P_FSCACHE version =cpu_to_le32 (v9inode->qid.version);netfs_clear_inode_writeback (inode, &version); -#endif clear_inode (inode);filemap_fdatawrite (&inode->i_data);@@ -1112,7 +1110,7 @@ static int v9fs_vfs_setattr(struct mnt_idmap *idmap,if ((iattr->ia_valid &ATTR_SIZE ) && iattr->ia_size !=i_size_read (inode)) {truncate_setsize (inode, iattr->ia_size); -truncate_pagecache (inode, iattr->ia_size); +netfs_resize_file (netfs_inode (inode), iattr->ia_size, true);#ifdef CONFIG_9P_FSCACHE if (v9ses->cache &CACHE_FSCACHE ) {@@ -1180,6 +1178,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, mode |= inode->i_mode & ~S_IALLUGO ; inode->i_mode = mode; + v9inode->netfs.remote_i_size = stat->length;if (!(flags &V9FS_STAT2INODE_KEEP_ISIZE ))v9fs_i_size_write (inode, stat->length);/* not real number of blocks, but 512 byte ones ... */ fs/9p/vfs_inode_dotl.c +5
-2@@ -598,7 +598,7 @@ int v9fs_vfs_setattr_dotl(struct mnt_idmap *idmap,if ((iattr->ia_valid &ATTR_SIZE ) && iattr->ia_size !=i_size_read (inode)) {truncate_setsize (inode, iattr->ia_size); -truncate_pagecache (inode, iattr->ia_size); +netfs_resize_file (netfs_inode (inode), iattr->ia_size, true);#ifdef CONFIG_9P_FSCACHE if (v9ses->cache &CACHE_FSCACHE )@@ -655,6 +655,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode, mode |= inode->i_mode & ~S_IALLUGO ; inode->i_mode = mode; + v9inode->netfs.remote_i_size = stat->st_size;if (!(flags &V9FS_STAT2INODE_KEEP_ISIZE ))v9fs_i_size_write (inode, stat->st_size); inode->i_blocks = stat->st_blocks;@@ -683,8 +684,10 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode, inode->i_mode = mode; }if (!(flags &V9FS_STAT2INODE_KEEP_ISIZE ) && - stat->st_result_mask &P9_STATS_SIZE ) + stat->st_result_mask &P9_STATS_SIZE ) { + v9inode->netfs.remote_i_size = stat->st_size;v9fs_i_size_write (inode, stat->st_size); + }if (stat->st_result_mask &P9_STATS_BLOCKS ) inode->i_blocks = stat->st_blocks; }
Signature · 1 line
Dominique Martinet | Asmadeus
David Howells
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
Quoted 5 lines · Dominique Martinet
I've also manually confirmed one of the big improvements I'd been asking for (that writes in cached modes, which used to be chunked to 4k, and are now properly aggregated, so e.g 'dd bs=1M count=1' will properly issue a minimal number of TWRITE calls capped by msize) -- this is great!
After the merge window, we can look at enabling multipage folios for 9p.
Quoted 1 line
I've noticed we don't cache xattrs are all,
I haven't given this any particular thought. We could attach them to the cachefile object as xattrs, but it means you have to do two xattr lookups in the event of a cache miss.
At this point, I'm going to ask Christian to stack the extra patch on his branch rather than folding it down and retagging.
Quoted 1 line
I've got a couple of questions below, but:
I'll address those separately.
Quoted 2 lines
Tested-by Dominique Martinet <[email protected]>
Thanks!
David
David Howells
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
In reply to Dominique MartinetQuoted 6 lines · Dominique Martinet
fs/9p/vfs_addr.c line 32
Quoted 4 lines
fs/9p/vfs_addr.c +4
-0+static void v9fs_upload_to_server (struct netfs_io_subrequest *subreq) +{ +struct inode *inode = subreq->rreq->inode; +struct v9fs_inode __maybe_unused *v9inode =V9FS_I (inode);Any reason to have this variable assignment at all?
I'll just remove it. The __maybe_unused suppressed the warning, otherwise I'd have removed it already.
Quoted 6 lines
p9_client_writereturn value should always besubreq->len, but I believe we should use it unless err is set.
(It's also possible for partial writes to happen, e.g.p9_client_writelooped a few times and then failed, at which point the size returned would be the amount that actually got through -- we probably should do something with that?)
How about something like:
- int err;
+ int err, len;
trace_netfs_sreq(subreq, netfs_sreq_trace_submit);
- p9_client_write(fid, subreq->start, &subreq->io_iter, &err);
- netfs_write_subrequest_terminated(subreq, err < 0 ? err : subreq->len,
- false);
+ len = p9_client_write(fid, subreq->start, &subreq->io_iter, &err);
+ netfs_write_subrequest_terminated(subreq, len ?: err, false);
Quoted 5 lines
fs/9p/vfs_addr.c static void v9fs_issue_read(struct netfs_io_subrequest *subreq) · line 75
Quoted 2 lines
fs/9p/vfs_addr.c +2
-0+ total =p9_client_read (fid, subreq->start + subreq->transferred, + &subreq->io_iter, &err);Just to clarify:
subreq->io_iterdidn't exist (or some conditions to use it weren't cleared) before?
Correct. It's added in the netfs-lib patches. I've provided a way to separate the user-side iterator from the I/O-side iterator to allow the use of a bounce buffer for the purpose of content crypto, compression or just having to deal with RMW cycles to a larger block size on the server.
Quoted 6 lines
fs/9p/vfs_addr.c static void v9fs_issue_read(struct netfs_io_subrequest *subreq) · line 101
Quoted 3 lines
fs/9p/vfs_addr.c +3
-0+if (file) { + fid = file->private_data; +BUG_ON (!fid);This probably should be WARN + return EINVAL like find by inode? It's certainly a huge problem, but we should avoid BUG if possible...
Sure. The BUG_ON() was already there, but I can turn it into a WARN+error.
Quoted 9 lines
nit: not sure what's cleaner?
Since there's a message that makes for a bit awkward if...if (WARN_ONCE(!fid, "folio expected an open fid inode->i_private=%p\n",
rreq->inode->i_private)) return -EINVAL;(as a side note, I'm not sure what to make of this
i_privatepointer here, but if that'll help you figure something out sure..)
Um. 9p is using i_private. But perhaps i_ino would be a better choice:
if (file) {
fid = file->private_data;
if (!fid)
goto no_fid;
p9_fid_get(fid);
} else {
fid = v9fs_fid_find_inode(rreq->inode, writing, INVALID_UID, true);
if (!fid)
goto no_fid;
}
...no_fid:
WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n", rreq->inode->i_ino); return -EINVAL;
Quoted 11 lines
This is as follow on your netfs-lib branch:
fs/9p/vfs_addr.c +1
-4-WARN_ON (rreq->origin ==NETFS_READ_FOR_WRITE && - !(fid->mode &P9_ORDWR )); - -p9_fid_get (fid); +WARN_ON (rreq->origin ==NETFS_READ_FOR_WRITE && !(fid->mode &P9_ORDWR ));So the
WARN_ONhas been reverted back with only indentation changed; I guess there were patterns that were writing despite the fid not having been open as RDWR?
Do you still have details about these?
The condition in the WARN_ON() here got changed. It was:
WARN_ON(writing && ...
at one point, but that caused a bunch of incorrect warning to appear because only NETFS_READ_FOR_WRITE requires read-access as well as write-access. All the others:
bool writing = (rreq->origin == NETFS_READ_FOR_WRITE || rreq->origin == NETFS_WRITEBACK || rreq->origin == NETFS_WRITETHROUGH || rreq->origin == NETFS_LAUNDER_WRITE || rreq->origin == NETFS_UNBUFFERED_WRITE || rreq->origin == NETFS_DIO_WRITE);
only require write-access.
There will be an additional one if we roll out content crypto to 9p as we may need to do RMW cycles occasionally - but that's off to one side just for the moment.
Quoted 3 lines
If a file has been open without the write bit it might not go through, and it's incredibly difficult to get such users back to userspace in async cases (e.g. mmap flushes), so would like to understand that.
The VFS/VM should prevent writing to files that aren't open O_WRONLY or O_RDWR, so I don't think we should be called in otherwise.
Note that I'm intending to change the way fscache is driven when we fetch cacheable data from the server so that I can free up the PG_fscache bit and return it to the MM folks. Instead of marking the page PG_fscache, I mark it PG_dirty and set page->private with a special value to indicate it should only be written to the cache - then the writepages sees that and just writes these pages to the cache. I have a patch to do this and it seems to work, but I need to make ceph and cifs use netfslib before I can apply it.
Quoted 6 lines
fs/9p/vfs_file.c static ssize_t · line 363
Quoted 1 line
fs/9p/vfs_file.c +1
-0+p9_debug (P9_DEBUG_VFS ,"(cached)\n" );(Not a new problem so no need to address here, but having just "(cached)" on a split line is a bit weird.. We first compute cached or not as a bool and make it %s + cached ? " (cached)" : "" or something... I'll send a patch after this gets in to avoid conflicts)
Okay.
Quoted 4 lines
fs/9p/vfs_file.c v9fs_file_mmap(struct file *filp, struct vm_area_struct *vma) · line 480
Quoted 1 line
fs/9p/vfs_file.c +1
-0+return netfs_page_mkwrite (vmf,NULL );(I guess there's no helper that could be used directly in .page_mkwrite op?)
I could provide a helper that just supplies NULL as the second argument. I think only 9p will use it, but that's fine.
David
Dominique Martinet
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
David Howells wrote on Wed, Jan 03, 2024 at 12:39:34PM +0000:
Quoted 9 lines
Quoted 6 lines
p9_client_writereturn value should always besubreq->len, but I believe we should use it unless err is set.
(It's also possible for partial writes to happen, e.g.p9_client_writelooped a few times and then failed, at which point the size returned would be the amount that actually got through -- we probably should do something with that?)How about something like:
Review
Quoted 9 lines
(quoted diff) +3
-4- int err; + int err, len; trace_netfs_sreq(subreq, netfs_sreq_trace_submit); - p9_client_write(fid, subreq->start, &subreq->io_iter, &err); - netfs_write_subrequest_terminated(subreq, err < 0 ? err : subreq->len, - false); + len = p9_client_write(fid, subreq->start, &subreq->io_iter, &err); + netfs_write_subrequest_terminated(subreq, len ?: err, false);
I think that'll be fine; plain write() syscall works like this when an error happens after some data has been flushed, and I assume there'll be some retry if this happpened on something like a flush dirty and it got a partial write reported?
Quoted 8 lines
Quoted 6 lines
fs/9p/vfs_addr.c static void v9fs_issue_read(struct netfs_io_subrequest *subreq) · line 101
Quoted 3 lines
fs/9p/vfs_addr.c +3
-0+if (file) { + fid = file->private_data; +BUG_ON (!fid);This probably should be WARN + return EINVAL like find by inode? It's certainly a huge problem, but we should avoid BUG if possible...
Sure. The
BUG_ON()was already there, but I can turn it into a WARN+error.
Thanks.
Quoted 25 lines
Quoted 9 lines
nit: not sure what's cleaner?
Since there's a message that makes for a bit awkward if...if (WARN_ONCE(!fid, "folio expected an open fid inode->i_private=%p\n",
rreq->inode->i_private)) return -EINVAL;(as a side note, I'm not sure what to make of this
i_privatepointer here, but if that'll help you figure something out sure..)Um. 9p is using
i_private. But perhapsi_inowould be a better choice:if (file) { fid = file->private_data; if (!fid) goto no_fid; p9_fid_get(fid); } else { fid = v9fs_fid_find_inode(rreq->inode, writing, INVALID_UID, true); if (!fid) goto no_fid; } ...
Quoted 4 lines
no_fid:WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n", rreq->inode->i_ino); return -EINVAL;
Might be useful to track down if this came frm a file without private data or lookup failing, but given this was a bug I guess we can deal with that when that happens -- ack.
Quoted 20 lines
Quoted 11 lines
This is as follow on your netfs-lib branch:
fs/9p/vfs_addr.c +1
-4-WARN_ON (rreq->origin ==NETFS_READ_FOR_WRITE && - !(fid->mode &P9_ORDWR )); - -p9_fid_get (fid); +WARN_ON (rreq->origin ==NETFS_READ_FOR_WRITE && !(fid->mode &P9_ORDWR ));So the
WARN_ONhas been reverted back with only indentation changed; I guess there were patterns that were writing despite the fid not having been open as RDWR?
Do you still have details about these?The condition in the
WARN_ON()here got changed. It was:WARN_ON(writing && ...at one point, but that caused a bunch of incorrect warning to appear because only
NETFS_READ_FOR_WRITErequires read-access as well as write-access. All the others:
Quoted 8 lines
bool writing = (rreq->origin == NETFS_READ_FOR_WRITE || rreq->origin == NETFS_WRITEBACK || rreq->origin == NETFS_WRITETHROUGH || rreq->origin == NETFS_LAUNDER_WRITE || rreq->origin == NETFS_UNBUFFERED_WRITE || rreq->origin == NETFS_DIO_WRITE);only require write-access.
Thanks for clarifying
Quoted 6 lines
Quoted 3 lines
If a file has been open without the write bit it might not go through, and it's incredibly difficult to get such users back to userspace in async cases (e.g. mmap flushes), so would like to understand that.
The VFS/VM should prevent writing to files that aren't open
O_WRONLYorO_RDWR, so I don't think we should be called in otherwise.
Historically this check was more about finding a fid that wasn't opened properly than the VFS doing something weird (e.g. by calling mprotect after mmap and us missing that -- would need to check if that works actually...)
Quoted 7 lines
Quoted 4 lines
fs/9p/vfs_file.c v9fs_file_mmap(struct file *filp, struct vm_area_struct *vma) · line 480
Quoted 1 line
fs/9p/vfs_file.c +1
-0+return netfs_page_mkwrite (vmf,NULL );(I guess there's no helper that could be used directly in .page_mkwrite op?)
I could provide a helper that just supplies NULL as the second argument. I think only 9p will use it, but that's fine.
If we're the only user I guess we shouldn't bother with it at this point, we can come back to it if this ever becomes common.
Signature · 1 line
Dominique Martinet | Asmadeus
Eric Van Hensbergen
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
In reply to Dominique MartinetQuoted 7 lines · Dominique Martinet
David Howells wrote on Thu, Dec 21, 2023 at 01:23:35PM +0000:
I've noticed we don't cache xattrs are all, so with the default mount options on a kernel built with 9P_FS_SECURITY we'll get a gazillion lookups for security.capabilities... But that's another problem, and this is still an improvement so no reason to hold back.
This is a big problem and already on my backlog list since some things default to this even if the remote file system doesn't support xattrs. The quick fix is to disable on a mount when we detect the host side isn't supporting them (of course this could be weird for exports that cross file system boundries) -- at the very least we could keep this info on an inode basis and not request as long as the inode info is cached. Caching the actual properties is also a step, but given this is a security feature, I imagine we don't want to trust our cache and will always have to ask server unless we can come up with something clever to indicate xattr changes (haven't looked into that much yet).
Quoted 6 lines
(I'd still be extremly thanksful if Christian and/or Eric would have time to check as well, but I won't push back to merging it this merge window next week if they don't have time... I'll also keep trying to run some more tests as time allows)
I'll try to run through my regression tests as well, but sure we can fix things up after the merge window if we miss things.
-eric
Re: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
In reply to David HowellsQuoted 11 lines · David Howells
Use netfslib's read and write iteration helpers, allowing netfslib to take over the management of the page cache for 9p files and to manage local disk caching. In particular, this eliminates
write_begin,write_end, writepage and all mentions of struct page and struct folio from 9p.Note that netfslib now offers the possibility of write-through caching if that is desirable for 9p: just set the
NETFS_ICTX_WRITETHROUGHflag inv9inode->netfs.flagsinv9fs_set_netfs_context().Note also this is untested as I can't get ganesha.nfsd to correctly parse the config to turn on 9p support.
It looks like this patch has introduced a regression with autopkgtest,
see: https://bugs.launchpad.net/bugs/2056461
I haven't looked at the details yet, I just did some bisecting and apparently reverting this one seems to fix the problem.
Let me know if you want me to test something in particular or if you already have a potential fix. Otherwise I'll take a look.
Thanks,
-Andrea
David Howells
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
Quoted 13 lines · Andrea Righi
Quoted 11 lines · David Howells
Use netfslib's read and write iteration helpers, allowing netfslib to take over the management of the page cache for 9p files and to manage local disk caching. In particular, this eliminates
write_begin,write_end, writepage and all mentions of struct page and struct folio from 9p.Note that netfslib now offers the possibility of write-through caching if that is desirable for 9p: just set the
NETFS_ICTX_WRITETHROUGHflag inv9inode->netfs.flagsinv9fs_set_netfs_context().Note also this is untested as I can't get ganesha.nfsd to correctly parse the config to turn on 9p support.
Quoted 8 lines
It looks like this patch has introduced a regression with autopkgtest,
see: https://bugs.launchpad.net/bugs/2056461I haven't looked at the details yet, I just did some bisecting and apparently reverting this one seems to fix the problem.
Let me know if you want me to test something in particular or if you already have a potential fix. Otherwise I'll take a look.
Do you have a reproducer?
I'll be at LSF next week, so if I can't fix it tomorrow, I won't be able to poke at it until after that.
David
Re: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
Quoted 24 lines · David Howells
Quoted 13 lines · Andrea Righi
Quoted 11 lines · David Howells
Use netfslib's read and write iteration helpers, allowing netfslib to take over the management of the page cache for 9p files and to manage local disk caching. In particular, this eliminates
write_begin,write_end, writepage and all mentions of struct page and struct folio from 9p.Note that netfslib now offers the possibility of write-through caching if that is desirable for 9p: just set the
NETFS_ICTX_WRITETHROUGHflag inv9inode->netfs.flagsinv9fs_set_netfs_context().Note also this is untested as I can't get ganesha.nfsd to correctly parse the config to turn on 9p support.
Quoted 8 lines
It looks like this patch has introduced a regression with autopkgtest,
see: https://bugs.launchpad.net/bugs/2056461I haven't looked at the details yet, I just did some bisecting and apparently reverting this one seems to fix the problem.
Let me know if you want me to test something in particular or if you already have a potential fix. Otherwise I'll take a look.
Quoted 6 lines
Do you have a reproducer?
I'll be at LSF next week, so if I can't fix it tomorrow, I won't be able to poke at it until after that.
David
The only reproducer that I have at the moment is the autopkgtest command mentioned in the bug, that is a bit convoluted, I'll try to see if I can better isolate the problem and find a simpler reproducer, but I'll also be travelling next week to a Canonical event.
At the moment I'll temporarily revert the commit (that seems to prevent the issue from happening) and I'll keep you posted if I find something.
Thanks,
-Andrea
David Howells
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
Quoted 4 lines · Andrea Righi
The only reproducer that I have at the moment is the autopkgtest command mentioned in the bug, that is a bit convoluted, I'll try to see if I can better isolate the problem and find a simpler reproducer, but I'll also be travelling next week to a Canonical event.
Note that the netfslib has some tracepoints that might help debug it.
David
David Howells
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
In reply to Andrea RighiHi Andrea,
Note that there are changes to the netfslib write-side upstream and you might also want to apply the attached.
In https://bugs.launchpad.net/ubuntu/+source/autopkgtest/+bug/2056461 you say:
| It seems that kernel 6.8 introduced a regression in the 9pfs related to | caching and netfslib, that can cause some user-space apps to read content | from files that is not up-to-date (when they are used in a producer/consumer | fashion).
Can you clarify how these files are being used?
David
---
commit 39302c160390441ed5b4f4f7ad480c44eddf0962
Author: David Howells <[email protected]> Date: Wed May 22 17:30:22 2024 +0100
netfs, 9p: Fix race between umount and async request completion
There's a problem in 9p's interaction with netfslib whereby a crash occurs because the 9p_fid structs get forcibly destroyed during client teardown (without paying attention to their refcounts) before netfslib has finished with them. However, it's not a simple case of deferring the clunking that p9_fid_put() does as that requires the client.
The problem is that netfslib has to unlock pages and clear the IN_PROGRESS flag before destroying the objects involved - including the pid - and, in any case, nothing checks to see if writeback completed barring looking at the page flags.
Fix this by keeping a count of outstanding I/O requests (of any type) and waiting for it to quiesce during inode eviction.
fs/9p/vfs_inode.c +4 -1
@@ -354,6 +354,7 @@ void v9fs_evict_inode(struct inode *inode) version =cpu_to_le32 (v9inode->qid.version);netfs_clear_inode_writeback (inode, &version); +netfs_wait_for_outstanding_io (inode);clear_inode (inode);filemap_fdatawrite (&inode->i_data);
@@ -361,8 +362,10 @@ void v9fs_evict_inode(struct inode *inode)if (v9fs_inode_cookie (v9inode))fscache_relinquish_cookie (v9fs_inode_cookie (v9inode), false);#endif - }else + }else { +netfs_wait_for_outstanding_io (inode);clear_inode (inode); + } } struct inode *
fs/afs/inode.c +1 -0
@@ -652,6 +652,7 @@ void afs_evict_inode(struct inode *inode)afs_set_cache_aux (vnode, &aux);netfs_clear_inode_writeback (inode, &aux); +netfs_wait_for_outstanding_io (inode);clear_inode (inode);while (!list_empty (&vnode->wb_keys)) {
fs/netfs/objects.c +5 -0
@@ -72,6 +72,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, } } +atomic_inc (&ctx->io_count);trace_netfs_rreq_ref (rreq->debug_id,1 , netfs_rreq_trace_new);netfs_proc_add_rreq (rreq);netfs_stat (&netfs_n_rh_rreq);
@@ -124,6 +125,7 @@ static void netfs_free_request(struct work_struct *work) {struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work); +struct netfs_inode *ictx =netfs_inode (rreq->inode);unsigned int i;trace_netfs_rreq (rreq, netfs_rreq_trace_free);
@@ -142,6 +144,9 @@ static void netfs_free_request(struct work_struct *work) }kvfree (rreq->direct_bv); } + +if (atomic_dec_and_test (&ictx->io_count)) +wake_up_var (&ictx->io_count);call_rcu (&rreq->rcu, netfs_free_request_rcu); }
fs/smb/client/cifsfs.c +1 -0
@@ -435,6 +435,7 @@ cifs_evict_inode(struct inode *inode)if (inode->i_state &I_PINNING_NETFS_WB )cifs_fscache_unuse_inode_cookie (inode, true);cifs_fscache_release_inode_cookie (inode); +netfs_wait_for_outstanding_io (inode);clear_inode (inode); }
include/linux/netfs.h +18 -0
@@ -68,6 +68,7 @@ struct netfs_inode {loff_t remote_i_size;/* Size of the remote file */ loff_t zero_point;/* Size after which we assume there's no data * on the server */ +atomic_t io_count;/* Number of outstanding reqs */ unsigned long flags;#define NETFS_ICTX_ODIRECT 0/* The file has DIO in progress */ #define NETFS_ICTX_UNBUFFERED 1/* I/O should not use the pagecache */
@@ -474,6 +475,7 @@ static inline void netfs_inode_init(struct netfs_inode *ctx, ctx->remote_i_size =i_size_read (&ctx->inode); ctx->zero_point =LLONG_MAX ; ctx->flags =0 ; +atomic_set (&ctx->io_count,0 );#if IS_ENABLED (CONFIG_FSCACHE ) ctx->cache =NULL ;#endif
@@ -517,4 +519,20 @@ static inline struct fscache_cookie *netfs_i_cookie(struct netfs_inode *ctx) #endif } +/** +* netfs_wait_for_outstanding_io - Wait for outstanding I/O to complete +* @ctx: The netfs inode to wait on +* +* Wait for outstanding I/O requests of any type to complete. This is intended +* to be called from inode eviction routines. This makes sure that any +* resources held by those requests are cleaned up before we let the inode get +* cleaned up. +*/ +static inline void netfs_wait_for_outstanding_io (struct inode *inode) +{ +struct netfs_inode *ictx =netfs_inode (inode); + +wait_var_event (&ictx->io_count,atomic_read (&ictx->io_count) ==0 ); +} +#endif /* _LINUX_NETFS_H */
Re: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
Hi David,
Quoted 8 lines · David Howells
In https://bugs.launchpad.net/ubuntu/+source/autopkgtest/+bug/2056461 you say:
| It seems that kernel 6.8 introduced a regression in the 9pfs related to | caching and netfslib, that can cause some user-space apps to read content | from files that is not up-to-date (when they are used in a producer/consumer | fashion).Can you clarify how these files are being used?
I don't know the details of the 9pfs operations involved, but still I wanted to mention that to reliably reproduce the issue on a Debian system one can run:
autopkgtest-build-qemu unstable /tmp/sid.img
autopkgtest -ddd -B dpdk -- autopkgtest-virt-qemu --debug --show-boot /tmp/sid.img
If the kernel installed in the guest VM is affected by this problem, after a while the test hangs with something like:
autopkgtest-virt-qemu: DBG: executing copydown /tmp/alog/tests-tree/ /tmp/autopkgtest.uG6tsJ/build.6QA/src/ [...]
autopkgtest-virt-qemu: DBG: +>?
Full logs at https://people.debian.org/~ema/1072004-6.10-rc1.log
Part of the code mounting the 9pfs in case it helps is at:
https://salsa.debian.org/ci-team/autopkgtest/-/blob/master/virt/autopkgtest-virt-qemu#L290
I could reproduce the issue with both 6.9.2 and 6.10-rc1.
Re: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
In reply to David HowellsHi again,
Quoted 5 lines · David Howells
commit
39302c160390441ed5b4f4f7ad480c44eddf0962Author: David Howells <[email protected]> Date: Wed May 22 17:30:22 2024 +0100netfs, 9p: Fix race between umount and async request completion
I have tried this patch on top of 6.10-rc1 and unfortunately the problem persists.
Meanwhile TJ (in CC) has been doing a lot of further investigation and opened https://bugzilla.kernel.org/show_bug.cgi?id=218916.
Re: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
Hi,
Quoted 2 lines · Emanuele Rocca
Meanwhile TJ (in CC) has been doing a lot of further investigation and opened https://bugzilla.kernel.org/show_bug.cgi?id=218916.
just to loop back to the MLs: in the referenced bug, TJ posted an analysis and and added a patch that fixed the issue for multiple testers.
Best,
Christian
Dominique Martinet
maintainerRe: [PATCH v5 40/40] 9p: Use netfslib read/write_iter
Christian Kastner wrote on Mon, Jun 17, 2024 at 07:10:56PM +0200:
Quoted 6 lines · Emanuele Rocca
Quoted 2 lines
Meanwhile TJ (in CC) has been doing a lot of further investigation and opened https://bugzilla.kernel.org/show_bug.cgi?id=218916.
just to loop back to the MLs: in the referenced bug, TJ posted an analysis and and added a patch that fixed the issue for multiple testers.
Thanks for the mail, one of these days I'll try to understand how to make bugzilla automatically put me in cc of all the 9p bugs..
Analysis and tentative fix are of great help! Looks like we now understand what's wrong -- if I understand the description correctly we know the correct size (files aren't modified in the background, just other threads within the VM, right?); and the problem is that the netfs IO reverts the size back to an incorrect value when it completes?
If so then the fix looks odd to me, the problem ought to be fixed at the netfs/9p interface level, I don't see why an unbuffered read should update the size metadata when it's done...
David, what do you think?
Signature · 1 line
Dominique Martinet | Asmadeus