netfs: Prep for write helpers
Subsystems (12)
David Howells
maintainerv3 cover netfs: Prep for write helpers
Having had a go at implementing write helpers and content encryption support in netfslib, it seems that the netfs_read_{,sub}request structs and the equivalent write request structs were almost the same and so should be merged, thereby requiring only one set of alloc/get/put functions and a common set of tracepoints.
Merging the structs also has the advantage that if a bounce buffer is added to the request struct, a read operation can be performed to fill the bounce buffer, the contents of the buffer can be modified and then a write operation can be performed on it to send the data wherever it needs to go using the same request structure all the way through. The I/O handlers would then transparently perform any required crypto. This should make it easy to perform RMW cycles if needed.
The potentially common functions and structs, however, by their names all proclaim themselves to be associated with the read side of things. The bulk of these changes alter this in the following ways:
(1) Rename struct netfs_read_{,sub}request to netfs_io_{,sub}request.
(2) Rename some enums, members and flags to make them more appropriate.
(3) Adjust some comments to match.
(4) Drop "read"/"rreq" from the names of common functions. For instance, netfs_get_read_request() becomes netfs_get_request().
(5) The ->init_rreq() and ->issue_op() methods become ->init_request() and
->issue_read(). I've kept the latter as a read-specific function and
in another branch added an ->issue_write() method.The driver source is then reorganised into a number of files:
fs/netfs/buffered_read.c Create read reqs to the pagecache
fs/netfs/io.c Dispatchers for read and write reqs
fs/netfs/main.c Some general miscellaneous bits
fs/netfs/objects.c Alloc, get and put functions
fs/netfs/stats.c Optional procfs statistics.
and future development can be fitted into this scheme, e.g.:
fs/netfs/buffered_write.c Modify the pagecache
fs/netfs/buffered_flush.c Writeback from the pagecache
fs/netfs/direct_read.c DIO read support
fs/netfs/direct_write.c DIO write support
fs/netfs/unbuffered_write.c Write modifications directly back
Beyond the above changes, there are also some changes that affect how things work:
(1) Make fscache_end_operation() generally available.
(2) In the netfs tracing header, generate enums from the symbol -> string mapping tables rather than manually coding them.
(3) Add a struct for filesystems that uses netfslib to put into their inode wrapper structs to hold extra state that netfslib is interested in, such as the fscache cookie. This allows netfslib functions to be set in filesystem operation tables and jumped to directly without having to have a filesystem wrapper.
(4) Add a member to the struct added in (3) to track the remote inode length as that may differ if local modifications are buffered. We may need to supply an appropriate EOF pointer when storing data (in AFS for example).
(5) Pass extra information to netfs_alloc_request() so that the ->init_request() hook can access it and retain information to indicate the origin of the operation.
(6) Make the ->init_request() hook return an error, thereby allowing a filesystem that isn't allowed to cache an inode (ceph or cifs, for example) to skip readahead.
(7) Switch to using refcount_t for subrequests and add tracepoints to log refcount changes for the request and subrequest structs.
(8) Add a function to consolidate dispatching a read request. Similar code is used in three places and another couple are likely to be added in the future.
The patches can be found on this branch:
http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=fscache-next
This is based on top of ceph's master branch as some of the patches conflict.
David
---
Changes
=======
ver #3)
- Rebased one patch back on the ceph tree as the top patch got removed[4].
- Split out the bit to move ceph cap-getting on readahead out from the patch adding an inode context[5].
- Made ceph_init_request() store the caps got in rreq->netfs_priv for later freeing.
- Comment the need to keep the netfs inode context contiguous with the VFS inode struct[6].
- Altered the traces to use 'R=' consistently to denote a request debug ID.
ver #2)
- Changed kdoc references to renamed files[1].
- Switched the begin-read-function patch and the prepare-to-split patch as fewer functions then need unstatic'ing.
- Fixed an uninitialised var in netfs_begin_read()[2][3].
- Fixed a refleak caused by an unremoved line when netfs_begin_read() was introduced.
- Used "#if IS_ENABLED()" in netfs_i_cookie(), not "#ifdef".
- Implemented missing bit of ceph readahead through netfs_readahead().
- Rearranged the patch order to make the ceph readahead possible.
---
David Howells (19):
netfs: Generate enums from trace symbol mapping lists
netfs: Rename netfs_read_*request to netfs_io_*request
netfs: Finish off rename of netfs_read_request to netfs_io_request
netfs: Split netfs_io_* object handling out
netfs: Adjust the netfs_rreq tracepoint slightly
netfs: Trace refcounting on the netfs_io_request struct
netfs: Trace refcounting on the netfs_io_subrequest struct
netfs: Adjust the netfs_failure tracepoint to indicate non-subreq lines
netfs: Refactor arguments for netfs_alloc_read_request
netfs: Change ->init_request() to return an error code
ceph: Make ceph_init_request() check caps on readahead
netfs: Add a netfs inode context
netfs: Add a function to consolidate beginning a read
netfs: Prepare to split read_helper.c
netfs: Rename read_helper.c to io.c
netfs: Split fs/netfs/read_helper.c
netfs: Split some core bits out into their own file
netfs: Keep track of the actual remote file size
afs: Maintain netfs_i_context::remote_i_size
Jeffle Xu (1):
fscache: export fscache_end_operation()
Documentation/filesystems/netfs_library.rst | 140 ++- fs/9p/cache.c | 10 +- fs/9p/v9fs.c | 4 +- fs/9p/v9fs.h | 13 +- fs/9p/vfs_addr.c | 62 +- fs/9p/vfs_inode.c | 13 +- fs/afs/dynroot.c | 1 + fs/afs/file.c | 41 +- fs/afs/inode.c | 32 +- fs/afs/internal.h | 23 +- fs/afs/super.c | 4 +- fs/afs/write.c | 10 +- fs/cachefiles/io.c | 10 +- fs/ceph/addr.c | 116 +- fs/ceph/cache.c | 28 +- fs/ceph/cache.h | 15 +- fs/ceph/inode.c | 6 +- fs/ceph/super.h | 17 +- fs/cifs/cifsglob.h | 10 +- fs/cifs/fscache.c | 19 +- fs/cifs/fscache.h | 2 +- fs/fscache/internal.h | 11 - fs/netfs/Makefile | 8 +- fs/netfs/buffered_read.c | 428 +++++++ fs/netfs/internal.h | 49 +- fs/netfs/io.c | 657 ++++++++++ fs/netfs/main.c | 20 + fs/netfs/objects.c | 160 +++ fs/netfs/read_helper.c | 1205 ------------------- fs/netfs/stats.c | 1 - fs/nfs/fscache.c | 8 - include/linux/fscache.h | 14 + include/linux/netfs.h | 162 ++- include/trace/events/cachefiles.h | 6 +- include/trace/events/netfs.h | 190 ++- 35 files changed, 1867 insertions(+), 1628 deletions(-) create mode 100644 fs/netfs/buffered_read.c create mode 100644 fs/netfs/io.c create mode 100644 fs/netfs/main.c create mode 100644 fs/netfs/objects.c delete mode 100644 fs/netfs/read_helper.c
David Howells
maintainerPATCH v3 1/20 fscache: export fscache_end_operation()
From: Jeffle Xu <[email protected]>
Export fscache_end_operation() to avoid code duplication.
Besides, considering the paired fscache_begin_read_operation() is already exported, it shall make sense to also export fscache_end_operation().
---
fs/cifs/fscache.c | 8 -------- fs/fscache/internal.h | 11 ----------- fs/nfs/fscache.c | 8 -------- include/linux/fscache.h | 14 ++++++++++++++ 4 files changed, 14 insertions(+), 27 deletions(-)
fs/cifs/fscache.c +0 -8
@@ -134,14 +134,6 @@ void cifs_fscache_release_inode_cookie(struct inode *inode) } } -static inline void fscache_end_operation (struct netfs_cache_resources *cres) -{ -const struct netfs_cache_ops *ops =fscache_operation_valid (cres); - -if (ops) - ops->end_operation (cres); -} -/* * Fallback page reading interface. */
fs/fscache/internal.h +0 -11
@@ -70,17 +70,6 @@ static inline void fscache_see_cookie(struct fscache_cookie *cookie, where); } -/* -* io.c -*/ -static inline void fscache_end_operation (struct netfs_cache_resources *cres) -{ -const struct netfs_cache_ops *ops =fscache_operation_valid (cres); - -if (ops) - ops->end_operation (cres); -} -/* * main.c */
fs/nfs/fscache.c +0 -8
@@ -249,14 +249,6 @@ void nfs_fscache_release_file(struct inode *inode, struct file *filp) } } -static inline void fscache_end_operation (struct netfs_cache_resources *cres) -{ -const struct netfs_cache_ops *ops =fscache_operation_valid (cres); - -if (ops) - ops->end_operation (cres); -} -/* * Fallback page reading interface. */
include/linux/fscache.h +14 -0
@@ -456,6 +456,20 @@ int fscache_begin_read_operation(struct netfs_cache_resources *cres,return -ENOBUFS ; } +/** +* fscache_end_operation - End the read operation for the netfs lib +* @cres: The cache resources for the read operation +* +* Clean up the resources at the end of the read request. +*/ +static inline void fscache_end_operation (struct netfs_cache_resources *cres) +{ +const struct netfs_cache_ops *ops =fscache_operation_valid (cres); + +if (ops) + ops->end_operation (cres); +} +/** * fscache_read - Start a read from the cache. * @cres: The cache resources to use
David Howells
maintainerPATCH v3 2/20 netfs: Generate enums from trace symbol mapping lists
In reply to David Howellsnetfs has a number of lists of symbols for use in tracing, listed in an enum and then listed again in a symbol->string mapping for use with __print_symbolic(). This is, however, redundant.
Instead, use the symbol->string mapping list to also generate the enum where the enum is in the same file.
Changes
=======
ver #3)
- #undef EM and E_ at the end of the trace file[1].
---
include/trace/events/netfs.h | 59 +++++++++++------------------------------- 1 file changed, 16 insertions(+), 43 deletions(-)
include/trace/events/netfs.h +16 -43
@@ -15,49 +15,6 @@/* * Define enums for tracing information. */ -#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY -#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY - -enum netfs_read_trace { - netfs_read_trace_expanded, - netfs_read_trace_readahead, - netfs_read_trace_readpage, - netfs_read_trace_write_begin, -}; - -enum netfs_rreq_trace { - netfs_rreq_trace_assess, - netfs_rreq_trace_done, - netfs_rreq_trace_free, - netfs_rreq_trace_resubmit, - netfs_rreq_trace_unlock, - netfs_rreq_trace_unmark, - netfs_rreq_trace_write, -}; - -enum netfs_sreq_trace { - netfs_sreq_trace_download_instead, - netfs_sreq_trace_free, - netfs_sreq_trace_prepare, - netfs_sreq_trace_resubmit_short, - netfs_sreq_trace_submit, - netfs_sreq_trace_terminated, - netfs_sreq_trace_write, - netfs_sreq_trace_write_skip, - netfs_sreq_trace_write_term, -}; - -enum netfs_failure { - netfs_fail_check_write_begin, - netfs_fail_copy_to_cache, - netfs_fail_read, - netfs_fail_short_readpage, - netfs_fail_short_write_begin, - netfs_fail_prepare_write, -}; - -#endif -#define netfs_read_traces \ EM(netfs_read_trace_expanded, "EXPANDED ") \ EM(netfs_read_trace_readahead, "READAHEAD") \
@@ -98,6 +55,20 @@ enum netfs_failure { EM(netfs_fail_short_write_begin, "short-write-begin") \ E_(netfs_fail_prepare_write, "prep-write") +#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY +#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY + +#undef EM +#undef E_ +#define EM (a, b) a, +#define E_ (a, b) a + +enum netfs_read_trace { netfs_read_traces }__mode (byte ); +enum netfs_rreq_trace { netfs_rreq_traces }__mode (byte ); +enum netfs_sreq_trace { netfs_sreq_traces }__mode (byte ); +enum netfs_failure { netfs_failures }__mode (byte ); + +#endif /* * Export enum symbols via userspace.
@@ -258,6 +229,8 @@ TRACE_EVENT(netfs_failure, __entry->error) ); +#undef EM +#undef E_#endif /* _TRACE_NETFS_H */ /* This part must be outside protection */
David Howells
maintainerPATCH v3 3/20 netfs: Rename netfs_read_*request to netfs_io_*request
In reply to David HowellsRename netfs_read_*request to netfs_io_*request so that the same structures can be used for the write helpers too.
perl -p -i -e 's/netfs_read_(request|subrequest)/netfs_io_$1/g' \
git grep -l 'netfs_read_\(sub\|\)request'
perl -p -i -e 's/nr_rd_ops/nr_outstanding/g' \
git grep -l nr_rd_ops
perl -p -i -e 's/nr_wr_ops/nr_copy_ops/g' \
git grep -l nr_wr_ops
perl -p -i -e 's/netfs_read_source/netfs_io_source/g' \
git grep -l 'netfs_read_source'
perl -p -i -e 's/netfs_io_request_ops/netfs_request_ops/g' \
git grep -l 'netfs_io_request_ops'
perl -p -i -e 's/init_rreq/init_request/g' \
git grep -l 'init_rreq'
---
Documentation/filesystems/netfs_library.rst | 40 +++--- fs/9p/vfs_addr.c | 16 +- fs/afs/file.c | 12 +- fs/afs/internal.h | 4 - fs/cachefiles/io.c | 6 - fs/ceph/addr.c | 16 +- fs/ceph/cache.h | 4 - fs/netfs/read_helper.c | 194 ++++++++++++++------------- include/linux/netfs.h | 42 +++--- include/trace/events/cachefiles.h | 6 - include/trace/events/netfs.h | 14 +- 11 files changed, 177 insertions(+), 177 deletions(-)
Documentation/filesystems/netfs_library.rst +20 -20
@@ -71,11 +71,11 @@ Read Helper Functions Three read helpers are provided:: void netfs_readahead(struct readahead_control *ractl, - const struct netfs_read_request_ops *ops, + const struct netfs_request_ops *ops, void *netfs_priv); int netfs_readpage(struct file *file, struct folio *folio, - const struct netfs_read_request_ops *ops, + const struct netfs_request_ops *ops, void *netfs_priv); int netfs_write_begin(struct file *file, struct address_space *mapping,
@@ -84,7 +84,7 @@ Three read helpers are provided:: unsigned int flags, struct folio **_folio, void **_fsdata, - const struct netfs_read_request_ops *ops, + const struct netfs_request_ops *ops, void *netfs_priv); Each corresponds to a VM operation, with the addition of a couple of parameters
@@ -116,7 +116,7 @@ occurs, the request will get partially completed if sufficient data is read. Additionally, there is:: - * void netfs_subreq_terminated(struct netfs_read_subrequest *subreq, + * void netfs_subreq_terminated(struct netfs_io_subrequest *subreq, ssize_t transferred_or_error, bool was_async);
@@ -132,7 +132,7 @@ Read Helper Structures The read helpers make use of a couple of structures to maintain the state of the read. The first is a structure that manages a read request as a whole:: - struct netfs_read_request { + struct netfs_io_request { struct inode *inode; struct address_space *mapping; struct netfs_cache_resources cache_resources;
@@ -140,7 +140,7 @@ the read. The first is a structure that manages a read request as a whole:: loff_t start; size_t len; loff_t i_size; - const struct netfs_read_request_ops *netfs_ops; + const struct netfs_request_ops *netfs_ops; unsigned int debug_id; ... };
@@ -187,8 +187,8 @@ The above fields are the ones the netfs can use. They are: The second structure is used to manage individual slices of the overall read request:: - struct netfs_read_subrequest { - struct netfs_read_request *rreq; + struct netfs_io_subrequest { + struct netfs_io_request *rreq; loff_t start; size_t len; size_t transferred;
@@ -244,23 +244,23 @@ Read Helper Operations The network filesystem must provide the read helpers with a table of operations through which it can issue requests and negotiate:: - struct netfs_read_request_ops { - void (*init_rreq)(struct netfs_read_request *rreq, struct file *file); + struct netfs_request_ops { + void (*init_request)(struct netfs_io_request *rreq, struct file *file); bool (*is_cache_enabled)(struct inode *inode); - int (*begin_cache_operation)(struct netfs_read_request *rreq); - void (*expand_readahead)(struct netfs_read_request *rreq); - bool (*clamp_length)(struct netfs_read_subrequest *subreq); - void (*issue_op)(struct netfs_read_subrequest *subreq); - bool (*is_still_valid)(struct netfs_read_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_op)(struct netfs_io_subrequest *subreq); + bool (*is_still_valid)(struct netfs_io_request *rreq); int (*check_write_begin)(struct file *file, loff_t pos, unsigned len, struct folio *folio, void **_fsdata); - void (*done)(struct netfs_read_request *rreq); + void (*done)(struct netfs_io_request *rreq); void (*cleanup)(struct address_space *mapping, void *netfs_priv); }; The operations are as follows: - * ``init_rreq()`` + * ``init_request()`` [Optional] This is called to initialise the request structure. It is given the file for reference and can modify the ->netfs_priv value.
@@ -420,12 +420,12 @@ 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:: - int fscache_begin_read_operation(struct netfs_read_request *rreq, + 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. -The netfs_read_request object contains a place for the cache to hang its +The netfs_io_request object contains a place for the cache to hang its state:: struct netfs_cache_resources {
@@ -443,7 +443,7 @@ operation table looks like the following:: void (*expand_readahead)(struct netfs_cache_resources *cres, loff_t *_start, size_t *_len, loff_t i_size); - enum netfs_read_source (*prepare_read)(struct netfs_read_subrequest *subreq, + enum netfs_io_source (*prepare_read)(struct netfs_io_subrequest *subreq, loff_t i_size); int (*read)(struct netfs_cache_resources *cres,
fs/9p/vfs_addr.c +8 -8
@@ -31,9 +31,9 @@* v9fs_req_issue_op - Issue a read from 9P * @subreq: The read to make */ -static void v9fs_req_issue_op (struct netfs_read_subrequest *subreq) +static void v9fs_req_issue_op (struct netfs_io_subrequest *subreq) { -struct netfs_read_request *rreq = subreq->rreq; +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;
@@ -52,11 +52,11 @@ static void v9fs_req_issue_op(struct netfs_read_subrequest *subreq) }/** -* v9fs_init_rreq - Initialise a read request +* v9fs_init_request - Initialise a read request * @rreq: The read request * @file: The file being read from */ -static void v9fs_init_rreq (struct netfs_read_request *rreq,struct file *file) +static void v9fs_init_request (struct netfs_io_request *rreq,struct file *file) {struct p9_fid *fid = file->private_data;
@@ -65,7 +65,7 @@ static void v9fs_init_rreq(struct netfs_read_request *rreq, struct file *file) }/** -* v9fs_req_cleanup - Cleanup request initialized by v9fs_init_rreq +* v9fs_req_cleanup - Cleanup request initialized by v9fs_init_request * @mapping: unused mapping of request to cleanup * @priv: private data to cleanup, a fid, guaranted non-null. */
@@ -91,7 +91,7 @@ static bool v9fs_is_cache_enabled(struct inode *inode)* v9fs_begin_cache_operation - Begin a cache operation for a read * @rreq: The read request */ -static int v9fs_begin_cache_operation (struct netfs_read_request *rreq) +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));
@@ -102,8 +102,8 @@ static int v9fs_begin_cache_operation(struct netfs_read_request *rreq)#endif } -static const struct netfs_read_request_ops v9fs_req_ops = { - .init_rreq = v9fs_init_rreq, +static const struct netfs_request_ops v9fs_req_ops = { + .init_request = v9fs_init_request, .is_cache_enabled = v9fs_is_cache_enabled, .begin_cache_operation = v9fs_begin_cache_operation, .issue_op = v9fs_req_issue_op,
fs/afs/file.c +6 -6
@@ -240,7 +240,7 @@ void afs_put_read(struct afs_read *req)static void afs_fetch_data_notify (struct afs_operation *op) {struct afs_read *req = op->fetch.req; -struct netfs_read_subrequest *subreq = req->subreq; +struct netfs_io_subrequest *subreq = req->subreq;int error = op->error;if (error == -ECONNABORTED )
@@ -310,7 +310,7 @@ int afs_fetch_data(struct afs_vnode *vnode, struct afs_read *req)return afs_do_sync_operation (op); } -static void afs_req_issue_op (struct netfs_read_subrequest *subreq) +static void afs_req_issue_op (struct netfs_io_subrequest *subreq) {struct afs_vnode *vnode =AFS_FS_I (subreq->rreq->inode);struct afs_read *fsreq;
@@ -359,7 +359,7 @@ static int afs_symlink_readpage(struct file *file, struct page *page)return ret; } -static void afs_init_rreq (struct netfs_read_request *rreq,struct file *file) +static void afs_init_request (struct netfs_io_request *rreq,struct file *file) { rreq->netfs_priv =key_get (afs_file_key (file)); }
@@ -371,7 +371,7 @@ static bool afs_is_cache_enabled(struct inode *inode)return fscache_cookie_enabled (cookie) && cookie->cache_priv; } -static int afs_begin_cache_operation (struct netfs_read_request *rreq) +static int afs_begin_cache_operation (struct netfs_io_request *rreq) {#ifdef CONFIG_AFS_FSCACHE struct afs_vnode *vnode =AFS_FS_I (rreq->inode);
@@ -396,8 +396,8 @@ static void afs_priv_cleanup(struct address_space *mapping, void *netfs_priv)key_put (netfs_priv); } -const struct netfs_read_request_ops afs_req_ops = { - .init_rreq = afs_init_rreq, +const struct netfs_request_ops afs_req_ops = { + .init_request = afs_init_request, .is_cache_enabled = afs_is_cache_enabled, .begin_cache_operation = afs_begin_cache_operation, .check_write_begin = afs_check_write_begin,
fs/afs/internal.h +2 -2
@@ -207,7 +207,7 @@ struct afs_read {loff_t file_size;/* File size returned by server */ struct key *key;/* The key to use to reissue the read */ struct afs_vnode *vnode;/* The file being read into. */ -struct netfs_read_subrequest *subreq;/* Fscache helper read request this belongs to */ +struct netfs_io_subrequest *subreq;/* Fscache helper read request this belongs to */ afs_dataversion_t data_version;/* Version number returned by server */ refcount_t usage;unsigned int call_debug_id;
@@ -1063,7 +1063,7 @@ extern const struct address_space_operations afs_file_aops;extern const struct address_space_operations afs_symlink_aops;extern const struct inode_operations afs_file_inode_operations;extern const struct file_operations afs_file_operations; -extern const struct netfs_read_request_ops afs_req_ops; +extern const struct netfs_request_ops afs_req_ops;extern int afs_cache_wb_key (struct afs_vnode *,struct afs_file *);extern void afs_put_wb_key (struct afs_wb_key *);
fs/cachefiles/io.c +3 -3
@@ -382,18 +382,18 @@ static int cachefiles_write(struct netfs_cache_resources *cres,* Prepare a read operation, shortening it to a cached/uncached * boundary as appropriate. */ -static enum netfs_read_source cachefiles_prepare_read (struct netfs_read_subrequest *subreq, +static enum netfs_io_source cachefiles_prepare_read (struct netfs_io_subrequest *subreq,loff_t i_size) {enum cachefiles_prepare_read_trace why; -struct netfs_read_request *rreq = subreq->rreq; +struct netfs_io_request *rreq = subreq->rreq;struct netfs_cache_resources *cres = &rreq->cache_resources;struct cachefiles_object *object;struct cachefiles_cache *cache;struct fscache_cookie *cookie =fscache_cres_cookie (cres);const struct cred *saved_cred;struct file *file =cachefiles_cres_file (cres); -enum netfs_read_source ret =NETFS_DOWNLOAD_FROM_SERVER ; +enum netfs_io_source ret =NETFS_DOWNLOAD_FROM_SERVER ;loff_t off, to;ino_t ino = file ?file_inode (file)->i_ino :0 ;
fs/ceph/addr.c +8 -8
@@ -183,7 +183,7 @@ static int ceph_releasepage(struct page *page, gfp_t gfp)return 1 ; } -static void ceph_netfs_expand_readahead (struct netfs_read_request *rreq) +static void ceph_netfs_expand_readahead (struct netfs_io_request *rreq) {struct inode *inode = rreq->inode;struct ceph_inode_info *ci =ceph_inode (inode);
@@ -200,7 +200,7 @@ static void ceph_netfs_expand_readahead(struct netfs_read_request *rreq) rreq->len =roundup (rreq->len, lo->stripe_unit); } -static bool ceph_netfs_clamp_length (struct netfs_read_subrequest *subreq) +static bool ceph_netfs_clamp_length (struct netfs_io_subrequest *subreq) {struct inode *inode = subreq->rreq->inode;struct ceph_fs_client *fsc =ceph_inode_to_client (inode);
@@ -219,7 +219,7 @@ static void finish_netfs_read(struct ceph_osd_request *req) {struct ceph_fs_client *fsc =ceph_inode_to_client (req->r_inode);struct ceph_osd_data *osd_data =osd_req_op_extent_osd_data (req,0 ); -struct netfs_read_subrequest *subreq = req->r_priv; +struct netfs_io_subrequest *subreq = req->r_priv;int num_pages;int err = req->r_result;
@@ -245,9 +245,9 @@ static void finish_netfs_read(struct ceph_osd_request *req)iput (req->r_inode); } -static bool ceph_netfs_issue_op_inline (struct netfs_read_subrequest *subreq) +static bool ceph_netfs_issue_op_inline (struct netfs_io_subrequest *subreq) { -struct netfs_read_request *rreq = subreq->rreq; +struct netfs_io_request *rreq = subreq->rreq;struct inode *inode = rreq->inode;struct ceph_mds_reply_info_parsed *rinfo;struct ceph_mds_reply_info_in *iinfo;
@@ -298,9 +298,9 @@ static bool ceph_netfs_issue_op_inline(struct netfs_read_subrequest *subreq)return true; } -static void ceph_netfs_issue_op (struct netfs_read_subrequest *subreq) +static void ceph_netfs_issue_op (struct netfs_io_subrequest *subreq) { -struct netfs_read_request *rreq = subreq->rreq; +struct netfs_io_request *rreq = subreq->rreq;struct inode *inode = rreq->inode;struct ceph_inode_info *ci =ceph_inode (inode);struct ceph_fs_client *fsc =ceph_inode_to_client (inode);
@@ -364,7 +364,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)ceph_put_cap_refs (ci, got); } -static const struct netfs_read_request_ops ceph_netfs_read_ops = { +static const struct netfs_request_ops ceph_netfs_read_ops = { .is_cache_enabled = ceph_is_cache_enabled, .begin_cache_operation = ceph_begin_cache_operation, .issue_op = ceph_netfs_issue_op,
fs/ceph/cache.h +2 -2
@@ -62,7 +62,7 @@ static inline int ceph_fscache_set_page_dirty(struct page *page)return fscache_set_page_dirty (page,ceph_fscache_cookie (ci)); } -static inline int ceph_begin_cache_operation (struct netfs_read_request *rreq) +static inline int ceph_begin_cache_operation (struct netfs_io_request *rreq) {struct fscache_cookie *cookie =ceph_fscache_cookie (ceph_inode (rreq->inode));
@@ -143,7 +143,7 @@ static inline bool ceph_is_cache_enabled(struct inode *inode)return false; } -static inline int ceph_begin_cache_operation (struct netfs_read_request *rreq) +static inline int ceph_begin_cache_operation (struct netfs_io_request *rreq) {return -ENOBUFS ; }
fs/netfs/read_helper.c +97 -97
559 lines not on this page · raw message
include/linux/netfs.h +21 -21
107 lines not on this page · raw message
include/trace/events/cachefiles.h +3 -3
@@ -424,8 +424,8 @@ TRACE_EVENT(cachefiles_vol_coherency, ); TRACE_EVENT(cachefiles_prep_read, - TP_PROTO(struct netfs_read_subrequest *sreq, - enum netfs_read_source source, + TP_PROTO(struct netfs_io_subrequest *sreq, + enum netfs_io_source source, enum cachefiles_prepare_read_trace why, ino_t cache_inode),
@@ -435,7 +435,7 @@ TRACE_EVENT(cachefiles_prep_read, __field(unsigned int, rreq ) __field(unsigned short, index ) __field(unsigned short, flags ) - __field(enum netfs_read_source, source ) + __field(enum netfs_io_source, source ) __field(enum cachefiles_prepare_read_trace, why ) __field(size_t, len ) __field(loff_t, start )
include/trace/events/netfs.h +7 -7
@@ -94,7 +94,7 @@ netfs_failures;#define E_ (a, b) { a, b } TRACE_EVENT(netfs_read, - TP_PROTO(struct netfs_read_request *rreq, + TP_PROTO(struct netfs_io_request *rreq, loff_t start, size_t len, enum netfs_read_trace what),
@@ -127,7 +127,7 @@ TRACE_EVENT(netfs_read, ); TRACE_EVENT(netfs_rreq, - TP_PROTO(struct netfs_read_request *rreq, + TP_PROTO(struct netfs_io_request *rreq, enum netfs_rreq_trace what), TP_ARGS(rreq, what),
@@ -151,7 +151,7 @@ TRACE_EVENT(netfs_rreq, ); TRACE_EVENT(netfs_sreq, - TP_PROTO(struct netfs_read_subrequest *sreq, + TP_PROTO(struct netfs_io_subrequest *sreq, enum netfs_sreq_trace what), TP_ARGS(sreq, what),
@@ -161,7 +161,7 @@ TRACE_EVENT(netfs_sreq, __field(unsigned short, index ) __field(short, error ) __field(unsigned short, flags ) - __field(enum netfs_read_source, source ) + __field(enum netfs_io_source, source ) __field(enum netfs_sreq_trace, what ) __field(size_t, len ) __field(size_t, transferred )
@@ -190,8 +190,8 @@ TRACE_EVENT(netfs_sreq, ); TRACE_EVENT(netfs_failure, - TP_PROTO(struct netfs_read_request *rreq, - struct netfs_read_subrequest *sreq, + TP_PROTO(struct netfs_io_request *rreq, + struct netfs_io_subrequest *sreq, int error, enum netfs_failure what), TP_ARGS(rreq, sreq, error, what),
@@ -201,7 +201,7 @@ TRACE_EVENT(netfs_failure, __field(unsigned short, index ) __field(short, error ) __field(unsigned short, flags ) - __field(enum netfs_read_source, source ) + __field(enum netfs_io_source, source ) __field(enum netfs_failure, what ) __field(size_t, len ) __field(size_t, transferred )
David Howells
maintainerPATCH v3 4/20 netfs: Finish off rename of netfs_read_request to netfs_io_request
In reply to David HowellsAdjust helper function names and comments after mass rename of struct netfs_read_*request to struct netfs_io_*request.
Changes
=======
ver #2)
- Make the changes in the docs also.
---
Documentation/filesystems/netfs_library.rst | 4 + fs/9p/vfs_addr.c | 6 +- fs/afs/file.c | 4 + fs/cachefiles/io.c | 4 + fs/ceph/addr.c | 6 +- fs/netfs/read_helper.c | 83 ++++++++++++++------------- include/linux/netfs.h | 22 ++++--- 7 files changed, 65 insertions(+), 64 deletions(-)
Documentation/filesystems/netfs_library.rst +2 -2
@@ -250,7 +250,7 @@ through which it can issue requests and negotiate:: 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_op)(struct netfs_io_subrequest *subreq); + void (*issue_read)(struct netfs_io_subrequest *subreq); bool (*is_still_valid)(struct netfs_io_request *rreq); int (*check_write_begin)(struct file *file, loff_t pos, unsigned len, struct folio *folio, void **_fsdata);
@@ -305,7 +305,7 @@ The operations are as follows: This should return 0 on success and an error code on error. - * ``issue_op()`` + * ``issue_read()`` [Required] The helpers use this to dispatch a subrequest to the server for reading. In the subrequest, ->start, ->len and ->transferred indicate what
fs/9p/vfs_addr.c +3 -3
@@ -28,10 +28,10 @@#include "fid.h" /** -* v9fs_req_issue_op - Issue a read from 9P +* v9fs_issue_read - Issue a read from 9P * @subreq: The read to make */ -static void v9fs_req_issue_op (struct netfs_io_subrequest *subreq) +static void v9fs_issue_read (struct netfs_io_subrequest *subreq) {struct netfs_io_request *rreq = subreq->rreq;struct p9_fid *fid = rreq->netfs_priv;
@@ -106,7 +106,7 @@ static const struct netfs_request_ops v9fs_req_ops = { .init_request = v9fs_init_request, .is_cache_enabled = v9fs_is_cache_enabled, .begin_cache_operation = v9fs_begin_cache_operation, - .issue_op = v9fs_req_issue_op, + .issue_read = v9fs_issue_read, .cleanup = v9fs_req_cleanup, };
fs/afs/file.c +2 -2
@@ -310,7 +310,7 @@ int afs_fetch_data(struct afs_vnode *vnode, struct afs_read *req)return afs_do_sync_operation (op); } -static void afs_req_issue_op (struct netfs_io_subrequest *subreq) +static void afs_issue_read (struct netfs_io_subrequest *subreq) {struct afs_vnode *vnode =AFS_FS_I (subreq->rreq->inode);struct afs_read *fsreq;
@@ -401,7 +401,7 @@ const struct netfs_request_ops afs_req_ops = { .is_cache_enabled = afs_is_cache_enabled, .begin_cache_operation = afs_begin_cache_operation, .check_write_begin = afs_check_write_begin, - .issue_op = afs_req_issue_op, + .issue_read = afs_issue_read, .cleanup = afs_priv_cleanup, };
fs/cachefiles/io.c +2 -2
@@ -406,7 +406,7 @@ static enum netfs_io_source cachefiles_prepare_read(struct netfs_io_subrequest * }if (test_bit (FSCACHE_COOKIE_NO_DATA_TO_READ , &cookie->flags)) { -__set_bit (NETFS_SREQ_WRITE_TO_CACHE , &subreq->flags); +__set_bit (NETFS_SREQ_COPY_TO_CACHE , &subreq->flags); why = cachefiles_trace_read_no_data; goto out_no_object; }
@@ -475,7 +475,7 @@ static enum netfs_io_source cachefiles_prepare_read(struct netfs_io_subrequest * goto out; download_and_store: -__set_bit (NETFS_SREQ_WRITE_TO_CACHE , &subreq->flags); +__set_bit (NETFS_SREQ_COPY_TO_CACHE , &subreq->flags); out:cachefiles_end_secure (cache, saved_cred); out_no_object:
fs/ceph/addr.c +3 -3
@@ -259,7 +259,7 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq)size_t len;__set_bit (NETFS_SREQ_CLEAR_TAIL , &subreq->flags); -__clear_bit (NETFS_SREQ_WRITE_TO_CACHE , &subreq->flags); +__clear_bit (NETFS_SREQ_COPY_TO_CACHE , &subreq->flags);if (subreq->start >= inode->i_size) goto out;
@@ -298,7 +298,7 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq)return true; } -static void ceph_netfs_issue_op (struct netfs_io_subrequest *subreq) +static void ceph_netfs_issue_read (struct netfs_io_subrequest *subreq) {struct netfs_io_request *rreq = subreq->rreq;struct inode *inode = rreq->inode;
@@ -367,7 +367,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)static const struct netfs_request_ops ceph_netfs_read_ops = { .is_cache_enabled = ceph_is_cache_enabled, .begin_cache_operation = ceph_begin_cache_operation, - .issue_op = ceph_netfs_issue_op, + .issue_read = ceph_netfs_issue_read, .expand_readahead = ceph_netfs_expand_readahead, .clamp_length = ceph_netfs_clamp_length, .check_write_begin = ceph_netfs_check_write_begin,
fs/netfs/read_helper.c +42 -41
281 lines not on this page · raw message
include/linux/netfs.h +11 -11
@@ -131,7 +131,7 @@ struct netfs_cache_resources {* Descriptor for a single component subrequest. */ struct netfs_io_subrequest { -struct netfs_io_request *rreq;/* Supervising read request */ +struct netfs_io_request *rreq;/* Supervising I/O request */ struct list_head rreq_link;/* Link in rreq->subrequests */ loff_t start;/* Where to start the I/O */ size_t len;/* Size of the I/O */
@@ -139,29 +139,29 @@ struct netfs_io_subrequest {refcount_t usage;short error;/* 0 or error that occurred */ unsigned short debug_index;/* Index in list (for debugging output) */ -enum netfs_io_source source;/* Where to read from */ +enum netfs_io_source source;/* Where to read from/write to */ unsigned long flags; -#define NETFS_SREQ_WRITE_TO_CACHE 0/* Set if should write to cache */ +#define NETFS_SREQ_COPY_TO_CACHE 0/* Set if should copy the data to the cache */ #define NETFS_SREQ_CLEAR_TAIL 1/* Set if the rest of the read should be cleared */ -#define NETFS_SREQ_SHORT_READ 2/* Set if there was a short read from the cache */ +#define NETFS_SREQ_SHORT_IO 2/* Set if the I/O was short */ #define NETFS_SREQ_SEEK_DATA_READ 3/* Set if ->read() should SEEK_DATA first */ #define NETFS_SREQ_NO_PROGRESS 4/* Set if we didn't manage to read any data */ };/* -* Descriptor for a read helper request. This is used to make multiple I/O -* requests on a variety of sources and then stitch the result together. +* Descriptor for an I/O helper request. This is used to make multiple I/O +* operations to a variety of data stores and then stitch the result together. */ struct netfs_io_request {struct work_struct work;struct inode *inode;/* The file being accessed */ struct address_space *mapping;/* The mapping being accessed */ struct netfs_cache_resources cache_resources; -struct list_head subrequests;/* Requests to fetch I/O from disk or net */ +struct list_head subrequests;/* Contributory I/O operations */ void *netfs_priv;/* Private data for the netfs */ unsigned int debug_id; -atomic_t nr_outstanding;/* Number of read ops in progress */ -atomic_t nr_copy_ops;/* Number of write ops in progress */ +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 */ short error;/* 0 or error that occurred */
@@ -171,7 +171,7 @@ struct netfs_io_request {refcount_t usage;unsigned long flags;#define NETFS_RREQ_INCOMPLETE_IO 0/* Some ioreqs terminated short or with error */ -#define NETFS_RREQ_WRITE_TO_CACHE 1/* Need to write to the cache */ +#define NETFS_RREQ_COPY_TO_CACHE 1/* Need to write to the cache */ #define NETFS_RREQ_NO_UNLOCK_FOLIO 2/* Don't unlock no_unlock_folio on completion */ #define NETFS_RREQ_DONT_UNLOCK_FOLIOS 3/* Don't unlock the folios on completion */ #define NETFS_RREQ_FAILED 4/* The request failed */
@@ -188,7 +188,7 @@ struct netfs_request_ops {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_op)(struct netfs_io_subrequest *subreq); +void (*issue_read)(struct netfs_io_subrequest *subreq);bool (*is_still_valid)(struct netfs_io_request *rreq);int (*check_write_begin)(struct file *file,loff_t pos,unsigned len,struct folio *folio,void **_fsdata);
David Howells
maintainerPATCH v3 5/20 netfs: Split netfs_io_* object handling out
In reply to David HowellsSplit netfs_io_* object handling out into a file that's going to contain object allocation, get and put routines.
---
fs/netfs/Makefile | 6 ++ fs/netfs/internal.h | 18 +++++++ fs/netfs/objects.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/netfs/read_helper.c | 118 ---------------------------------------------- 4 files changed, 147 insertions(+), 118 deletions(-) create mode 100644 fs/netfs/objects.c
fs/netfs/Makefile +5 -1
@@ -1,5 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -netfs-y := read_helper.o stats.o +netfs-y := \ + objects.o \ + read_helper.o + +netfs-$(CONFIG_NETFS_STATS) += stats.o obj-$(CONFIG_NETFS_SUPPORT) := netfs.o
fs/netfs/internal.h +18 -0
@@ -5,17 +5,35 @@* Written by David Howells ([email protected]) */ +#include <linux/netfs.h> +#include <trace/events/netfs.h> +#ifdef pr_fmt#undef pr_fmt#endif #define pr_fmt (fmt) "netfs: " fmt +/* +* objects.c +*/ +struct netfs_io_request *netfs_alloc_request (const struct netfs_request_ops *ops, +void *netfs_priv, +struct file *file); +void netfs_get_request (struct netfs_io_request *rreq); +void netfs_clear_subrequests (struct netfs_io_request *rreq,bool was_async); +void netfs_put_request (struct netfs_io_request *rreq,bool was_async); +struct netfs_io_subrequest *netfs_alloc_subrequest (struct netfs_io_request *rreq); +void netfs_put_subrequest (struct netfs_io_subrequest *subreq,bool was_async); +void netfs_get_subrequest (struct netfs_io_subrequest *subreq); +/* * read_helper.c */ extern unsigned int netfs_debug; +void netfs_rreq_work (struct work_struct *work); +/* * stats.c */
fs/netfs/objects.c new file +123 -0
123 lines not on this page · raw message
fs/netfs/read_helper.c +1 -117
130 lines not on this page · raw message
David Howells
maintainerPATCH v3 6/20 netfs: Adjust the netfs_rreq tracepoint slightly
In reply to David HowellsAdjust the netfs_rreq tracepoint to include the origin of the request and to increase the size of the "what trace" output strings by a character so that "ENCRYPT" and "DECRYPT" will fit without abbreviation.
---
fs/netfs/read_helper.c | 2 +- include/trace/events/netfs.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-)
fs/netfs/read_helper.c +1 -1
@@ -181,7 +181,7 @@ static void netfs_rreq_do_write_to_cache(struct netfs_io_request *rreq)struct iov_iter iter;int ret; -trace_netfs_rreq (rreq, netfs_rreq_trace_write); +trace_netfs_rreq (rreq, netfs_rreq_trace_copy);/* We don't want terminating writes trying to wake us up whilst we're * still going through the list.
include/trace/events/netfs.h +9 -9
@@ -22,13 +22,13 @@ E_(netfs_read_trace_write_begin, "WRITEBEGN")#define netfs_rreq_traces \ - EM(netfs_rreq_trace_assess, "ASSESS") \ - EM(netfs_rreq_trace_done, "DONE ") \ - EM(netfs_rreq_trace_free, "FREE ") \ - EM(netfs_rreq_trace_resubmit, "RESUBM") \ - EM(netfs_rreq_trace_unlock, "UNLOCK") \ - EM(netfs_rreq_trace_unmark, "UNMARK") \ - E_(netfs_rreq_trace_write, "WRITE ") + EM(netfs_rreq_trace_assess, "ASSESS ") \ + EM(netfs_rreq_trace_copy, "COPY ") \ + EM(netfs_rreq_trace_done, "DONE ") \ + EM(netfs_rreq_trace_free, "FREE ") \ + EM(netfs_rreq_trace_resubmit, "RESUBMT") \ + EM(netfs_rreq_trace_unlock, "UNLOCK ") \ + E_(netfs_rreq_trace_unmark, "UNMARK ")#define netfs_sreq_sources \ EM(NETFS_FILL_WITH_ZEROES, "ZERO") \
@@ -134,7 +134,7 @@ TRACE_EVENT(netfs_rreq,TP_STRUCT__entry (__field (unsigned int ,rreq ) - __field(unsigned short, flags ) + __field(unsigned int, flags ) __field(enum netfs_rreq_trace, what ) ),
@@ -182,8 +182,8 @@ TRACE_EVENT(netfs_sreq,TP_printk ("R=%08x[%u] %s %s f=%02x s=%llx %zx/%zx e=%d" , __entry->rreq, __entry->index, -__print_symbolic (__entry->what, netfs_sreq_traces),__print_symbolic (__entry->source, netfs_sreq_sources), +__print_symbolic (__entry->what, netfs_sreq_traces), __entry->flags, __entry->start, __entry->transferred, __entry->len, __entry->error)
David Howells
maintainerPATCH v3 7/20 netfs: Trace refcounting on the netfs_io_request struct
In reply to David HowellsAdd refcount tracing for the netfs_io_request structure.
Changes
=======
ver #3)
- Switch 'W=' to 'R=' in the traceline to match other request debug IDs.
---
fs/netfs/internal.h | 11 +++++++++-- fs/netfs/objects.c | 24 +++++++++++++++++------- fs/netfs/read_helper.c | 14 +++++++------- include/linux/netfs.h | 2 +- include/trace/events/netfs.h | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 17 deletions(-)
fs/netfs/internal.h +9 -2
@@ -20,13 +20,20 @@struct netfs_io_request *netfs_alloc_request (const struct netfs_request_ops *ops,void *netfs_priv,struct file *file); -void netfs_get_request (struct netfs_io_request *rreq); +void netfs_get_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what);void netfs_clear_subrequests (struct netfs_io_request *rreq,bool was_async); -void netfs_put_request (struct netfs_io_request *rreq,bool was_async); +void netfs_put_request (struct netfs_io_request *rreq,bool was_async, +enum netfs_rreq_ref_trace what);struct netfs_io_subrequest *netfs_alloc_subrequest (struct netfs_io_request *rreq);void netfs_put_subrequest (struct netfs_io_subrequest *subreq,bool was_async);void netfs_get_subrequest (struct netfs_io_subrequest *subreq); +static inline void netfs_see_request (struct netfs_io_request *rreq, +enum netfs_rreq_ref_trace what) +{ +trace_netfs_rreq_ref (rreq->debug_id,refcount_read (&rreq->ref), what); +} +/* * read_helper.c */
fs/netfs/objects.c +17 -7
@@ -27,7 +27,7 @@ struct netfs_io_request *netfs_alloc_request( rreq->debug_id =atomic_inc_return (&debug_ids);INIT_LIST_HEAD (&rreq->subrequests);INIT_WORK (&rreq->work, netfs_rreq_work); -refcount_set (&rreq->usage,1 ); +refcount_set (&rreq->ref,1 );__set_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags);if (ops->init_request) ops->init_request (rreq, file);
@@ -37,9 +37,12 @@ struct netfs_io_request *netfs_alloc_request(return rreq; } -void netfs_get_request (struct netfs_io_request *rreq) +void netfs_get_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what) { -refcount_inc (&rreq->usage); +int r; + +__refcount_inc (&rreq->ref, &r); +trace_netfs_rreq_ref (rreq->debug_id, r +1 , what); }void netfs_clear_subrequests (struct netfs_io_request *rreq,bool was_async)
@@ -68,9 +71,16 @@ static void netfs_free_request(struct work_struct *work)netfs_stat_d (&netfs_n_rh_rreq); } -void netfs_put_request (struct netfs_io_request *rreq,bool was_async) +void netfs_put_request (struct netfs_io_request *rreq,bool was_async, +enum netfs_rreq_ref_trace what) { -if (refcount_dec_and_test (&rreq->usage)) { +unsigned int debug_id = rreq->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))
@@ -93,7 +103,7 @@ struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreqINIT_LIST_HEAD (&subreq->rreq_link);refcount_set (&subreq->usage,2 ); subreq->rreq = rreq; -netfs_get_request (rreq); +netfs_get_request (rreq, netfs_rreq_trace_get_subreq);netfs_stat (&netfs_n_rh_sreq); }
@@ -113,7 +123,7 @@ static void __netfs_put_subrequest(struct netfs_io_subrequest *subreq,trace_netfs_sreq (subreq, netfs_sreq_trace_free);kfree (subreq);netfs_stat_d (&netfs_n_rh_sreq); -netfs_put_request (rreq, was_async); +netfs_put_request (rreq, was_async, netfs_rreq_trace_put_subreq); }void netfs_put_subrequest (struct netfs_io_subrequest *subreq,bool was_async)
fs/netfs/read_helper.c +7 -7
@@ -109,7 +109,7 @@ static void netfs_rreq_completed(struct netfs_io_request *rreq, bool was_async) {trace_netfs_rreq (rreq, netfs_rreq_trace_done);netfs_clear_subrequests (rreq, was_async); -netfs_put_request (rreq, was_async); +netfs_put_request (rreq, was_async, netfs_rreq_trace_put_complete); }/*
@@ -799,7 +799,7 @@ void netfs_readahead(struct readahead_control *ractl,return ; cleanup_free: -netfs_put_request (rreq, false); +netfs_put_request (rreq, false, netfs_rreq_trace_put_failed);return ; cleanup:if (netfs_priv)
@@ -858,7 +858,7 @@ int netfs_readpage(struct file *file,netfs_stat (&netfs_n_rh_readpage);trace_netfs_read (rreq, rreq->start, rreq->len, netfs_read_trace_readpage); -netfs_get_request (rreq); +netfs_get_request (rreq, netfs_rreq_trace_get_hold);atomic_set (&rreq->nr_outstanding,1 ); do {
@@ -883,7 +883,7 @@ int netfs_readpage(struct file *file, ret = -EIO ; } out: -netfs_put_request (rreq, false); +netfs_put_request (rreq, false, netfs_rreq_trace_put_hold);return ret; }EXPORT_SYMBOL (netfs_readpage);
@@ -1030,13 +1030,13 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,*/ ractl._nr_pages =folio_nr_pages (folio);netfs_rreq_expand (rreq, &ractl); -netfs_get_request (rreq);/* We hold the folio locks, so we can drop the references */ folio_get (folio);while (readahead_folio (&ractl)) ; +netfs_get_request (rreq, netfs_rreq_trace_get_hold);atomic_set (&rreq->nr_outstanding,1 ); do { if (!netfs_rreq_submit_slice(rreq, &debug_index))
@@ -1062,7 +1062,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,trace_netfs_failure (rreq,NULL , ret, netfs_fail_short_write_begin); ret = -EIO ; } -netfs_put_request (rreq, false); +netfs_put_request (rreq, false, netfs_rreq_trace_put_hold);if (ret <0 ) goto error;
@@ -1078,7 +1078,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,return 0 ; error_put: -netfs_put_request (rreq, false); +netfs_put_request (rreq, false, netfs_rreq_trace_put_failed); error:folio_unlock (folio);folio_put (folio);
include/linux/netfs.h +1 -1
@@ -168,7 +168,7 @@ struct netfs_io_request {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 */ -refcount_t usage; +refcount_t ref;unsigned long flags;#define NETFS_RREQ_INCOMPLETE_IO 0/* Some ioreqs terminated short or with error */ #define NETFS_RREQ_COPY_TO_CACHE 1/* Need to write to the cache */
include/trace/events/netfs.h +35 -0
@@ -55,6 +55,15 @@ EM(netfs_fail_short_write_begin, "short-write-begin") \ 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_subreq, "GET SUBREQ ") \ + EM(netfs_rreq_trace_put_complete, "PUT COMPLT ") \ + EM(netfs_rreq_trace_put_failed, "PUT FAILED ") \ + EM(netfs_rreq_trace_put_hold, "PUT HOLD ") \ + EM(netfs_rreq_trace_put_subreq, "PUT SUBREQ ") \ + E_(netfs_rreq_trace_new, "NEW ") +#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
@@ -67,6 +76,7 @@ enum netfs_read_trace { netfs_read_traces } __mode(byte);enum netfs_rreq_trace { netfs_rreq_traces }__mode (byte );enum netfs_sreq_trace { netfs_sreq_traces }__mode (byte );enum netfs_failure { netfs_failures }__mode (byte ); +enum netfs_rreq_ref_trace { netfs_rreq_ref_traces }__mode (byte );#endif
@@ -83,6 +93,7 @@ netfs_rreq_traces; netfs_sreq_sources; netfs_sreq_traces; netfs_failures; +netfs_rreq_ref_traces;/* * Now redefine the EM() and E_() macros to map the enums to the strings that
@@ -229,6 +240,30 @@ TRACE_EVENT(netfs_failure, __entry->error) ); +TRACE_EVENT (netfs_rreq_ref, + TP_PROTO(unsigned int rreq_debug_id, int ref, + enum netfs_rreq_ref_trace what), + +TP_ARGS (rreq_debug_id, ref, what), + +TP_STRUCT__entry ( + __field(unsigned int, rreq ) + __field(int, ref ) + __field(enum netfs_rreq_ref_trace, what ) + ), + +TP_fast_assign ( + __entry->rreq = rreq_debug_id; + __entry->ref = ref; + __entry->what = what; + ), + +TP_printk ("R=%08x %s r=%u" , + __entry->rreq, +__print_symbolic (__entry->what, netfs_rreq_ref_traces), + __entry->ref) + ); +#undef EM#undef E_#endif /* _TRACE_NETFS_H */
David Howells
maintainerPATCH v3 8/20 netfs: Trace refcounting on the netfs_io_subrequest struct
In reply to David HowellsAdd refcount tracing for the netfs_io_subrequest structure.
Changes
=======
ver #3)
- Switch 'W=' to 'R=' in the traceline to match other request debug IDs.
---
fs/netfs/internal.h | 2 -- fs/netfs/objects.c | 32 +++++++++++++++++++++++--------- fs/netfs/read_helper.c | 20 +++++++++++--------- include/linux/netfs.h | 8 +++++++- include/trace/events/netfs.h | 40 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 21 deletions(-)
fs/netfs/internal.h +0 -2
@@ -25,8 +25,6 @@ void netfs_clear_subrequests(struct netfs_io_request *rreq, bool was_async);void netfs_put_request (struct netfs_io_request *rreq,bool was_async,enum netfs_rreq_ref_trace what);struct netfs_io_subrequest *netfs_alloc_subrequest (struct netfs_io_request *rreq); -void netfs_put_subrequest (struct netfs_io_subrequest *subreq,bool was_async); -void netfs_get_subrequest (struct netfs_io_subrequest *subreq);static inline void netfs_see_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what)
fs/netfs/objects.c +23 -9
@@ -53,7 +53,8 @@ void netfs_clear_subrequests(struct netfs_io_request *rreq, bool was_async) subreq =list_first_entry (&rreq->subrequests, struct netfs_io_subrequest, rreq_link);list_del (&subreq->rreq_link); -netfs_put_subrequest (subreq, was_async); +netfs_put_subrequest (subreq, was_async, + netfs_sreq_trace_put_clear); } }
@@ -101,7 +102,7 @@ struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreq subreq =kzalloc (sizeof (struct netfs_io_subrequest ),GFP_KERNEL );if (subreq) {INIT_LIST_HEAD (&subreq->rreq_link); -refcount_set (&subreq->usage,2 ); +refcount_set (&subreq->ref,2 ); subreq->rreq = rreq;netfs_get_request (rreq, netfs_rreq_trace_get_subreq);netfs_stat (&netfs_n_rh_sreq);
@@ -110,13 +111,18 @@ struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreqreturn subreq; } -void netfs_get_subrequest (struct netfs_io_subrequest *subreq) +void netfs_get_subrequest (struct netfs_io_subrequest *subreq, +enum netfs_sreq_ref_trace what) { -refcount_inc (&subreq->usage); +int r; + +__refcount_inc (&subreq->ref, &r); +trace_netfs_sreq_ref (subreq->rreq->debug_id, subreq->debug_index, r +1 , + what); } -static void __netfs_put_subrequest (struct netfs_io_subrequest *subreq, -bool was_async) +static void netfs_free_subrequest (struct netfs_io_subrequest *subreq, +bool was_async) {struct netfs_io_request *rreq = subreq->rreq;
@@ -126,8 +132,16 @@ static void __netfs_put_subrequest(struct netfs_io_subrequest *subreq,netfs_put_request (rreq, was_async, netfs_rreq_trace_put_subreq); } -void netfs_put_subrequest (struct netfs_io_subrequest *subreq,bool was_async) +void netfs_put_subrequest (struct netfs_io_subrequest *subreq,bool was_async, +enum netfs_sreq_ref_trace what) { -if (refcount_dec_and_test (&subreq->usage)) -__netfs_put_subrequest (subreq, was_async); +unsigned int debug_index = subreq->debug_index; +unsigned int debug_id = subreq->rreq->debug_id; +bool dead; +int r; + + dead =__refcount_dec_and_test (&subreq->ref, &r); +trace_netfs_sreq_ref (debug_id, debug_index, r -1 , what); +if (dead) +netfs_free_subrequest (subreq, was_async); }
fs/netfs/read_helper.c +11 -9
@@ -167,7 +167,7 @@ static void netfs_rreq_copy_terminated(void *priv, ssize_t transferred_or_error,if (atomic_dec_and_test (&rreq->nr_copy_ops))netfs_rreq_unmark_after_write (rreq, was_async); -netfs_put_subrequest (subreq, was_async); +netfs_put_subrequest (subreq, was_async, netfs_sreq_trace_put_terminated); }/*
@@ -191,7 +191,8 @@ static void netfs_rreq_do_write_to_cache(struct netfs_io_request *rreq)list_for_each_entry_safe (subreq, p, &rreq->subrequests, rreq_link) {if (!test_bit (NETFS_SREQ_COPY_TO_CACHE , &subreq->flags)) {list_del_init (&subreq->rreq_link); -netfs_put_subrequest (subreq, false); +netfs_put_subrequest (subreq, false, + netfs_sreq_trace_put_no_copy); } }
@@ -203,7 +204,8 @@ static void netfs_rreq_do_write_to_cache(struct netfs_io_request *rreq)break ; subreq->len += next->len;list_del_init (&next->rreq_link); -netfs_put_subrequest (next, false); +netfs_put_subrequest (next, false, + netfs_sreq_trace_put_merged); } ret = cres->ops->prepare_write(cres, &subreq->start, &subreq->len,
@@ -219,7 +221,7 @@ static void netfs_rreq_do_write_to_cache(struct netfs_io_request *rreq)atomic_inc (&rreq->nr_copy_ops);netfs_stat (&netfs_n_rh_write); -netfs_get_subrequest (subreq); +netfs_get_subrequest (subreq, netfs_sreq_trace_get_copy_to_cache);trace_netfs_sreq (subreq, netfs_sreq_trace_write); cres->ops->write (cres, subreq->start, &iter, netfs_rreq_copy_terminated, subreq);
@@ -342,7 +344,7 @@ static void netfs_rreq_short_read(struct netfs_io_request *rreq,netfs_stat (&netfs_n_rh_short_read);trace_netfs_sreq (subreq, netfs_sreq_trace_resubmit_short); -netfs_get_subrequest (subreq); +netfs_get_subrequest (subreq, netfs_sreq_trace_get_short_read);atomic_inc (&rreq->nr_outstanding);if (subreq->source ==NETFS_READ_FROM_CACHE )netfs_read_from_cache (rreq, subreq,NETFS_READ_HOLE_CLEAR );
@@ -376,7 +378,7 @@ static bool netfs_rreq_perform_resubmissions(struct netfs_io_request *rreq) subreq->error =0 ;netfs_stat (&netfs_n_rh_download_instead);trace_netfs_sreq (subreq, netfs_sreq_trace_download_instead); -netfs_get_subrequest (subreq); +netfs_get_subrequest (subreq, netfs_sreq_trace_get_resubmit);atomic_inc (&rreq->nr_outstanding);netfs_read_from_server (rreq, subreq); }else if (test_bit (NETFS_SREQ_SHORT_IO , &subreq->flags)) {
@@ -538,7 +540,7 @@ void netfs_subreq_terminated(struct netfs_io_subrequest *subreq,else if (u ==1 )wake_up_var (&rreq->nr_outstanding); -netfs_put_subrequest (subreq, was_async); +netfs_put_subrequest (subreq, was_async, netfs_sreq_trace_put_terminated);return ; incomplete:
@@ -683,7 +685,7 @@ static bool netfs_rreq_submit_slice(struct netfs_io_request *rreq, subreq_failed: rreq->error = subreq->error; -netfs_put_subrequest (subreq, false); +netfs_put_subrequest (subreq, false, netfs_sreq_trace_put_failed);return false; }
@@ -1030,13 +1032,13 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,*/ ractl._nr_pages =folio_nr_pages (folio);netfs_rreq_expand (rreq, &ractl); +netfs_get_request (rreq, netfs_rreq_trace_get_hold);/* We hold the folio locks, so we can drop the references */ folio_get (folio);while (readahead_folio (&ractl)) ; -netfs_get_request (rreq, netfs_rreq_trace_get_hold);atomic_set (&rreq->nr_outstanding,1 ); do { if (!netfs_rreq_submit_slice(rreq, &debug_index))
include/linux/netfs.h +7 -1
@@ -18,6 +18,8 @@#include <linux/fs.h> #include <linux/pagemap.h> +enum netfs_sreq_ref_trace ; +/* * Overload PG_private_2 to give us PG_fscache - this is used to indicate that * a page is currently backed by a local disk cache
@@ -136,7 +138,7 @@ struct netfs_io_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 */ -refcount_t usage; +refcount_t ref;short error;/* 0 or error that occurred */ unsigned short debug_index;/* Index in list (for debugging output) */ enum netfs_io_source source;/* Where to read from/write to */
@@ -268,6 +270,10 @@ extern int netfs_write_begin(struct file *, struct address_space *, void *);extern void netfs_subreq_terminated (struct netfs_io_subrequest *,ssize_t ,bool ); +extern void netfs_get_subrequest (struct netfs_io_subrequest *subreq, +enum netfs_sreq_ref_trace what); +extern void netfs_put_subrequest (struct netfs_io_subrequest *subreq, +bool was_async,enum netfs_sreq_ref_trace what);extern void netfs_stats_show (struct seq_file *);#endif /* _LINUX_NETFS_H */
include/trace/events/netfs.h +40 -0
@@ -64,6 +64,17 @@ EM(netfs_rreq_trace_put_subreq, "PUT SUBREQ ") \ E_(netfs_rreq_trace_new, "NEW ") +#define netfs_sreq_ref_traces \ + EM(netfs_sreq_trace_get_copy_to_cache, "GET COPY2C ") \ + EM(netfs_sreq_trace_get_resubmit, "GET RESUBMIT") \ + EM(netfs_sreq_trace_get_short_read, "GET SHORTRD") \ + EM(netfs_sreq_trace_new, "NEW ") \ + EM(netfs_sreq_trace_put_clear, "PUT CLEAR ") \ + EM(netfs_sreq_trace_put_failed, "PUT FAILED ") \ + EM(netfs_sreq_trace_put_merged, "PUT MERGED ") \ + EM(netfs_sreq_trace_put_no_copy, "PUT NO COPY") \ + E_(netfs_sreq_trace_put_terminated, "PUT TERM ") +#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
@@ -77,6 +88,7 @@ enum netfs_rreq_trace { netfs_rreq_traces } __mode(byte);enum netfs_sreq_trace { netfs_sreq_traces }__mode (byte );enum netfs_failure { netfs_failures }__mode (byte );enum netfs_rreq_ref_trace { netfs_rreq_ref_traces }__mode (byte ); +enum netfs_sreq_ref_trace { netfs_sreq_ref_traces }__mode (byte );#endif
@@ -94,6 +106,7 @@ netfs_sreq_sources; netfs_sreq_traces; netfs_failures; netfs_rreq_ref_traces; +netfs_sreq_ref_traces;/* * Now redefine the EM() and E_() macros to map the enums to the strings that
@@ -264,6 +277,33 @@ TRACE_EVENT(netfs_rreq_ref, __entry->ref) ); +TRACE_EVENT (netfs_sreq_ref, + TP_PROTO(unsigned int rreq_debug_id, unsigned int subreq_debug_index, + int ref, enum netfs_sreq_ref_trace what), + +TP_ARGS (rreq_debug_id, subreq_debug_index, ref, what), + +TP_STRUCT__entry ( + __field(unsigned int, rreq ) + __field(unsigned int, subreq ) + __field(int, ref ) + __field(enum netfs_sreq_ref_trace, what ) + ), + +TP_fast_assign ( + __entry->rreq = rreq_debug_id; + __entry->subreq = subreq_debug_index; + __entry->ref = ref; + __entry->what = what; + ), + +TP_printk ("R=%08x[%x] %s r=%u" , + __entry->rreq, + __entry->subreq, +__print_symbolic (__entry->what, netfs_sreq_ref_traces), + __entry->ref) + ); +#undef EM#undef E_#endif /* _TRACE_NETFS_H */
David Howells
maintainerPATCH v3 9/20 netfs: Adjust the netfs_failure tracepoint to indicate non-subreq lines
In reply to David HowellsAdjust the netfs_failure tracepoint to indicate a subrequest number of -1 when it's a full-request failure unrelated to any particular subrequest, such as a failure to encrypt its data buffer.
---
include/trace/events/netfs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/trace/events/netfs.h +4 -4
@@ -222,7 +222,7 @@ TRACE_EVENT(netfs_failure,TP_STRUCT__entry (__field (unsigned int ,rreq ) - __field(unsigned short, index ) +__field (short, index )__field (short, error ) __field(unsigned short, flags ) __field(enum netfs_io_source, source )
@@ -234,17 +234,17 @@ TRACE_EVENT(netfs_failure,TP_fast_assign ( __entry->rreq = rreq->debug_id; - __entry->index = sreq ? sreq->debug_index :0 ; + __entry->index = sreq ? sreq->debug_index :-1 ; __entry->error = error; __entry->flags = sreq ? sreq->flags :0 ; __entry->source = sreq ? sreq->source :NETFS_INVALID_READ ; __entry->what = what; - __entry->len = sreq ? sreq->len :0 ; + __entry->len = sreq ? sreq->len : rreq->len; __entry->transferred = sreq ? sreq->transferred :0 ; __entry->start = sreq ? sreq->start :0 ; ), - TP_printk("R=%08x[%u] %s f=%02x s=%llx %zx/%zx %s e=%d", + TP_printk("R=%08x[%d] %s f=%02x s=%llx %zx/%zx %s e=%d", __entry->rreq, __entry->index, __print_symbolic(__entry->source, netfs_sreq_sources), __entry->flags,
David Howells
maintainerPATCH v3 10/20 netfs: Refactor arguments for netfs_alloc_read_request
In reply to David HowellsPass start and len to the rreq allocator. This should ensure that the fields are set so that ->init_request() can use them.
Also add a parameter to indicates the origin of the request. Ceph can use this to tell whether to get caps.
Changes
=======
ver #3)
- Change the author to me as Jeff feels that most of the patch is my changes now.
ver #2)
- Show the request origin in the netfs_rreq tracepoint.
---
fs/netfs/internal.h | 7 +++++-- fs/netfs/objects.c | 13 ++++++++++--- fs/netfs/read_helper.c | 23 +++++++++++------------ include/linux/netfs.h | 7 +++++++ include/trace/events/netfs.h | 11 ++++++++++- 5 files changed, 43 insertions(+), 18 deletions(-)
fs/netfs/internal.h +5 -2
@@ -17,9 +17,12 @@/* * objects.c */ -struct netfs_io_request *netfs_alloc_request (const struct netfs_request_ops *ops, +struct netfs_io_request *netfs_alloc_request (struct address_space *mapping, +struct file *file, +const struct netfs_request_ops *ops,void *netfs_priv, -struct file *file); +loff_t start,size_t len, +enum netfs_io_origin origin);void netfs_get_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what);void netfs_clear_subrequests (struct netfs_io_request *rreq,bool was_async); void netfs_put_request(struct netfs_io_request *rreq, bool was_async,
fs/netfs/objects.c +10 -3
@@ -11,17 +11,24 @@/* * Allocate an I/O request and initialise it. */ -struct netfs_io_request *netfs_alloc_request ( -const struct netfs_request_ops *ops,void *netfs_priv, -struct file *file) +struct netfs_io_request *netfs_alloc_request (struct address_space *mapping, +struct file *file, +const struct netfs_request_ops *ops, +void *netfs_priv, +loff_t start,size_t len, +enum netfs_io_origin origin) {static atomic_t debug_ids;struct netfs_io_request *rreq; rreq =kzalloc (sizeof (struct netfs_io_request ),GFP_KERNEL );if (rreq) { + rreq->start = start; + rreq->len = len; + rreq->origin = origin; rreq->netfs_ops = ops; rreq->netfs_priv = netfs_priv; + rreq->mapping = mapping; rreq->inode =file_inode (file); rreq->i_size =i_size_read (rreq->inode); rreq->debug_id =atomic_inc_return (&debug_ids);
fs/netfs/read_helper.c +11 -12
@@ -763,12 +763,13 @@ void netfs_readahead(struct readahead_control *ractl,if (readahead_count (ractl) ==0 ) goto cleanup; - rreq =netfs_alloc_request (ops, netfs_priv, ractl->file); + rreq =netfs_alloc_request (ractl->mapping, ractl->file, + ops, netfs_priv, +readahead_pos (ractl), +readahead_length (ractl), +NETFS_READAHEAD );if (!rreq) goto cleanup; - rreq->mapping = ractl->mapping; - rreq->start =readahead_pos (ractl); - rreq->len =readahead_length (ractl);if (ops->begin_cache_operation) { ret = ops->begin_cache_operation (rreq);
@@ -838,16 +839,15 @@ int netfs_readpage(struct file *file,_enter ("%lx" ,folio_index (folio)); - rreq =netfs_alloc_request (ops, netfs_priv, file); + rreq =netfs_alloc_request (folio->mapping, file, ops, netfs_priv, +folio_file_pos (folio),folio_size (folio), +NETFS_READPAGE );if (!rreq) {if (netfs_priv) ops->cleanup (folio_file_mapping (folio), netfs_priv);folio_unlock (folio);return -ENOMEM ; } - rreq->mapping =folio_file_mapping (folio); - rreq->start =folio_file_pos (folio); - rreq->len =folio_size (folio);if (ops->begin_cache_operation) { ret = ops->begin_cache_operation (rreq);
@@ -1008,12 +1008,11 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, } ret = -ENOMEM ; - rreq =netfs_alloc_request (ops, netfs_priv, file); + rreq =netfs_alloc_request (mapping, file, ops, netfs_priv, +folio_file_pos (folio),folio_size (folio), +NETFS_READ_FOR_WRITE );if (!rreq) goto error; - rreq->mapping =folio_file_mapping (folio); - rreq->start =folio_file_pos (folio); - rreq->len =folio_size (folio); rreq->no_unlock_folio =folio_index (folio);__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); netfs_priv =NULL ;
include/linux/netfs.h +7 -0
@@ -150,6 +150,12 @@ struct netfs_io_subrequest {#define NETFS_SREQ_NO_PROGRESS 4/* Set if we didn't manage to read any data */ }; +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 */ +}__mode (byte ); +/* * Descriptor for an I/O helper request. This is used to make multiple I/O * operations to a variety of data stores and then stitch the result together.
@@ -167,6 +173,7 @@ struct netfs_io_request {size_t submitted;/* Amount submitted for I/O so far */ size_t len;/* Length of the request */ short error;/* 0 or error that occurred */ +enum netfs_io_origin origin;/* Origin of the request */ 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 */
include/trace/events/netfs.h +10 -1
@@ -21,6 +21,11 @@ EM(netfs_read_trace_readpage, "READPAGE ") \ E_(netfs_read_trace_write_begin, "WRITEBEGN") +#define netfs_rreq_origins \ + EM(NETFS_READAHEAD, "RA") \ + EM(NETFS_READPAGE, "RP") \ + E_(NETFS_READ_FOR_WRITE, "RW") +#define netfs_rreq_traces \ EM(netfs_rreq_trace_assess, "ASSESS ") \ EM(netfs_rreq_trace_copy, "COPY ") \
@@ -101,6 +106,7 @@ enum netfs_sreq_ref_trace { netfs_sreq_ref_traces } __mode(byte);#define E_ (a, b) TRACE_DEFINE_ENUM(a); netfs_read_traces; +netfs_rreq_origins; netfs_rreq_traces; netfs_sreq_sources; netfs_sreq_traces;
@@ -159,17 +165,20 @@ TRACE_EVENT(netfs_rreq,TP_STRUCT__entry (__field (unsigned int ,rreq ) __field(unsigned int, flags ) + __field(enum netfs_io_origin, origin ) __field(enum netfs_rreq_trace, what ) ),TP_fast_assign ( __entry->rreq = rreq->debug_id; __entry->flags = rreq->flags; + __entry->origin = rreq->origin; __entry->what = what; ), -TP_printk ("R=%08x %s f=%02x" , +TP_printk ("R=%08x %s %s f=%02x" , __entry->rreq, +__print_symbolic (__entry->origin, netfs_rreq_origins),__print_symbolic (__entry->what, netfs_rreq_traces), __entry->flags) );
David Howells
maintainerPATCH v3 11/20 netfs: Change ->init_request() to return an error code
In reply to David HowellsChange the request initialisation function to return an error code so that the network filesystem can return a failure (ENOMEM, for example).
This will also allow ceph to abort a ->readahead() op if the server refuses to give it a cap allowing local caching from within the netfslib framework (errors aren't passed back through ->readahead(), so returning, say, -ENOBUFS will cause the op to be aborted).
---
fs/9p/vfs_addr.c | 3 ++- fs/afs/file.c | 3 ++- fs/netfs/objects.c | 41 ++++++++++++++++++++++++----------------- fs/netfs/read_helper.c | 20 ++++++++++++-------- include/linux/netfs.h | 2 +- 5 files changed, 41 insertions(+), 28 deletions(-)
fs/9p/vfs_addr.c +2 -1
@@ -56,12 +56,13 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq)* @rreq: The read request * @file: The file being read from */ -static void v9fs_init_request (struct netfs_io_request *rreq,struct file *file) +static int v9fs_init_request (struct netfs_io_request *rreq,struct file *file) {struct p9_fid *fid = file->private_data;refcount_inc (&fid->count); rreq->netfs_priv = fid; +return 0 ; }/**
fs/afs/file.c +2 -1
@@ -359,9 +359,10 @@ static int afs_symlink_readpage(struct file *file, struct page *page)return ret; } -static void afs_init_request (struct netfs_io_request *rreq,struct file *file) +static int afs_init_request (struct netfs_io_request *rreq,struct file *file) { rreq->netfs_priv =key_get (afs_file_key (file)); +return 0 ; }static bool afs_is_cache_enabled (struct inode *inode)
fs/netfs/objects.c +24 -17
51 lines not on this page · raw message
fs/netfs/read_helper.c +12 -8
@@ -768,7 +768,7 @@ void netfs_readahead(struct readahead_control *ractl,readahead_pos (ractl),readahead_length (ractl), NETFS_READAHEAD); -if (!rreq) +if (IS_ERR (rreq)) goto cleanup;if (ops->begin_cache_operation) {
@@ -842,11 +842,9 @@ int netfs_readpage(struct file *file, rreq =netfs_alloc_request (folio->mapping, file, ops, netfs_priv,folio_file_pos (folio),folio_size (folio),NETFS_READPAGE ); -if (!rreq) { -if (netfs_priv) - ops->cleanup (folio_file_mapping (folio), netfs_priv); -folio_unlock (folio); -return -ENOMEM ; +if (IS_ERR (rreq)) { + ret =PTR_ERR (rreq); + goto alloc_error; }if (ops->begin_cache_operation) {
@@ -887,6 +885,11 @@ int netfs_readpage(struct file *file, out:netfs_put_request (rreq, false, netfs_rreq_trace_put_hold);return ret; +alloc_error: +if (netfs_priv) + ops->cleanup (folio_file_mapping (folio), netfs_priv); +folio_unlock (folio); +return ret; }EXPORT_SYMBOL (netfs_readpage);
@@ -1007,12 +1010,13 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, goto have_folio_no_wait; } - ret = -ENOMEM ; rreq =netfs_alloc_request (mapping, file, ops, netfs_priv,folio_file_pos (folio),folio_size (folio),NETFS_READ_FOR_WRITE ); -if (!rreq) +if (IS_ERR (rreq)) { + ret =PTR_ERR (rreq); goto error; + } rreq->no_unlock_folio =folio_index (folio);__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); netfs_priv =NULL ;
include/linux/netfs.h +1 -1
@@ -193,7 +193,7 @@ struct netfs_io_request {*/ struct netfs_request_ops {bool (*is_cache_enabled)(struct inode *inode); -void (*init_request)(struct netfs_io_request *rreq,struct file *file); +int (*init_request)(struct netfs_io_request *rreq,struct file *file);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);
David Howells
maintainerPATCH v3 12/20 ceph: Make ceph_init_request() check caps on readahead
In reply to David HowellsMove the caps check from ceph_readahead() to ceph_init_request(), conditional on the origin being NETFS_READAHEAD so that in a future patch, ceph can point its ->readahead() vector directly at netfs_readahead().
Changes
=======
ver #3)
- Split from the patch to add a netfs inode context[1].
- Need to store the caps got in rreq->netfs_priv for later freeing.
---
fs/ceph/addr.c | 69 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 28 deletions(-)
fs/ceph/addr.c +41 -28
@@ -354,6 +354,45 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)dout ("%s: result %d\n" , __func__, err); } +static int ceph_init_request (struct netfs_io_request *rreq,struct file *file) +{ +struct inode *inode = rreq->inode; +int got =0 , want =CEPH_CAP_FILE_CACHE ; +int ret =0 ; + +if (file) { +struct ceph_rw_context *rw_ctx; +struct ceph_file_info *fi = file->private_data; + + rw_ctx =ceph_find_rw_context (fi); +if (rw_ctx) +return 0 ; + } + +if (rreq->origin !=NETFS_READAHEAD ) +return 0 ; + +/* +* readahead callers do not necessarily hold Fcb caps +* (e.g. fadvise, madvise). +*/ + ret =ceph_try_get_caps (inode,CEPH_CAP_FILE_RD , want, true, &got); +if (ret <0 ) { +dout ("start_read %p, error getting cap\n" , inode); +return ret; + } + +if (!(got & want)) { +dout ("start_read %p, no cache cap\n" , inode); +return -EACCES ; + } +if (ret ==0 ) +return -EACCES ; + + rreq->netfs_priv = (void *)(uintptr_t )got; +return 0 ; +} +static void ceph_readahead_cleanup (struct address_space *mapping,void *priv) {struct inode *inode = mapping->host;
@@ -365,7 +404,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv) }static const struct netfs_request_ops ceph_netfs_read_ops = { - .is_cache_enabled = ceph_is_cache_enabled, + .init_request = ceph_init_request, .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read, .expand_readahead = ceph_netfs_expand_readahead,
@@ -393,33 +432,7 @@ static int ceph_readpage(struct file *file, struct page *subpage)static void ceph_readahead (struct readahead_control *ractl) { -struct inode *inode =file_inode (ractl->file); -struct ceph_file_info *fi = ractl->file->private_data; -struct ceph_rw_context *rw_ctx; -int got =0 ; -int ret =0 ; - -if (ceph_inode (inode)->i_inline_version !=CEPH_INLINE_NONE ) -return ; - - rw_ctx =ceph_find_rw_context (fi); -if (!rw_ctx) { -/* -* readahead callers do not necessarily hold Fcb caps -* (e.g. fadvise, madvise). -*/ -int want =CEPH_CAP_FILE_CACHE ; - - ret =ceph_try_get_caps (inode,CEPH_CAP_FILE_RD , want, true, &got); -if (ret <0 ) -dout ("start_read %p, error getting cap\n" , inode); -else if (!(got & want)) -dout ("start_read %p, no cache cap\n" , inode); - -if (ret <=0 ) -return ; - } -netfs_readahead (ractl, &ceph_netfs_read_ops, (void *)(uintptr_t )got); +netfs_readahead (ractl, &ceph_netfs_read_ops,NULL ); }#ifdef CONFIG_CEPH_FSCACHE
Re: [PATCH v3 12/20] ceph: Make ceph_init_request() check caps on readahead
Quoted 35 lines · David Howells
Move the caps check from
ceph_readahead()toceph_init_request(), conditional on the origin beingNETFS_READAHEADso that in a future patch, ceph can point its ->readahead() vector directly atnetfs_readahead().Changes
=======
ver #3)
- Split from the patch to add a netfs inode context[1].
- Need to store the caps got inrreq->netfs_privfor later freeing.Signed-off-by David Howells <[email protected]>---
fs/ceph/addr.c | 69 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 28 deletions(-)fs/ceph/addr.c +8
-0@@ -354,6 +354,45 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)dout ("%s: result %d\n" , __func__, err); } +static int ceph_init_request (struct netfs_io_request *rreq,struct file *file) +{ +struct inode *inode = rreq->inode; +int got =0 , want =CEPH_CAP_FILE_CACHE ; +int ret =0 ; + +if (file) { +struct ceph_rw_context *rw_ctx;
fs/ceph/addr.c static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) · line 374
Quoted 10 lines
fs/ceph/addr.c +10
-0+struct ceph_file_info *fi = file->private_data; + + rw_ctx =ceph_find_rw_context (fi); +if (rw_ctx) +return 0 ; + } + +if (rreq->origin !=NETFS_READAHEAD ) +return 0 ; +
^^^
I think you should move this check above the if (file) block above it. We don't need to anything at all if we're not in readahead.
Quoted 70 lines
fs/ceph/addr.c +23
-28+/* +* readahead callers do not necessarily hold Fcb caps +* (e.g. fadvise, madvise). +*/ + ret =ceph_try_get_caps (inode,CEPH_CAP_FILE_RD , want, true, &got); +if (ret <0 ) { +dout ("start_read %p, error getting cap\n" , inode); +return ret; + } + +if (!(got & want)) { +dout ("start_read %p, no cache cap\n" , inode); +return -EACCES ; + } +if (ret ==0 ) +return -EACCES ; + + rreq->netfs_priv = (void *)(uintptr_t )got; +return 0 ; +} +static void ceph_readahead_cleanup (struct address_space *mapping,void *priv) {struct inode *inode = mapping->host;@@ -365,7 +404,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv) }static const struct netfs_request_ops ceph_netfs_read_ops = { - .is_cache_enabled = ceph_is_cache_enabled, + .init_request = ceph_init_request, .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read, .expand_readahead = ceph_netfs_expand_readahead,@@ -393,33 +432,7 @@ static int ceph_readpage(struct file *file, struct page *subpage)static void ceph_readahead (struct readahead_control *ractl) { -struct inode *inode =file_inode (ractl->file); -struct ceph_file_info *fi = ractl->file->private_data; -struct ceph_rw_context *rw_ctx; -int got =0 ; -int ret =0 ; - -if (ceph_inode (inode)->i_inline_version !=CEPH_INLINE_NONE ) -return ; - - rw_ctx =ceph_find_rw_context (fi); -if (!rw_ctx) { -/* -* readahead callers do not necessarily hold Fcb caps -* (e.g. fadvise, madvise). -*/ -int want =CEPH_CAP_FILE_CACHE ; - - ret =ceph_try_get_caps (inode,CEPH_CAP_FILE_RD , want, true, &got); -if (ret <0 ) -dout ("start_read %p, error getting cap\n" , inode); -else if (!(got & want)) -dout ("start_read %p, no cache cap\n" , inode); - -if (ret <=0 ) -return ; - } -netfs_readahead (ractl, &ceph_netfs_read_ops, (void *)(uintptr_t )got); +netfs_readahead (ractl, &ceph_netfs_read_ops,NULL ); }#ifdef CONFIG_CEPH_FSCACHE
Signature · 1 line
Jeff Layton <[email protected]>
David Howells
maintainerRe: [PATCH v3 12/20] ceph: Make ceph_init_request() check caps on readahead
Quoted 14 lines · Jeff Layton
Quoted 14 lines
(quoted diff) +14
-0+static int ceph_init_request(struct netfs_io_request *rreq, struct file *file) +{ + struct inode *inode = rreq->inode; + int got = 0, want = CEPH_CAP_FILE_CACHE; + int ret = 0; + + if (file) { + struct ceph_rw_context *rw_ctx; + struct ceph_file_info *fi = file->private_data; + + rw_ctx = ceph_find_rw_context(fi); + if (rw_ctx) + return 0; + }
Quoted 8 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ + if (rreq->origin != NETFS_READAHEAD) + return 0; +^^^
I think you should move this check above the if (file) block above it. We don't need to anything at all if we're not in readahead.
How about the attached, then?
David
---
commit 7082946186fc26016b15bc9039bd6d92ae732ef3
Author: David Howells <[email protected]> Date: Wed Mar 9 21:45:22 2022 +0000
ceph: Make ceph_init_request() check caps on readahead
Move the caps check from ceph_readahead() to ceph_init_request(), conditional on the origin being NETFS_READAHEAD so that in a future patch, ceph can point its ->readahead() vector directly at netfs_readahead().
Changes
=======
ver #4)
- Move the check for NETFS_READAHEAD up in ceph_init_request()[2].
ver #3)
- Split from the patch to add a netfs inode context[1].
- Need to store the caps got in rreq->netfs_priv for later freeing.
fs/ceph/addr.c +41 -28
@@ -354,6 +354,45 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)dout ("%s: result %d\n" , __func__, err); } +static int ceph_init_request (struct netfs_io_request *rreq,struct file *file) +{ +struct inode *inode = rreq->inode; +int got =0 , want =CEPH_CAP_FILE_CACHE ; +int ret =0 ; + +if (rreq->origin !=NETFS_READAHEAD ) +return 0 ; + +if (file) { +struct ceph_rw_context *rw_ctx; +struct ceph_file_info *fi = file->private_data; + + rw_ctx =ceph_find_rw_context (fi); +if (rw_ctx) +return 0 ; + } + +/* +* readahead callers do not necessarily hold Fcb caps +* (e.g. fadvise, madvise). +*/ + ret =ceph_try_get_caps (inode,CEPH_CAP_FILE_RD , want, true, &got); +if (ret <0 ) { +dout ("start_read %p, error getting cap\n" , inode); +return ret; + } + +if (!(got & want)) { +dout ("start_read %p, no cache cap\n" , inode); +return -EACCES ; + } +if (ret ==0 ) +return -EACCES ; + + rreq->netfs_priv = (void *)(uintptr_t )got; +return 0 ; +} +static void ceph_readahead_cleanup (struct address_space *mapping,void *priv) {struct inode *inode = mapping->host;
@@ -365,7 +404,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv) }static const struct netfs_request_ops ceph_netfs_read_ops = { - .is_cache_enabled = ceph_is_cache_enabled, + .init_request = ceph_init_request, .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read, .expand_readahead = ceph_netfs_expand_readahead,
@@ -393,33 +432,7 @@ static int ceph_readpage(struct file *file, struct page *subpage)static void ceph_readahead (struct readahead_control *ractl) { -struct inode *inode =file_inode (ractl->file); -struct ceph_file_info *fi = ractl->file->private_data; -struct ceph_rw_context *rw_ctx; -int got =0 ; -int ret =0 ; - -if (ceph_inode (inode)->i_inline_version !=CEPH_INLINE_NONE ) -return ; - - rw_ctx =ceph_find_rw_context (fi); -if (!rw_ctx) { -/* -* readahead callers do not necessarily hold Fcb caps -* (e.g. fadvise, madvise). -*/ -int want =CEPH_CAP_FILE_CACHE ; - - ret =ceph_try_get_caps (inode,CEPH_CAP_FILE_RD , want, true, &got); -if (ret <0 ) -dout ("start_read %p, error getting cap\n" , inode); -else if (!(got & want)) -dout ("start_read %p, no cache cap\n" , inode); - -if (ret <=0 ) -return ; - } -netfs_readahead (ractl, &ceph_netfs_read_ops, (void *)(uintptr_t )got); +netfs_readahead (ractl, &ceph_netfs_read_ops,NULL ); }#ifdef CONFIG_CEPH_FSCACHE
Re: [PATCH v3 12/20] ceph: Make ceph_init_request() check caps on readahead
Quoted 139 lines · David Howells
Quoted 14 lines · Jeff Layton
Quoted 14 lines
fs/ceph/addr.c +14
-0+static int ceph_init_request (struct netfs_io_request *rreq,struct file *file) +{ +struct inode *inode = rreq->inode; +int got =0 , want =CEPH_CAP_FILE_CACHE ; +int ret =0 ; + +if (file) { +struct ceph_rw_context *rw_ctx; +struct ceph_file_info *fi = file->private_data; + + rw_ctx =ceph_find_rw_context (fi); +if (rw_ctx) +return 0 ; + }Quoted 8 lines
fs/ceph/addr.c static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) · line 365
Quoted 4 lines
fs/ceph/addr.c +4
-0+ +if (rreq->origin !=NETFS_READAHEAD ) +return 0 ; +^^^
I think you should move this check above the if (file) block above it. We don't need to anything at all if we're not in readahead.How about the attached, then?
David
---
commit7082946186fc26016b15bc9039bd6d92ae732ef3Author: David Howells <[email protected]> Date: Wed Mar 9 21:45:22 2022 +0000ceph: Make
ceph_init_request()check caps on readaheadMove the caps check from
ceph_readahead()toceph_init_request(), conditional on the origin beingNETFS_READAHEADso that in a future patch, ceph can point its ->readahead() vector directly atnetfs_readahead().Changes
=======
ver #4)
- Move the check forNETFS_READAHEADup in ceph_init_request()[2].ver #3)
- Split from the patch to add a netfs inode context[1].
- Need to store the caps got inrreq->netfs_privfor later freeing.Signed-off-by David Howells <[email protected]>fs/ceph/addr.c +40
-22@@ -354,6 +354,45 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)dout ("%s: result %d\n" , __func__, err); } +static int ceph_init_request (struct netfs_io_request *rreq,struct file *file) +{ +struct inode *inode = rreq->inode; +int got =0 , want =CEPH_CAP_FILE_CACHE ; +int ret =0 ; + +if (rreq->origin !=NETFS_READAHEAD ) +return 0 ; + +if (file) { +struct ceph_rw_context *rw_ctx; +struct ceph_file_info *fi = file->private_data; + + rw_ctx =ceph_find_rw_context (fi); +if (rw_ctx) +return 0 ; + } + +/* +* readahead callers do not necessarily hold Fcb caps +* (e.g. fadvise, madvise). +*/ + ret =ceph_try_get_caps (inode,CEPH_CAP_FILE_RD , want, true, &got); +if (ret <0 ) { +dout ("start_read %p, error getting cap\n" , inode); +return ret; + } + +if (!(got & want)) { +dout ("start_read %p, no cache cap\n" , inode); +return -EACCES ; + } +if (ret ==0 ) +return -EACCES ; + + rreq->netfs_priv = (void *)(uintptr_t )got; +return 0 ; +} +static void ceph_readahead_cleanup (struct address_space *mapping,void *priv) {struct inode *inode = mapping->host;@@ -365,7 +404,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv) }static const struct netfs_request_ops ceph_netfs_read_ops = { - .is_cache_enabled = ceph_is_cache_enabled, + .init_request = ceph_init_request, .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read, .expand_readahead = ceph_netfs_expand_readahead,@@ -393,33 +432,7 @@ static int ceph_readpage(struct file *file, struct page *subpage)static void ceph_readahead (struct readahead_control *ractl) { -struct inode *inode =file_inode (ractl->file); -struct ceph_file_info *fi = ractl->file->private_data; -struct ceph_rw_context *rw_ctx; -int got =0 ; -int ret =0 ; - -if (ceph_inode (inode)->i_inline_version !=CEPH_INLINE_NONE ) -return ; - - rw_ctx =ceph_find_rw_context (fi); -if (!rw_ctx) { -/* -* readahead callers do not necessarily hold Fcb caps -* (e.g. fadvise, madvise). -*/ -int want =CEPH_CAP_FILE_CACHE ; - - ret =ceph_try_get_caps (inode,CEPH_CAP_FILE_RD , want, true, &got); -if (ret <0 ) -dout ("start_read %p, error getting cap\n" , inode); -else if (!(got & want))
fs/ceph/addr.c static int ceph_readpage(struct file *file, struct page *subpage) · line 438
Quoted 10 lines
fs/ceph/addr.c +1
-6-dout ("start_read %p, no cache cap\n" , inode); - -if (ret <=0 ) -return ; - } -netfs_readahead (ractl, &ceph_netfs_read_ops, (void *)(uintptr_t )got); +netfs_readahead (ractl, &ceph_netfs_read_ops,NULL ); }#ifdef CONFIG_CEPH_FSCACHE
LGTM,
David Howells
maintainerPATCH v3 13/20 netfs: Add a netfs inode context
In reply to David HowellsAdd a netfs_i_context struct that should be included in the network filesystem's own inode struct wrapper, directly after the VFS's inode struct, e.g.:
struct my_inode {
struct {
/* These must be contiguous */
struct inode vfs_inode;
struct netfs_i_context netfs_ctx;
};
};The netfs_i_context struct so far contains a single field for the network filesystem to use - the cache cookie:
struct netfs_i_context {
...
struct fscache_cookie *cache;
};Three functions are provided to help with this:
(1) void netfs_i_context_init(struct inode *inode,
const struct netfs_request_ops *ops);
Initialise the netfs context and set the operations. (2) struct netfs_i_context *netfs_i_context(struct inode *inode);
Find the netfs context from the VFS inode.
(3) struct inode *netfs_inode(struct netfs_i_context *ctx);
Find the VFS inode from the netfs context.
Changes
=======
ver #3)
- Split out the bit to move ceph cap-getting on readahead into ceph_init_request()[1].
- Stick in a comment to the netfs inode structs indicating the contiguity requirements[2].
ver #2)
- Adjust documentation to match.
- Use "#if IS_ENABLED()" in netfs_i_cookie(), not "#ifdef".
- Move the cap check from ceph_readahead() to ceph_init_request() to be called from netfslib.
- Remove ceph_readahead() and use netfs_readahead() directly instead.
---
Documentation/filesystems/netfs_library.rst | 101 +++++++++++++++++++-------- fs/9p/cache.c | 10 +-- fs/9p/v9fs.c | 4 - fs/9p/v9fs.h | 13 ++- fs/9p/vfs_addr.c | 43 +---------- fs/9p/vfs_inode.c | 13 +++ fs/afs/dynroot.c | 1 fs/afs/file.c | 26 +------ fs/afs/inode.c | 31 +++++--- fs/afs/internal.h | 19 ++++- fs/afs/super.c | 4 - fs/afs/write.c | 3 - fs/ceph/addr.c | 31 +------- fs/ceph/cache.c | 28 ++++--- fs/ceph/cache.h | 11 --- fs/ceph/inode.c | 6 +- fs/ceph/super.h | 17 ++--- fs/cifs/cifsglob.h | 10 ++- fs/cifs/fscache.c | 11 ++- fs/cifs/fscache.h | 2 - fs/netfs/internal.h | 17 ++++- fs/netfs/objects.c | 12 ++- fs/netfs/read_helper.c | 100 ++++++++++++--------------- fs/netfs/stats.c | 1 include/linux/netfs.h | 81 +++++++++++++++++++--- 25 files changed, 317 insertions(+), 278 deletions(-)
Documentation/filesystems/netfs_library.rst +72 -29
@@ -7,6 +7,8 @@ Network Filesystem Helper Library .. Contents: - Overview. + - Per-inode context. + - Inode context helper functions. - Buffered read helpers. - Read helper functions. - Read helper structures.
@@ -28,6 +30,69 @@ Note that the library module doesn't link against local caching directly, so access must be provided by the netfs. +Per-Inode Context +================= + +The network filesystem helper library needs a place to store a bit of state for +its use on each netfs inode it is helping to manage. To this end, a context +structure is defined:: + + struct netfs_i_context { + const struct netfs_request_ops *ops; + struct fscache_cookie *cache; + }; + +A network filesystem that wants to use netfs lib must place one of these +directly after the VFS ``struct inode`` it allocates, usually as part of its +own struct. This can be done in a way similar to the following:: + + struct my_inode { + struct { + /* These must be contiguous */ + struct inode vfs_inode; + struct netfs_i_context netfs_ctx; + }; + ... + }; + +This allows netfslib to find its state by simple offset from the inode pointer, +thereby allowing the netfslib helper functions to be pointed to directly by the +VFS/VM operation tables. + +The structure contains the following fields: + + * ``ops`` + + The set of operations provided by the network filesystem to netfslib. + + * ``cache`` + + Local caching cookie, or NULL if no caching is enabled. This field does not + exist if fscache is disabled. + + +Inode Context Helper Functions +------------------------------ + +To help deal with the per-inode context, a number helper functions are +provided. Firstly, a function to perform basic initialisation on a context and +set the operations table pointer:: + + void netfs_i_context_init(struct inode *inode, + const struct netfs_request_ops *ops); + +then two functions to cast between the VFS inode structure and the netfs +context:: + + struct netfs_i_context *netfs_i_context(struct inode *inode); + struct inode *netfs_inode(struct netfs_i_context *ctx); + +and finally, a function to get the cache cookie pointer from the context +attached to an inode (or NULL if fscache is disabled):: + + struct fscache_cookie *netfs_i_cookie(struct inode *inode); + + Buffered Read Helpers =====================
@@ -70,38 +135,22 @@ Read Helper Functions Three read helpers are provided:: - void netfs_readahead(struct readahead_control *ractl, - const struct netfs_request_ops *ops, - void *netfs_priv); + void netfs_readahead(struct readahead_control *ractl); int netfs_readpage(struct file *file, - struct folio *folio, - const struct netfs_request_ops *ops, - void *netfs_priv); + struct page *page); int netfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int flags, struct folio **_folio, - void **_fsdata, - const struct netfs_request_ops *ops, - void *netfs_priv); - -Each corresponds to a VM operation, with the addition of a couple of parameters -for the use of the read helpers: + void **_fsdata); - * ``ops`` - - A table of operations through which the helpers can talk to the filesystem. - - * ``netfs_priv`` +Each corresponds to a VM address space operation. These operations use the +state in the per-inode context. - Filesystem private data (can be NULL). - -Both of these values will be stored into the read request structure. - -For ->readahead() and ->readpage(), the network filesystem should just jump -into the corresponding read helper; whereas for ->write_begin(), it may be a +For ->readahead() and ->readpage(), the network filesystem just point directly +at the corresponding read helper; whereas for ->write_begin(), it may be a little more complicated as the network filesystem might want to flush conflicting writes or track dirty data and needs to put the acquired folio if an error occurs after calling the helper.
@@ -246,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); - bool (*is_cache_enabled)(struct inode *inode); 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);
@@ -265,11 +313,6 @@ The operations are as follows: [Optional] This is called to initialise the request structure. It is given the file for reference and can modify the ->netfs_priv value. - * ``is_cache_enabled()`` - - [Required] This is called by netfs_write_begin() to ask if the file is being - cached. It should return true if it is being cached and false otherwise. - * ``begin_cache_operation()`` [Optional] This is called to ask the network filesystem to call into the
fs/9p/cache.c +4 -6
@@ -49,22 +49,20 @@ int v9fs_cache_session_get_cookie(struct v9fs_session_info *v9ses,void v9fs_cache_inode_get_cookie (struct inode *inode) { -struct v9fs_inode *v9inode; +struct v9fs_inode *v9inode =V9FS_I (inode);struct v9fs_session_info *v9ses;__le32 version;__le64 path;if (!S_ISREG (inode->i_mode))return ; - - v9inode =V9FS_I (inode); -if (WARN_ON (v9inode->fscache)) +if (WARN_ON (v9fs_inode_cookie (v9inode)))return ; version =cpu_to_le32 (v9inode->qid.version); path =cpu_to_le64 (v9inode->qid.path); v9ses =v9fs_inode2v9ses (inode); - v9inode->fscache = + v9inode->netfs_ctx.cache = fscache_acquire_cookie(v9fs_session_cache(v9ses), 0, &path, sizeof(path),
@@ -72,5 +70,5 @@ void v9fs_cache_inode_get_cookie(struct inode *inode) i_size_read(&v9inode->vfs_inode));p9_debug (P9_DEBUG_FSC ,"inode %p get cookie %p\n" , - inode, v9inode->fscache); + inode,v9fs_inode_cookie (v9inode)); }
fs/9p/v9fs.c +1 -3
@@ -623,9 +623,7 @@ static void v9fs_sysfs_cleanup(void)static void v9fs_inode_init_once (void *foo) {struct v9fs_inode *v9inode = (struct v9fs_inode *)foo; -#ifdef CONFIG_9P_FSCACHE - v9inode->fscache =NULL ; -#endif +memset (&v9inode->qid,0 ,sizeof (v9inode->qid));inode_init_once (&v9inode->vfs_inode); }
fs/9p/v9fs.h +8 -5
@@ -9,6 +9,7 @@#define FS_9P_V9FS_H #include <linux/backing-dev.h> +#include <linux/netfs.h> /** * enum p9_session_flags - option flags for each 9P session
@@ -108,14 +109,15 @@ struct v9fs_session_info {#define V9FS_INO_INVALID_ATTR 0x01struct v9fs_inode { -#ifdef CONFIG_9P_FSCACHE -struct fscache_cookie *fscache; -#endif +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct p9_qid qid;unsigned int cache_validity;struct p9_fid *writeback_fid;struct mutex v_mutex; -struct inode vfs_inode; };static inline struct v9fs_inode *V9FS_I (const struct inode *inode)
@@ -126,7 +128,7 @@ static inline struct v9fs_inode *V9FS_I(const struct inode *inode)static inline struct fscache_cookie *v9fs_inode_cookie (struct v9fs_inode *v9inode) {#ifdef CONFIG_9P_FSCACHE -return v9inode->fscache; +return netfs_i_cookie (&v9inode->vfs_inode);#else return NULL ;#endif
@@ -163,6 +165,7 @@ extern struct inode *v9fs_inode_from_fid(struct v9fs_session_info *v9ses,extern const struct inode_operations v9fs_dir_inode_operations_dotl;extern const struct inode_operations v9fs_file_inode_operations_dotl;extern const struct inode_operations v9fs_symlink_inode_operations_dotl; +extern const struct netfs_request_ops v9fs_req_ops;extern struct inode *v9fs_inode_from_fid_dotl (struct v9fs_session_info *v9ses,struct p9_fid *fid,struct super_block *sb,int new);
fs/9p/vfs_addr.c +4 -39
73 lines not on this page · raw message
fs/9p/vfs_inode.c +10 -3
@@ -231,9 +231,6 @@ struct inode *v9fs_alloc_inode(struct super_block *sb) v9inode =kmem_cache_alloc (v9fs_inode_cache,GFP_KERNEL );if (!v9inode)return NULL ; -#ifdef CONFIG_9P_FSCACHE - v9inode->fscache =NULL ; -#endif v9inode->writeback_fid =NULL ; v9inode->cache_validity =0 ;mutex_init (&v9inode->v_mutex);
@@ -250,6 +247,14 @@ void v9fs_free_inode(struct inode *inode)kmem_cache_free (v9fs_inode_cache,V9FS_I (inode)); } +/* +* Set parameters for the netfs library +*/ +static void v9fs_set_netfs_context (struct inode *inode) +{ +netfs_i_context_init (inode, &v9fs_req_ops); +} +int v9fs_init_inode (struct v9fs_session_info *v9ses,struct inode *inode,umode_t mode,dev_t rdev) {
@@ -338,6 +343,8 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses, err = -EINVAL ; goto error; } + +v9fs_set_netfs_context (inode); error:return err;
fs/afs/dynroot.c +1 -0
@@ -76,6 +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_i_context_init (inode,NULL ); inode->i_size =0 ; inode->i_mode =S_IFDIR |S_IRUGO |S_IXUGO ;if (root) {
fs/afs/file.c +2 -24
@@ -19,13 +19,11 @@#include "internal.h" static int afs_file_mmap (struct file *file,struct vm_area_struct *vma); -static int afs_readpage (struct file *file,struct page *page);static int afs_symlink_readpage (struct file *file,struct page *page);static void afs_invalidatepage (struct page *page,unsigned int offset,unsigned int length);static int afs_releasepage (struct page *page,gfp_t gfp_flags); -static void afs_readahead (struct readahead_control *ractl);static ssize_t afs_file_read_iter (struct kiocb *iocb,struct iov_iter *iter);static void afs_vm_open (struct vm_area_struct *area);static void afs_vm_close (struct vm_area_struct *area);
@@ -52,8 +50,8 @@ const struct inode_operations afs_file_inode_operations = { };const struct address_space_operations afs_file_aops = { - .readpage = afs_readpage, - .readahead = afs_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .set_page_dirty = afs_set_page_dirty, .launder_page = afs_launder_page, .releasepage = afs_releasepage,
@@ -365,13 +363,6 @@ static int afs_init_request(struct netfs_io_request *rreq, struct file *file)return 0 ; } -static bool afs_is_cache_enabled (struct inode *inode) -{ -struct fscache_cookie *cookie =afs_vnode_cache (AFS_FS_I (inode)); - -return fscache_cookie_enabled (cookie) && cookie->cache_priv; -} -static int afs_begin_cache_operation (struct netfs_io_request *rreq) {#ifdef CONFIG_AFS_FSCACHE
@@ -399,25 +390,12 @@ static void afs_priv_cleanup(struct address_space *mapping, void *netfs_priv)const struct netfs_request_ops afs_req_ops = { .init_request = afs_init_request, - .is_cache_enabled = afs_is_cache_enabled, .begin_cache_operation = afs_begin_cache_operation, .check_write_begin = afs_check_write_begin, .issue_read = afs_issue_read, .cleanup = afs_priv_cleanup, }; -static int afs_readpage (struct file *file,struct page *page) -{ -struct folio *folio =page_folio (page); - -return netfs_readpage (file, folio, &afs_req_ops,NULL ); -} - -static void afs_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &afs_req_ops,NULL ); -} -int afs_write_inode (struct inode *inode,struct writeback_control *wbc) {fscache_unpin_writeback (wbc,afs_vnode_cache (AFS_FS_I (inode)));
fs/afs/inode.c +20 -11
@@ -53,6 +53,14 @@ static noinline void dump_vnode(struct afs_vnode *vnode, struct afs_vnode *parendump_stack (); } +/* +* Set parameters for the netfs library +*/ +static void afs_set_netfs_context (struct afs_vnode *vnode) +{ +netfs_i_context_init (&vnode->vfs_inode, &afs_req_ops); +} +/* * Initialise an inode from the vnode status. */
@@ -128,6 +136,7 @@ static int afs_inode_init_from_status(struct afs_operation *op, }afs_set_i_size (vnode, status->size); +afs_set_netfs_context (vnode); vnode->invalid_before = status->data_version;inode_set_iversion_raw (&vnode->vfs_inode, status->data_version);
@@ -420,7 +429,7 @@ static void afs_get_inode_cache(struct afs_vnode *vnode)struct afs_vnode_cache_aux aux;if (vnode->status.type !=AFS_FTYPE_FILE ) { - vnode->cache =NULL ; + vnode->netfs_ctx.cache =NULL ;return ; }
@@ -430,12 +439,14 @@ static void afs_get_inode_cache(struct afs_vnode *vnode) key.vnode_id_ext[1 ] =htonl (vnode->fid.vnode_hi);afs_set_cache_aux (vnode, &aux); - vnode->cache =fscache_acquire_cookie ( - vnode->volume->cache, - vnode->status.type ==AFS_FTYPE_FILE ?0 :FSCACHE_ADV_SINGLE_CHUNK , - &key,sizeof (key), - &aux,sizeof (aux), - vnode->status.size); +afs_vnode_set_cache (vnode, +fscache_acquire_cookie ( + vnode->volume->cache, + vnode->status.type ==AFS_FTYPE_FILE ? +0 :FSCACHE_ADV_SINGLE_CHUNK , + &key,sizeof (key), + &aux,sizeof (aux), + vnode->status.size));#endif }
@@ -528,6 +539,7 @@ struct inode *afs_root_iget(struct super_block *sb, struct key *key) vnode =AFS_FS_I (inode); vnode->cb_v_break = as->volume->cb_v_break, +afs_set_netfs_context (vnode); op =afs_alloc_operation (key, as->volume);if (IS_ERR (op)) {
@@ -786,11 +798,8 @@ void afs_evict_inode(struct inode *inode)afs_put_wb_key (wbk); } -#ifdef CONFIG_AFS_FSCACHE -fscache_relinquish_cookie (vnode->cache, +fscache_relinquish_cookie (afs_vnode_cache (vnode),test_bit (AFS_VNODE_DELETED , &vnode->flags)); - vnode->cache =NULL ; -#endif afs_prune_wb_keys (vnode);afs_put_permits (rcu_access_pointer (vnode->permit_cache));
fs/afs/internal.h +14 -5
@@ -619,15 +619,16 @@ enum afs_lock_state {* leak from one inode to another. */ struct afs_vnode { -struct inode vfs_inode;/* the VFS's inode record */ +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct afs_volume *volume;/* volume on which vnode resides */ struct afs_fid fid;/* the file identifier for this inode */ struct afs_file_status status;/* AFS status info for this file */ afs_dataversion_t invalid_before;/* Child dentries are invalid before this */ -#ifdef CONFIG_AFS_FSCACHE -struct fscache_cookie *cache;/* caching cookie */ -#endif struct afs_permits __rcu *permit_cache;/* cache of permits so far obtained */ struct mutex io_lock;/* Lock for serialising I/O on this mutex */ struct rw_semaphore validate_lock;/* lock for validating this vnode */
@@ -674,12 +675,20 @@ struct afs_vnode {static inline struct fscache_cookie *afs_vnode_cache (struct afs_vnode *vnode) {#ifdef CONFIG_AFS_FSCACHE -return vnode->cache; +return netfs_i_cookie (&vnode->vfs_inode);#else return NULL ;#endif } +static inline void afs_vnode_set_cache (struct afs_vnode *vnode, +struct fscache_cookie *cookie) +{ +#ifdef CONFIG_AFS_FSCACHE + vnode->netfs_ctx.cache = cookie; +#endif +} +/* * cached security record for one user's attempt to access a vnode */
fs/afs/super.c +1 -3
@@ -688,13 +688,11 @@ static struct inode *afs_alloc_inode(struct super_block *sb)/* Reset anything that shouldn't leak from one inode to the next. */ memset (&vnode->fid,0 ,sizeof (vnode->fid));memset (&vnode->status,0 ,sizeof (vnode->status)); +afs_vnode_set_cache (vnode,NULL ); vnode->volume =NULL ; vnode->lock_key =NULL ; vnode->permit_cache =NULL ; -#ifdef CONFIG_AFS_FSCACHE - vnode->cache =NULL ; -#endif vnode->flags =1 <<AFS_VNODE_UNSET ; vnode->lock_state =AFS_VNODE_LOCK_NONE ;
fs/afs/write.c +1 -2
@@ -59,8 +59,7 @@ int afs_write_begin(struct file *file, struct address_space *mapping,* 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. */ - ret =netfs_write_begin (file, mapping, pos, len, flags, &folio, fsdata, - &afs_req_ops,NULL ); + ret =netfs_write_begin (file, mapping, pos, len, flags, &folio, fsdata);if (ret <0 )return ret;
fs/ceph/addr.c +4 -27
@@ -403,7 +403,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)ceph_put_cap_refs (ci, got); } -static const struct netfs_request_ops ceph_netfs_read_ops = { +const struct netfs_request_ops ceph_netfs_ops = { .init_request = ceph_init_request, .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read,
@@ -413,28 +413,6 @@ static const struct netfs_request_ops ceph_netfs_read_ops = { .cleanup = ceph_readahead_cleanup, }; -/* read a single page, without unlocking it. */ -static int ceph_readpage (struct file *file,struct page *subpage) -{ -struct folio *folio =page_folio (subpage); -struct inode *inode =file_inode (file); -struct ceph_inode_info *ci =ceph_inode (inode); -struct ceph_vino vino =ceph_vino (inode); -size_t len =folio_size (folio); -u64 off =folio_file_pos (folio); - -dout ("readpage ino %llx.%llx file %p off %llu len %zu folio %p index %lu\n inline %d" , - vino.ino, vino.snap, file, off, len, folio,folio_index (folio), - ci->i_inline_version !=CEPH_INLINE_NONE ); - -return netfs_readpage (file, folio, &ceph_netfs_read_ops,NULL ); -} - -static void ceph_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &ceph_netfs_read_ops,NULL ); -} -#ifdef CONFIG_CEPH_FSCACHE static void ceph_set_page_fscache (struct page *page) {
@@ -1333,8 +1311,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,struct folio *folio =NULL ;int r; - r =netfs_write_begin (file, inode->i_mapping, pos, len,0 , &folio,NULL , - &ceph_netfs_read_ops,NULL ); + r =netfs_write_begin (file, inode->i_mapping, pos, len,0 , &folio,NULL );if (r ==0 )folio_wait_fscache (folio);if (r <0 ) {
@@ -1388,8 +1365,8 @@ static int ceph_write_end(struct file *file, struct address_space *mapping, }const struct address_space_operations ceph_aops = { - .readpage = ceph_readpage, - .readahead = ceph_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .writepage = ceph_writepage, .writepages = ceph_writepages_start, .write_begin = ceph_write_begin,
fs/ceph/cache.c +14 -14
@@ -29,26 +29,25 @@ void ceph_fscache_register_inode_cookie(struct inode *inode)if (!(inode->i_state &I_NEW ))return ; -WARN_ON_ONCE (ci->fscache); +WARN_ON_ONCE (ci->netfs_ctx.cache); - ci->fscache =fscache_acquire_cookie (fsc->fscache,0 , - &ci->i_vino,sizeof (ci->i_vino), - &ci->i_version,sizeof (ci->i_version), -i_size_read (inode)); + ci->netfs_ctx.cache = +fscache_acquire_cookie (fsc->fscache,0 , + &ci->i_vino,sizeof (ci->i_vino), + &ci->i_version,sizeof (ci->i_version), +i_size_read (inode)); } -void ceph_fscache_unregister_inode_cookie (struct ceph_inode_info * ci) +void ceph_fscache_unregister_inode_cookie (struct ceph_inode_info *ci) { -struct fscache_cookie *cookie = ci->fscache; - -fscache_relinquish_cookie (cookie, false); +fscache_relinquish_cookie (ceph_fscache_cookie (ci), false); }void ceph_fscache_use_cookie (struct inode *inode,bool will_modify) {struct ceph_inode_info *ci =ceph_inode (inode); -fscache_use_cookie (ci->fscache, will_modify); +fscache_use_cookie (ceph_fscache_cookie (ci), will_modify); }void ceph_fscache_unuse_cookie (struct inode *inode,bool update)
@@ -58,9 +57,10 @@ void ceph_fscache_unuse_cookie(struct inode *inode, bool update)if (update) {loff_t i_size =i_size_read (inode); -fscache_unuse_cookie (ci->fscache, &ci->i_version, &i_size); +fscache_unuse_cookie (ceph_fscache_cookie (ci), + &ci->i_version, &i_size); }else { -fscache_unuse_cookie (ci->fscache,NULL ,NULL ); +fscache_unuse_cookie (ceph_fscache_cookie (ci),NULL ,NULL ); } }
@@ -69,14 +69,14 @@ void ceph_fscache_update(struct inode *inode)struct ceph_inode_info *ci =ceph_inode (inode);loff_t i_size =i_size_read (inode); -fscache_update_cookie (ci->fscache, &ci->i_version, &i_size); +fscache_update_cookie (ceph_fscache_cookie (ci), &ci->i_version, &i_size); }void ceph_fscache_invalidate (struct inode *inode,bool dio_write) {struct ceph_inode_info *ci =ceph_inode (inode); -fscache_invalidate (ceph_inode (inode)->fscache, +fscache_invalidate (ceph_fscache_cookie (ci), &ci->i_version,i_size_read (inode), dio_write ?FSCACHE_INVAL_DIO_WRITE :0 ); }
fs/ceph/cache.h +1 -10
@@ -26,14 +26,9 @@ void ceph_fscache_unuse_cookie(struct inode *inode, bool update);void ceph_fscache_update (struct inode *inode);void ceph_fscache_invalidate (struct inode *inode,bool dio_write); -static inline void ceph_fscache_inode_init (struct ceph_inode_info *ci) -{ - ci->fscache =NULL ; -} -static inline struct fscache_cookie *ceph_fscache_cookie (struct ceph_inode_info *ci) { -return ci->fscache; +return netfs_i_cookie (&ci->vfs_inode); }static inline void ceph_fscache_resize (struct inode *inode,loff_t to)
@@ -91,10 +86,6 @@ static inline void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc) { } -static inline void ceph_fscache_inode_init (struct ceph_inode_info *ci) -{ -} -static inline void ceph_fscache_register_inode_cookie (struct inode *inode) { }
fs/ceph/inode.c +3 -3
@@ -453,6 +453,9 @@ struct inode *ceph_alloc_inode(struct super_block *sb)dout ("alloc_inode %p\n" , &ci->vfs_inode); +/* Set parameters for the netfs library */ +netfs_i_context_init (&ci->vfs_inode, &ceph_netfs_ops); +spin_lock_init (&ci->i_ceph_lock); ci->i_version =0 ;
@@ -538,9 +541,6 @@ struct inode *ceph_alloc_inode(struct super_block *sb)INIT_WORK (&ci->i_work, ceph_inode_work); ci->i_work_mask =0 ;memset (&ci->i_btime,'\0' ,sizeof (ci->i_btime)); - -ceph_fscache_inode_init (ci); -return &ci->vfs_inode; }
fs/ceph/super.h +8 -9
@@ -17,13 +17,11 @@#include <linux/posix_acl.h> #include <linux/refcount.h> #include <linux/security.h> +#include <linux/netfs.h> +#include <linux/fscache.h> #include <linux/ceph/libceph.h> -#ifdef CONFIG_CEPH_FSCACHE -#include <linux/fscache.h> -#endif -/* large granularity for statfs utilization stats to facilitate * large volume sizes on 32-bit machines. */ #define CEPH_BLOCK_SHIFT 22/* 4 MB */
@@ -317,6 +315,11 @@ struct ceph_inode_xattrs_info {* Ceph inode. */ struct ceph_inode_info { +struct { +/* These must be contiguous */ +struct inode vfs_inode; +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct ceph_vino i_vino;/* ceph ino + snap */ spinlock_t i_ceph_lock;
@@ -427,11 +430,6 @@ struct ceph_inode_info {struct work_struct i_work;unsigned long i_work_mask; - -#ifdef CONFIG_CEPH_FSCACHE -struct fscache_cookie *fscache; -#endif -struct inode vfs_inode;/* at end */ }; static inline struct ceph_inode_info *
@@ -1215,6 +1213,7 @@ extern void __ceph_touch_fmode(struct ceph_inode_info *ci,/* addr.c */ extern const struct address_space_operations ceph_aops; +extern const struct netfs_request_ops ceph_netfs_ops;extern int ceph_mmap (struct file *file,struct vm_area_struct *vma);extern int ceph_uninline_data (struct file *file);extern int ceph_pool_perm_check (struct inode *inode,int need);
fs/cifs/cifsglob.h +6 -4
@@ -16,6 +16,7 @@#include <linux/mempool.h> #include <linux/workqueue.h> #include <linux/utsname.h> +#include <linux/netfs.h> #include "cifs_fs_sb.h" #include "cifsacl.h" #include <crypto/internal/hash.h>
@@ -1402,6 +1403,11 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file);*/ struct cifsInodeInfo { +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };bool can_cache_brlcks;struct list_head llist;/* locks helb by this inode */ /*
@@ -1432,10 +1438,6 @@ struct cifsInodeInfo {u64 uniqueid;/* server inode number */ u64 createtime;/* creation time on server */ __u8 lease_key[SMB2_LEASE_KEY_SIZE ];/* lease key for this inode */ -#ifdef CONFIG_CIFS_FSCACHE -struct fscache_cookie *fscache; -#endif -struct inode vfs_inode;struct list_head deferred_closes;/* list of deferred closes */ spinlock_t deferred_lock;/* protection on deferred list */ bool lease_granted;/* Flag to indicate whether lease or oplock is granted. */
fs/cifs/fscache.c +6 -5
@@ -103,7 +103,7 @@ void cifs_fscache_get_inode_cookie(struct inode *inode)cifs_fscache_fill_coherency (&cifsi->vfs_inode, &cd); - cifsi->fscache = + cifsi->netfs_ctx.cache = fscache_acquire_cookie(tcon->fscache, 0, &cifsi->uniqueid, sizeof(cifsi->uniqueid), &cd, sizeof(cd),
@@ -126,11 +126,12 @@ void cifs_fscache_unuse_inode_cookie(struct inode *inode, bool update)void cifs_fscache_release_inode_cookie (struct inode *inode) {struct cifsInodeInfo *cifsi =CIFS_I (inode); +struct fscache_cookie *cookie =cifs_inode_cookie (inode); -if (cifsi->fscache) { -cifs_dbg (FYI ,"%s: (0x%p)\n" , __func__, cifsi->fscache); -fscache_relinquish_cookie (cifsi->fscache, false); - cifsi->fscache =NULL ; +if (cookie) { +cifs_dbg (FYI ,"%s: (0x%p)\n" , __func__, cookie); +fscache_relinquish_cookie (cookie, false); + cifsi->netfs_ctx.cache =NULL ; } }
fs/cifs/fscache.h +1 -1
@@ -61,7 +61,7 @@ void cifs_fscache_fill_coherency(struct inode *inode,static inline struct fscache_cookie *cifs_inode_cookie (struct inode *inode) { -return CIFS_I (inode)->fscache; +return netfs_i_cookie (inode); }static inline void cifs_invalidate_cache (struct inode *inode,unsigned int flags)
fs/netfs/internal.h +15 -2
@@ -6,6 +6,7 @@*/ #include <linux/netfs.h> +#include <linux/fscache.h> #include <trace/events/netfs.h> #ifdef pr_fmt
@@ -19,8 +20,6 @@*/ struct netfs_io_request *netfs_alloc_request (struct address_space *mapping,struct file *file, -const struct netfs_request_ops *ops, -void *netfs_priv,loff_t start,size_t len,enum netfs_io_origin origin);void netfs_get_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what);
@@ -81,6 +80,20 @@ static inline void netfs_stat_d(atomic_t *stat)#define netfs_stat_d (x) do {} while(0)#endif +/* +* Miscellaneous functions. +*/ +static inline bool netfs_is_cache_enabled (struct netfs_i_context *ctx) +{ +#if IS_ENABLED (CONFIG_FSCACHE ) +struct fscache_cookie *cookie = ctx->cache; + +return fscache_cookie_valid (cookie) &&fscache_cookie_enabled (cookie); +#else +return false; +#endif +} +/*****************************************************************************/ /* * debug tracing
fs/netfs/objects.c +6 -6
@@ -13,12 +13,12 @@*/ struct netfs_io_request *netfs_alloc_request (struct address_space *mapping,struct file *file, -const struct netfs_request_ops *ops, -void *netfs_priv,loff_t start,size_t len,enum netfs_io_origin origin) {static atomic_t debug_ids; +struct inode *inode = file ?file_inode (file) : mapping->host; +struct netfs_i_context *ctx =netfs_i_context (inode);struct netfs_io_request *rreq;int ret;
@@ -29,11 +29,10 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, rreq->start = start; rreq->len = len; rreq->origin = origin; - rreq->netfs_ops = ops; - rreq->netfs_priv = netfs_priv; + rreq->netfs_ops = ctx->ops; rreq->mapping = mapping; - rreq->inode =file_inode (file); - rreq->i_size =i_size_read (rreq->inode); + rreq->inode = inode; + rreq->i_size =i_size_read (inode); rreq->debug_id =atomic_inc_return (&debug_ids);INIT_LIST_HEAD (&rreq->subrequests);INIT_WORK (&rreq->work, netfs_rreq_work);
@@ -76,6 +75,7 @@ static void netfs_free_request(struct work_struct *work) {struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work); +netfs_clear_subrequests (rreq, false);if (rreq->netfs_priv) rreq->netfs_ops->cleanup (rreq->mapping, rreq->netfs_priv);
fs/netfs/read_helper.c +45 -55
256 lines not on this page · raw message
fs/netfs/stats.c +0 -1
@@ -7,7 +7,6 @@#include <linux/export.h> #include <linux/seq_file.h> -#include <linux/netfs.h> #include "internal.h" atomic_t netfs_n_rh_readahead;
include/linux/netfs.h +70 -11
105 lines not on this page · raw message
Re: [PATCH v3 13/20] netfs: Add a netfs inode context
Quoted 1,488 lines · David Howells
Add a
netfs_i_contextstruct that should be included in the network filesystem's own inode struct wrapper, directly after the VFS's inode struct, e.g.:struct my_inode { struct { /* These must be contiguous */ struct inode vfs_inode; struct netfs_i_context netfs_ctx; }; };The
netfs_i_contextstruct so far contains a single field for the network filesystem to use - the cache cookie:struct netfs_i_context { ... struct fscache_cookie *cache; };Three functions are provided to help with this:
(1) void netfs_i_context_init(struct inode *inode,
const struct netfs_request_ops *ops); Initialise the netfs context and set the operations.(2) struct
netfs_i_context*netfs_i_context(struct inode *inode);Find the netfs context from the VFS inode.
(3) struct inode *netfs_inode(struct
netfs_i_context*ctx);Find the VFS inode from the netfs context.
Changes
=======
ver #3)
- Split out the bit to move ceph cap-getting on readahead into ceph_init_request()[1].
- Stick in a comment to the netfs inode structs indicating the contiguity requirements[2].ver #2)
- Adjust documentation to match.
- Use "#ifIS_ENABLED()" innetfs_i_cookie(), not "#ifdef".
- Move the cap check fromceph_readahead()toceph_init_request()to be called from netfslib.
- Removeceph_readahead()and usenetfs_readahead()directly instead.Signed-off-by David Howells <[email protected]>---
Documentation/filesystems/netfs_library.rst | 101 +++++++++++++++++++-------- fs/9p/cache.c | 10 +-- fs/9p/v9fs.c | 4 - fs/9p/v9fs.h | 13 ++- fs/9p/vfs_addr.c | 43 +---------- fs/9p/vfs_inode.c | 13 +++ fs/afs/dynroot.c | 1 fs/afs/file.c | 26 +------ fs/afs/inode.c | 31 +++++--- fs/afs/internal.h | 19 ++++- fs/afs/super.c | 4 - fs/afs/write.c | 3 - fs/ceph/addr.c | 31 +------- fs/ceph/cache.c | 28 ++++--- fs/ceph/cache.h | 11 --- fs/ceph/inode.c | 6 +- fs/ceph/super.h | 17 ++--- fs/cifs/cifsglob.h | 10 ++- fs/cifs/fscache.c | 11 ++- fs/cifs/fscache.h | 2 - fs/netfs/internal.h | 17 ++++- fs/netfs/objects.c | 12 ++- fs/netfs/read_helper.c | 100 ++++++++++++--------------- fs/netfs/stats.c | 1 include/linux/netfs.h | 81 +++++++++++++++++++--- 25 files changed, 317 insertions(+), 278 deletions(-)Documentation/filesystems/netfs_library.rst +72
-29@@ -7,6 +7,8 @@ Network Filesystem Helper Library .. Contents: - Overview. + - Per-inode context. + - Inode context helper functions. - Buffered read helpers. - Read helper functions. - Read helper structures.@@ -28,6 +30,69 @@ Note that the library module doesn't link against local caching directly, so access must be provided by the netfs. +Per-Inode Context +================= + +The network filesystem helper library needs a place to store a bit of state for +its use on each netfs inode it is helping to manage. To this end, a context +structure is defined:: + + struct netfs_i_context { + const struct netfs_request_ops *ops; + struct fscache_cookie *cache; + }; + +A network filesystem that wants to use netfs lib must place one of these +directly after the VFS ``struct inode`` it allocates, usually as part of its +own struct. This can be done in a way similar to the following:: + + struct my_inode { + struct { + /* These must be contiguous */ + struct inode vfs_inode; + struct netfs_i_context netfs_ctx; + }; + ... + }; + +This allows netfslib to find its state by simple offset from the inode pointer, +thereby allowing the netfslib helper functions to be pointed to directly by the +VFS/VM operation tables. + +The structure contains the following fields: + + * ``ops`` + + The set of operations provided by the network filesystem to netfslib. + + * ``cache`` + + Local caching cookie, or NULL if no caching is enabled. This field does not + exist if fscache is disabled. + + +Inode Context Helper Functions +------------------------------ + +To help deal with the per-inode context, a number helper functions are +provided. Firstly, a function to perform basic initialisation on a context and +set the operations table pointer:: + + void netfs_i_context_init(struct inode *inode, + const struct netfs_request_ops *ops); + +then two functions to cast between the VFS inode structure and the netfs +context:: + + struct netfs_i_context *netfs_i_context(struct inode *inode); + struct inode *netfs_inode(struct netfs_i_context *ctx); + +and finally, a function to get the cache cookie pointer from the context +attached to an inode (or NULL if fscache is disabled):: + + struct fscache_cookie *netfs_i_cookie(struct inode *inode); + + Buffered Read Helpers =====================@@ -70,38 +135,22 @@ Read Helper Functions Three read helpers are provided:: - void netfs_readahead(struct readahead_control *ractl, - const struct netfs_request_ops *ops, - void *netfs_priv); + void netfs_readahead(struct readahead_control *ractl); int netfs_readpage(struct file *file, - struct folio *folio, - const struct netfs_request_ops *ops, - void *netfs_priv); + struct page *page); int netfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int flags, struct folio **_folio, - void **_fsdata, - const struct netfs_request_ops *ops, - void *netfs_priv); - -Each corresponds to a VM operation, with the addition of a couple of parameters -for the use of the read helpers: + void **_fsdata); - * ``ops`` - - A table of operations through which the helpers can talk to the filesystem. - - * ``netfs_priv`` +Each corresponds to a VM address space operation. These operations use the +state in the per-inode context. - Filesystem private data (can be NULL). - -Both of these values will be stored into the read request structure. - -For ->readahead() and ->readpage(), the network filesystem should just jump -into the corresponding read helper; whereas for ->write_begin(), it may be a +For ->readahead() and ->readpage(), the network filesystem just point directly +at the corresponding read helper; whereas for ->write_begin(), it may be a little more complicated as the network filesystem might want to flush conflicting writes or track dirty data and needs to put the acquired folio if an error occurs after calling the helper.@@ -246,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); - bool (*is_cache_enabled)(struct inode *inode); 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);@@ -265,11 +313,6 @@ The operations are as follows: [Optional] This is called to initialise the request structure. It is given the file for reference and can modify the ->netfs_priv value. - * ``is_cache_enabled()`` - - [Required] This is called by netfs_write_begin() to ask if the file is being - cached. It should return true if it is being cached and false otherwise. - * ``begin_cache_operation()`` [Optional] This is called to ask the network filesystem to call into thefs/9p/cache.c +4
-6@@ -49,22 +49,20 @@ int v9fs_cache_session_get_cookie(struct v9fs_session_info *v9ses,void v9fs_cache_inode_get_cookie (struct inode *inode) { -struct v9fs_inode *v9inode; +struct v9fs_inode *v9inode =V9FS_I (inode);struct v9fs_session_info *v9ses;__le32 version;__le64 path;if (!S_ISREG (inode->i_mode))return ; - - v9inode =V9FS_I (inode); -if (WARN_ON (v9inode->fscache)) +if (WARN_ON (v9fs_inode_cookie (v9inode)))return ; version =cpu_to_le32 (v9inode->qid.version); path =cpu_to_le64 (v9inode->qid.path); v9ses =v9fs_inode2v9ses (inode); - v9inode->fscache = + v9inode->netfs_ctx.cache = fscache_acquire_cookie(v9fs_session_cache(v9ses), 0, &path, sizeof(path),@@ -72,5 +70,5 @@ void v9fs_cache_inode_get_cookie(struct inode *inode) i_size_read(&v9inode->vfs_inode));p9_debug (P9_DEBUG_FSC ,"inode %p get cookie %p\n" , - inode, v9inode->fscache); + inode,v9fs_inode_cookie (v9inode)); }fs/9p/v9fs.c +1
-3@@ -623,9 +623,7 @@ static void v9fs_sysfs_cleanup(void)static void v9fs_inode_init_once (void *foo) {struct v9fs_inode *v9inode = (struct v9fs_inode *)foo; -#ifdef CONFIG_9P_FSCACHE - v9inode->fscache =NULL ; -#endif +memset (&v9inode->qid,0 ,sizeof (v9inode->qid));inode_init_once (&v9inode->vfs_inode); }fs/9p/v9fs.h +8
-5@@ -9,6 +9,7 @@#define FS_9P_V9FS_H #include <linux/backing-dev.h> +#include <linux/netfs.h> /** * enum p9_session_flags - option flags for each 9P session @@ -108,14 +109,15 @@ struct v9fs_session_info {#define V9FS_INO_INVALID_ATTR 0x01struct v9fs_inode { -#ifdef CONFIG_9P_FSCACHE -struct fscache_cookie *fscache; -#endif +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct p9_qid qid;unsigned int cache_validity;struct p9_fid *writeback_fid;struct mutex v_mutex; -struct inode vfs_inode; };static inline struct v9fs_inode *V9FS_I (const struct inode *inode)@@ -126,7 +128,7 @@ static inline struct v9fs_inode *V9FS_I(const struct inode *inode)static inline struct fscache_cookie *v9fs_inode_cookie (struct v9fs_inode *v9inode) {#ifdef CONFIG_9P_FSCACHE -return v9inode->fscache; +return netfs_i_cookie (&v9inode->vfs_inode);#else return NULL ;#endif @@ -163,6 +165,7 @@ extern struct inode *v9fs_inode_from_fid(struct v9fs_session_info *v9ses,extern const struct inode_operations v9fs_dir_inode_operations_dotl;extern const struct inode_operations v9fs_file_inode_operations_dotl;extern const struct inode_operations v9fs_symlink_inode_operations_dotl; +extern const struct netfs_request_ops v9fs_req_ops;extern struct inode *v9fs_inode_from_fid_dotl (struct v9fs_session_info *v9ses,struct p9_fid *fid,struct super_block *sb,int new);fs/9p/vfs_addr.c +4
-39@@ -77,17 +77,6 @@ static void v9fs_req_cleanup(struct address_space *mapping, void *priv)p9_client_clunk (fid); } -/** -* v9fs_is_cache_enabled - Determine if caching is enabled for an inode -* @inode: The inode to check -*/ -static bool v9fs_is_cache_enabled (struct inode *inode) -{ -struct fscache_cookie *cookie =v9fs_inode_cookie (V9FS_I (inode)); - -return fscache_cookie_enabled (cookie) && cookie->cache_priv; -} -/** * v9fs_begin_cache_operation - Begin a cache operation for a read * @rreq: The read request @@ -103,36 +92,13 @@ static int v9fs_begin_cache_operation(struct netfs_io_request *rreq)#endif } -static const struct netfs_request_ops v9fs_req_ops = { +const struct netfs_request_ops v9fs_req_ops = { .init_request = v9fs_init_request, - .is_cache_enabled = v9fs_is_cache_enabled, .begin_cache_operation = v9fs_begin_cache_operation, .issue_read = v9fs_issue_read, .cleanup = v9fs_req_cleanup, }; -/** -* v9fs_vfs_readpage - read an entire page in from 9P -* @file: file being read -* @page: structure to page -* -*/ -static int v9fs_vfs_readpage (struct file *file,struct page *page) -{ -struct folio *folio =page_folio (page); - -return netfs_readpage (file, folio, &v9fs_req_ops,NULL ); -} - -/** -* v9fs_vfs_readahead - read a set of pages from 9P -* @ractl: The readahead parameters -*/ -static void v9fs_vfs_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &v9fs_req_ops,NULL ); -} -/** * v9fs_release_page - release the private state associated with a page * @page: The page to be released @@ -326,8 +292,7 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping,* 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 (filp, mapping, pos, len, flags, &folio, fsdata, - &v9fs_req_ops,NULL ); + retval =netfs_write_begin (filp, mapping, pos, len, flags, &folio, fsdata);if (retval <0 )return retval;@@ -388,8 +353,8 @@ static int v9fs_set_page_dirty(struct page *page)#endif const struct address_space_operations v9fs_addr_operations = { - .readpage = v9fs_vfs_readpage, - .readahead = v9fs_vfs_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .set_page_dirty = v9fs_set_page_dirty, .writepage = v9fs_vfs_writepage, .write_begin = v9fs_write_begin,fs/9p/vfs_inode.c +10
-3@@ -231,9 +231,6 @@ struct inode *v9fs_alloc_inode(struct super_block *sb) v9inode =kmem_cache_alloc (v9fs_inode_cache,GFP_KERNEL );if (!v9inode)return NULL ; -#ifdef CONFIG_9P_FSCACHE - v9inode->fscache =NULL ; -#endif v9inode->writeback_fid =NULL ; v9inode->cache_validity =0 ;mutex_init (&v9inode->v_mutex);@@ -250,6 +247,14 @@ void v9fs_free_inode(struct inode *inode)kmem_cache_free (v9fs_inode_cache,V9FS_I (inode)); } +/* +* Set parameters for the netfs library +*/ +static void v9fs_set_netfs_context (struct inode *inode) +{ +netfs_i_context_init (inode, &v9fs_req_ops); +} +int v9fs_init_inode (struct v9fs_session_info *v9ses,struct inode *inode,umode_t mode,dev_t rdev) {@@ -338,6 +343,8 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses, err = -EINVAL ; goto error; } + +v9fs_set_netfs_context (inode); error:return err;fs/afs/dynroot.c +1
-0@@ -76,6 +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_i_context_init (inode,NULL ); inode->i_size =0 ; inode->i_mode =S_IFDIR |S_IRUGO |S_IXUGO ;if (root) {fs/afs/file.c +2
-24@@ -19,13 +19,11 @@#include "internal.h" static int afs_file_mmap (struct file *file,struct vm_area_struct *vma); -static int afs_readpage (struct file *file,struct page *page);static int afs_symlink_readpage (struct file *file,struct page *page);static void afs_invalidatepage (struct page *page,unsigned int offset,unsigned int length);static int afs_releasepage (struct page *page,gfp_t gfp_flags); -static void afs_readahead (struct readahead_control *ractl);static ssize_t afs_file_read_iter (struct kiocb *iocb,struct iov_iter *iter);static void afs_vm_open (struct vm_area_struct *area);static void afs_vm_close (struct vm_area_struct *area);@@ -52,8 +50,8 @@ const struct inode_operations afs_file_inode_operations = { };const struct address_space_operations afs_file_aops = { - .readpage = afs_readpage, - .readahead = afs_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .set_page_dirty = afs_set_page_dirty, .launder_page = afs_launder_page, .releasepage = afs_releasepage,@@ -365,13 +363,6 @@ static int afs_init_request(struct netfs_io_request *rreq, struct file *file)return 0 ; } -static bool afs_is_cache_enabled (struct inode *inode) -{ -struct fscache_cookie *cookie =afs_vnode_cache (AFS_FS_I (inode)); - -return fscache_cookie_enabled (cookie) && cookie->cache_priv; -} -static int afs_begin_cache_operation (struct netfs_io_request *rreq) {#ifdef CONFIG_AFS_FSCACHE @@ -399,25 +390,12 @@ static void afs_priv_cleanup(struct address_space *mapping, void *netfs_priv)const struct netfs_request_ops afs_req_ops = { .init_request = afs_init_request, - .is_cache_enabled = afs_is_cache_enabled, .begin_cache_operation = afs_begin_cache_operation, .check_write_begin = afs_check_write_begin, .issue_read = afs_issue_read, .cleanup = afs_priv_cleanup, }; -static int afs_readpage (struct file *file,struct page *page) -{ -struct folio *folio =page_folio (page); - -return netfs_readpage (file, folio, &afs_req_ops,NULL ); -} - -static void afs_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &afs_req_ops,NULL ); -} -int afs_write_inode (struct inode *inode,struct writeback_control *wbc) {fscache_unpin_writeback (wbc,afs_vnode_cache (AFS_FS_I (inode)));fs/afs/inode.c +20
-11@@ -53,6 +53,14 @@ static noinline void dump_vnode(struct afs_vnode *vnode, struct afs_vnode *parendump_stack (); } +/* +* Set parameters for the netfs library +*/ +static void afs_set_netfs_context (struct afs_vnode *vnode) +{ +netfs_i_context_init (&vnode->vfs_inode, &afs_req_ops); +} +/* * Initialise an inode from the vnode status. */ @@ -128,6 +136,7 @@ static int afs_inode_init_from_status(struct afs_operation *op, }afs_set_i_size (vnode, status->size); +afs_set_netfs_context (vnode); vnode->invalid_before = status->data_version;inode_set_iversion_raw (&vnode->vfs_inode, status->data_version);@@ -420,7 +429,7 @@ static void afs_get_inode_cache(struct afs_vnode *vnode)struct afs_vnode_cache_aux aux;if (vnode->status.type !=AFS_FTYPE_FILE ) { - vnode->cache =NULL ; + vnode->netfs_ctx.cache =NULL ;return ; }@@ -430,12 +439,14 @@ static void afs_get_inode_cache(struct afs_vnode *vnode) key.vnode_id_ext[1 ] =htonl (vnode->fid.vnode_hi);afs_set_cache_aux (vnode, &aux); - vnode->cache =fscache_acquire_cookie ( - vnode->volume->cache, - vnode->status.type ==AFS_FTYPE_FILE ?0 :FSCACHE_ADV_SINGLE_CHUNK , - &key,sizeof (key), - &aux,sizeof (aux), - vnode->status.size); +afs_vnode_set_cache (vnode, +fscache_acquire_cookie ( + vnode->volume->cache, + vnode->status.type ==AFS_FTYPE_FILE ? +0 :FSCACHE_ADV_SINGLE_CHUNK , + &key,sizeof (key), + &aux,sizeof (aux), + vnode->status.size));#endif }@@ -528,6 +539,7 @@ struct inode *afs_root_iget(struct super_block *sb, struct key *key) vnode =AFS_FS_I (inode); vnode->cb_v_break = as->volume->cb_v_break, +afs_set_netfs_context (vnode); op =afs_alloc_operation (key, as->volume);if (IS_ERR (op)) {@@ -786,11 +798,8 @@ void afs_evict_inode(struct inode *inode)afs_put_wb_key (wbk); } -#ifdef CONFIG_AFS_FSCACHE -fscache_relinquish_cookie (vnode->cache, +fscache_relinquish_cookie (afs_vnode_cache (vnode),test_bit (AFS_VNODE_DELETED , &vnode->flags)); - vnode->cache =NULL ; -#endif afs_prune_wb_keys (vnode);afs_put_permits (rcu_access_pointer (vnode->permit_cache));fs/afs/internal.h +14
-5@@ -619,15 +619,16 @@ enum afs_lock_state {* leak from one inode to another. */ struct afs_vnode { -struct inode vfs_inode;/* the VFS's inode record */ +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct afs_volume *volume;/* volume on which vnode resides */ struct afs_fid fid;/* the file identifier for this inode */ struct afs_file_status status;/* AFS status info for this file */ afs_dataversion_t invalid_before;/* Child dentries are invalid before this */ -#ifdef CONFIG_AFS_FSCACHE -struct fscache_cookie *cache;/* caching cookie */ -#endif struct afs_permits __rcu *permit_cache;/* cache of permits so far obtained */ struct mutex io_lock;/* Lock for serialising I/O on this mutex */ struct rw_semaphore validate_lock;/* lock for validating this vnode */ @@ -674,12 +675,20 @@ struct afs_vnode {static inline struct fscache_cookie *afs_vnode_cache (struct afs_vnode *vnode) {#ifdef CONFIG_AFS_FSCACHE -return vnode->cache; +return netfs_i_cookie (&vnode->vfs_inode);#else return NULL ;#endif } +static inline void afs_vnode_set_cache (struct afs_vnode *vnode, +struct fscache_cookie *cookie) +{ +#ifdef CONFIG_AFS_FSCACHE + vnode->netfs_ctx.cache = cookie; +#endif +} +/* * cached security record for one user's attempt to access a vnode */ fs/afs/super.c +1
-3@@ -688,13 +688,11 @@ static struct inode *afs_alloc_inode(struct super_block *sb)/* Reset anything that shouldn't leak from one inode to the next. */ memset (&vnode->fid,0 ,sizeof (vnode->fid));memset (&vnode->status,0 ,sizeof (vnode->status)); +afs_vnode_set_cache (vnode,NULL ); vnode->volume =NULL ; vnode->lock_key =NULL ; vnode->permit_cache =NULL ; -#ifdef CONFIG_AFS_FSCACHE - vnode->cache =NULL ; -#endif vnode->flags =1 <<AFS_VNODE_UNSET ; vnode->lock_state =AFS_VNODE_LOCK_NONE ;fs/afs/write.c +1
-2@@ -59,8 +59,7 @@ int afs_write_begin(struct file *file, struct address_space *mapping,* 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. */ - ret =netfs_write_begin (file, mapping, pos, len, flags, &folio, fsdata, - &afs_req_ops,NULL ); + ret =netfs_write_begin (file, mapping, pos, len, flags, &folio, fsdata);if (ret <0 )return ret;fs/ceph/addr.c +4
-27@@ -403,7 +403,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)ceph_put_cap_refs (ci, got); } -static const struct netfs_request_ops ceph_netfs_read_ops = { +const struct netfs_request_ops ceph_netfs_ops = { .init_request = ceph_init_request, .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read,@@ -413,28 +413,6 @@ static const struct netfs_request_ops ceph_netfs_read_ops = { .cleanup = ceph_readahead_cleanup, }; -/* read a single page, without unlocking it. */ -static int ceph_readpage (struct file *file,struct page *subpage) -{ -struct folio *folio =page_folio (subpage); -struct inode *inode =file_inode (file); -struct ceph_inode_info *ci =ceph_inode (inode); -struct ceph_vino vino =ceph_vino (inode); -size_t len =folio_size (folio); -u64 off =folio_file_pos (folio); - -dout ("readpage ino %llx.%llx file %p off %llu len %zu folio %p index %lu\n inline %d" , - vino.ino, vino.snap, file, off, len, folio,folio_index (folio), - ci->i_inline_version !=CEPH_INLINE_NONE ); - -return netfs_readpage (file, folio, &ceph_netfs_read_ops,NULL ); -} - -static void ceph_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &ceph_netfs_read_ops,NULL ); -} -#ifdef CONFIG_CEPH_FSCACHE static void ceph_set_page_fscache (struct page *page) {@@ -1333,8 +1311,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,struct folio *folio =NULL ;int r; - r =netfs_write_begin (file, inode->i_mapping, pos, len,0 , &folio,NULL , - &ceph_netfs_read_ops,NULL ); + r =netfs_write_begin (file, inode->i_mapping, pos, len,0 , &folio,NULL );if (r ==0 )folio_wait_fscache (folio);if (r <0 ) {@@ -1388,8 +1365,8 @@ static int ceph_write_end(struct file *file, struct address_space *mapping, }const struct address_space_operations ceph_aops = { - .readpage = ceph_readpage, - .readahead = ceph_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .writepage = ceph_writepage, .writepages = ceph_writepages_start, .write_begin = ceph_write_begin,fs/ceph/cache.c +14
-14@@ -29,26 +29,25 @@ void ceph_fscache_register_inode_cookie(struct inode *inode)if (!(inode->i_state &I_NEW ))return ; -WARN_ON_ONCE (ci->fscache); +WARN_ON_ONCE (ci->netfs_ctx.cache); - ci->fscache =fscache_acquire_cookie (fsc->fscache,0 , - &ci->i_vino,sizeof (ci->i_vino), - &ci->i_version,sizeof (ci->i_version), -i_size_read (inode)); + ci->netfs_ctx.cache = +fscache_acquire_cookie (fsc->fscache,0 , + &ci->i_vino,sizeof (ci->i_vino), + &ci->i_version,sizeof (ci->i_version), +i_size_read (inode)); } -void ceph_fscache_unregister_inode_cookie (struct ceph_inode_info * ci) +void ceph_fscache_unregister_inode_cookie (struct ceph_inode_info *ci) { -struct fscache_cookie *cookie = ci->fscache; - -fscache_relinquish_cookie (cookie, false); +fscache_relinquish_cookie (ceph_fscache_cookie (ci), false); }void ceph_fscache_use_cookie (struct inode *inode,bool will_modify) {struct ceph_inode_info *ci =ceph_inode (inode); -fscache_use_cookie (ci->fscache, will_modify); +fscache_use_cookie (ceph_fscache_cookie (ci), will_modify); }void ceph_fscache_unuse_cookie (struct inode *inode,bool update)@@ -58,9 +57,10 @@ void ceph_fscache_unuse_cookie(struct inode *inode, bool update)if (update) {loff_t i_size =i_size_read (inode); -fscache_unuse_cookie (ci->fscache, &ci->i_version, &i_size); +fscache_unuse_cookie (ceph_fscache_cookie (ci), + &ci->i_version, &i_size); }else { -fscache_unuse_cookie (ci->fscache,NULL ,NULL ); +fscache_unuse_cookie (ceph_fscache_cookie (ci),NULL ,NULL ); } }@@ -69,14 +69,14 @@ void ceph_fscache_update(struct inode *inode)struct ceph_inode_info *ci =ceph_inode (inode);loff_t i_size =i_size_read (inode); -fscache_update_cookie (ci->fscache, &ci->i_version, &i_size); +fscache_update_cookie (ceph_fscache_cookie (ci), &ci->i_version, &i_size); }void ceph_fscache_invalidate (struct inode *inode,bool dio_write) {struct ceph_inode_info *ci =ceph_inode (inode); -fscache_invalidate (ceph_inode (inode)->fscache, +fscache_invalidate (ceph_fscache_cookie (ci), &ci->i_version,i_size_read (inode), dio_write ?FSCACHE_INVAL_DIO_WRITE :0 ); }fs/ceph/cache.h +1
-10@@ -26,14 +26,9 @@ void ceph_fscache_unuse_cookie(struct inode *inode, bool update);void ceph_fscache_update (struct inode *inode);void ceph_fscache_invalidate (struct inode *inode,bool dio_write); -static inline void ceph_fscache_inode_init (struct ceph_inode_info *ci) -{ - ci->fscache =NULL ; -} -static inline struct fscache_cookie *ceph_fscache_cookie (struct ceph_inode_info *ci) { -return ci->fscache; +return netfs_i_cookie (&ci->vfs_inode); }static inline void ceph_fscache_resize (struct inode *inode,loff_t to)@@ -91,10 +86,6 @@ static inline void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc) { } -static inline void ceph_fscache_inode_init (struct ceph_inode_info *ci) -{ -} -static inline void ceph_fscache_register_inode_cookie (struct inode *inode) { }fs/ceph/inode.c +3
-3@@ -453,6 +453,9 @@ struct inode *ceph_alloc_inode(struct super_block *sb)dout ("alloc_inode %p\n" , &ci->vfs_inode); +/* Set parameters for the netfs library */ +netfs_i_context_init (&ci->vfs_inode, &ceph_netfs_ops); +spin_lock_init (&ci->i_ceph_lock); ci->i_version =0 ;@@ -538,9 +541,6 @@ struct inode *ceph_alloc_inode(struct super_block *sb)INIT_WORK (&ci->i_work, ceph_inode_work); ci->i_work_mask =0 ;memset (&ci->i_btime,'\0' ,sizeof (ci->i_btime)); - -ceph_fscache_inode_init (ci); -return &ci->vfs_inode; }fs/ceph/super.h +8
-9@@ -17,13 +17,11 @@#include <linux/posix_acl.h> #include <linux/refcount.h> #include <linux/security.h> +#include <linux/netfs.h> +#include <linux/fscache.h> #include <linux/ceph/libceph.h> -#ifdef CONFIG_CEPH_FSCACHE -#include <linux/fscache.h> -#endif -/* large granularity for statfs utilization stats to facilitate * large volume sizes on 32-bit machines. */ #define CEPH_BLOCK_SHIFT 22/* 4 MB */ @@ -317,6 +315,11 @@ struct ceph_inode_xattrs_info {* Ceph inode. */ struct ceph_inode_info { +struct { +/* These must be contiguous */ +struct inode vfs_inode; +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct ceph_vino i_vino;/* ceph ino + snap */ spinlock_t i_ceph_lock;@@ -427,11 +430,6 @@ struct ceph_inode_info {struct work_struct i_work;unsigned long i_work_mask; - -#ifdef CONFIG_CEPH_FSCACHE -struct fscache_cookie *fscache; -#endif -struct inode vfs_inode;/* at end */ }; static inline struct ceph_inode_info *@@ -1215,6 +1213,7 @@ extern void __ceph_touch_fmode(struct ceph_inode_info *ci,/* addr.c */ extern const struct address_space_operations ceph_aops; +extern const struct netfs_request_ops ceph_netfs_ops;extern int ceph_mmap (struct file *file,struct vm_area_struct *vma);extern int ceph_uninline_data (struct file *file);extern int ceph_pool_perm_check (struct inode *inode,int need);fs/cifs/cifsglob.h +6
-4@@ -16,6 +16,7 @@#include <linux/mempool.h> #include <linux/workqueue.h> #include <linux/utsname.h> +#include <linux/netfs.h> #include "cifs_fs_sb.h" #include "cifsacl.h" #include <crypto/internal/hash.h> @@ -1402,6 +1403,11 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file);*/ struct cifsInodeInfo { +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };bool can_cache_brlcks;struct list_head llist;/* locks helb by this inode */ /* @@ -1432,10 +1438,6 @@ struct cifsInodeInfo {u64 uniqueid;/* server inode number */ u64 createtime;/* creation time on server */ __u8 lease_key[SMB2_LEASE_KEY_SIZE ];/* lease key for this inode */ -#ifdef CONFIG_CIFS_FSCACHE -struct fscache_cookie *fscache; -#endif -struct inode vfs_inode;struct list_head deferred_closes;/* list of deferred closes */ spinlock_t deferred_lock;/* protection on deferred list */ bool lease_granted;/* Flag to indicate whether lease or oplock is granted. */ fs/cifs/fscache.c +6
-5@@ -103,7 +103,7 @@ void cifs_fscache_get_inode_cookie(struct inode *inode)cifs_fscache_fill_coherency (&cifsi->vfs_inode, &cd); - cifsi->fscache = + cifsi->netfs_ctx.cache = fscache_acquire_cookie(tcon->fscache, 0, &cifsi->uniqueid, sizeof(cifsi->uniqueid), &cd, sizeof(cd),@@ -126,11 +126,12 @@ void cifs_fscache_unuse_inode_cookie(struct inode *inode, bool update)void cifs_fscache_release_inode_cookie (struct inode *inode) {struct cifsInodeInfo *cifsi =CIFS_I (inode); +struct fscache_cookie *cookie =cifs_inode_cookie (inode); -if (cifsi->fscache) { -cifs_dbg (FYI ,"%s: (0x%p)\n" , __func__, cifsi->fscache); -fscache_relinquish_cookie (cifsi->fscache, false); - cifsi->fscache =NULL ; +if (cookie) { +cifs_dbg (FYI ,"%s: (0x%p)\n" , __func__, cookie); +fscache_relinquish_cookie (cookie, false); + cifsi->netfs_ctx.cache =NULL ; } }fs/cifs/fscache.h +1
-1@@ -61,7 +61,7 @@ void cifs_fscache_fill_coherency(struct inode *inode,static inline struct fscache_cookie *cifs_inode_cookie (struct inode *inode) { -return CIFS_I (inode)->fscache; +return netfs_i_cookie (inode); }static inline void cifs_invalidate_cache (struct inode *inode,unsigned int flags)fs/netfs/internal.h +15
-2@@ -6,6 +6,7 @@*/ #include <linux/netfs.h> +#include <linux/fscache.h> #include <trace/events/netfs.h> #ifdef pr_fmt@@ -19,8 +20,6 @@*/ struct netfs_io_request *netfs_alloc_request (struct address_space *mapping,struct file *file, -const struct netfs_request_ops *ops, -void *netfs_priv,loff_t start,size_t len,enum netfs_io_origin origin);void netfs_get_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what);@@ -81,6 +80,20 @@ static inline void netfs_stat_d(atomic_t *stat)#define netfs_stat_d (x) do {} while(0)#endif +/* +* Miscellaneous functions. +*/ +static inline bool netfs_is_cache_enabled (struct netfs_i_context *ctx) +{ +#if IS_ENABLED (CONFIG_FSCACHE ) +struct fscache_cookie *cookie = ctx->cache; + +return fscache_cookie_valid (cookie) &&fscache_cookie_enabled (cookie); +#else +return false; +#endif +} +/*****************************************************************************/ /* * debug tracing fs/netfs/objects.c +6
-6@@ -13,12 +13,12 @@*/ struct netfs_io_request *netfs_alloc_request (struct address_space *mapping,struct file *file, -const struct netfs_request_ops *ops, -void *netfs_priv,loff_t start,size_t len,enum netfs_io_origin origin) {static atomic_t debug_ids; +struct inode *inode = file ?file_inode (file) : mapping->host; +struct netfs_i_context *ctx =netfs_i_context (inode);struct netfs_io_request *rreq;int ret;@@ -29,11 +29,10 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, rreq->start = start; rreq->len = len; rreq->origin = origin; - rreq->netfs_ops = ops; - rreq->netfs_priv = netfs_priv; + rreq->netfs_ops = ctx->ops; rreq->mapping = mapping; - rreq->inode =file_inode (file); - rreq->i_size =i_size_read (rreq->inode); + rreq->inode = inode; + rreq->i_size =i_size_read (inode); rreq->debug_id =atomic_inc_return (&debug_ids);INIT_LIST_HEAD (&rreq->subrequests);INIT_WORK (&rreq->work, netfs_rreq_work);@@ -76,6 +75,7 @@ static void netfs_free_request(struct work_struct *work) {struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work); +netfs_clear_subrequests (rreq, false);if (rreq->netfs_priv) rreq->netfs_ops->cleanup (rreq->mapping, rreq->netfs_priv);fs/netfs/read_helper.c +45
-55@@ -14,7 +14,6 @@#include <linux/uio.h> #include <linux/sched/mm.h> #include <linux/task_io_accounting_ops.h> -#include <linux/netfs.h> #include "internal.h" #define CREATE_TRACE_POINTS #include <trace/events/netfs.h> @@ -735,8 +734,6 @@ static void netfs_rreq_expand(struct netfs_io_request *rreq,/** * netfs_readahead - Helper to manage a read request * @ractl: The description of the readahead request -* @ops: The network filesystem's operations for the helper to use -* @netfs_priv: Private netfs data to be retained in the request * * Fulfil a readahead request by drawing data from the cache if possible, or * the netfs if not. Space beyond the EOF is zero-filled. Multiple I/O @@ -744,35 +741,32 @@ static void netfs_rreq_expand(struct netfs_io_request *rreq,* readahead window can be expanded in either direction to a more convenient * alighment for RPC efficiency or to make storage in the cache feasible. * -* The calling netfs must provide a table of operations, only one of which, -* issue_op, is mandatory. It may also be passed a private token, which will -* be retained in rreq->netfs_priv and will be cleaned up by ops->cleanup(). +* The calling netfs must initialise a netfs context contiguous to the vfs +* inode before calling this. * * This is usable whether or not caching is enabled. */ -void netfs_readahead (struct readahead_control *ractl, -const struct netfs_request_ops *ops, -void *netfs_priv) +void netfs_readahead (struct readahead_control *ractl) {struct netfs_io_request *rreq; +struct netfs_i_context *ctx =netfs_i_context (ractl->mapping->host);unsigned int debug_index =0 ;int ret;_enter ("%lx,%x" ,readahead_index (ractl),readahead_count (ractl));if (readahead_count (ractl) ==0 ) - goto cleanup; +return ; rreq =netfs_alloc_request (ractl->mapping, ractl->file, - ops, netfs_priv,readahead_pos (ractl),readahead_length (ractl),NETFS_READAHEAD );if (IS_ERR (rreq)) - goto cleanup; +return ; -if (ops->begin_cache_operation) { - ret = ops->begin_cache_operation (rreq); +if (ctx->ops->begin_cache_operation) { + ret = ctx->ops->begin_cache_operation (rreq);if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) goto cleanup_free; }@@ -804,42 +798,35 @@ void netfs_readahead(struct readahead_control *ractl, cleanup_free:netfs_put_request (rreq, false, netfs_rreq_trace_put_failed);return ; -cleanup: -if (netfs_priv) - ops->cleanup (ractl->mapping, netfs_priv); -return ; }EXPORT_SYMBOL (netfs_readahead);/** * netfs_readpage - Helper to manage a readpage request * @file: The file to read from -* @folio: The folio to read -* @ops: The network filesystem's operations for the helper to use -* @netfs_priv: Private netfs data to be retained in the request +* @subpage: A subpage of the folio to read * * Fulfil a readpage request by drawing data from the cache if possible, or the * netfs if not. Space beyond the EOF is zero-filled. Multiple I/O requests * from different sources will get munged together. * -* The calling netfs must provide a table of operations, only one of which, -* issue_op, is mandatory. It may also be passed a private token, which will -* be retained in rreq->netfs_priv and will be cleaned up by ops->cleanup(). +* The calling netfs must initialise a netfs context contiguous to the vfs +* inode before calling this. * * This is usable whether or not caching is enabled. */ -int netfs_readpage (struct file *file, -struct folio *folio, -const struct netfs_request_ops *ops, -void *netfs_priv) +int netfs_readpage (struct file *file,struct page *subpage) { +struct folio *folio =page_folio (subpage); +struct address_space *mapping = folio->mapping;struct netfs_io_request *rreq; +struct netfs_i_context *ctx =netfs_i_context (mapping->host);unsigned int debug_index =0 ;int ret;_enter ("%lx" ,folio_index (folio)); - rreq =netfs_alloc_request (folio->mapping, file, ops, netfs_priv, + rreq =netfs_alloc_request (mapping, file,folio_file_pos (folio),folio_size (folio),NETFS_READPAGE );if (IS_ERR (rreq)) {@@ -847,8 +834,8 @@ int netfs_readpage(struct file *file, goto alloc_error; } -if (ops->begin_cache_operation) { - ret = ops->begin_cache_operation (rreq); +if (ctx->ops->begin_cache_operation) { + ret = ctx->ops->begin_cache_operation (rreq);if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) {folio_unlock (folio); goto out;@@ -886,8 +873,6 @@ int netfs_readpage(struct file *file,netfs_put_request (rreq, false, netfs_rreq_trace_put_hold);return ret; alloc_error: -if (netfs_priv) - ops->cleanup (folio_file_mapping (folio), netfs_priv);folio_unlock (folio);return ret; }@@ -898,6 +883,7 @@ EXPORT_SYMBOL(netfs_readpage);* @folio: The folio being prepared * @pos: starting position for the write * @len: length of write +* @always_fill: T if the folio should always be completely filled/cleared * * In some cases, write_begin doesn't need to read at all: * - full folio write @@ -907,17 +893,27 @@ EXPORT_SYMBOL(netfs_readpage);* If any of these criteria are met, then zero out the unwritten parts * of the folio and return true. Otherwise, return false. */ -static bool netfs_skip_folio_read (struct folio *folio,loff_t pos,size_t len) +static bool netfs_skip_folio_read (struct folio *folio,loff_t pos,size_t len, +bool always_fill) {struct inode *inode =folio_inode (folio);loff_t i_size =i_size_read (inode);size_t offset =offset_in_folio (folio, pos); +size_t plen =folio_size (folio); + +if (unlikely (always_fill)) { +if (pos - offset + len <= i_size) +return false;/* Page entirely before EOF */ +zero_user_segment (&folio->page,0 , plen); +folio_mark_uptodate (folio); +return true; + }/* Full folio write */ -if (offset ==0 && len >=folio_size (folio)) +if (offset ==0 && len >= plen)return true; -/* pos beyond last folio in the file */ +/* Page entirely beyond the end of the file */ if (pos - offset >= i_size) goto zero_out;@@ -927,7 +923,7 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len)return false; zero_out: -zero_user_segments (&folio->page,0 , offset, offset + len,folio_size (folio)); +zero_user_segments (&folio->page,0 , offset, offset + len, len);return true; }@@ -940,8 +936,6 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len)* @aop_flags: AOP_* flags * @_folio: Where to put the resultant folio * @_fsdata: Place for the netfs to store a cookie -* @ops: The network filesystem's operations for the helper to use -* @netfs_priv: Private netfs data to be retained in the request * * Pre-read data for a write-begin request by drawing data from the cache if * possible, or the netfs if not. Space beyond the EOF is zero-filled. @@ -960,17 +954,18 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len)* should go ahead; unlock the folio and return -EAGAIN to cause the folio to * be regot; or return an error. * +* The calling netfs must initialise a netfs context contiguous to the vfs +* inode before calling this. +* * This is usable whether or not caching is enabled. */ int netfs_write_begin (struct file *file,struct address_space *mapping,loff_t pos,unsigned int len,unsigned int aop_flags, -struct folio **_folio,void **_fsdata, -const struct netfs_request_ops *ops, -void *netfs_priv) +struct folio **_folio,void **_fsdata) {struct netfs_io_request *rreq; +struct netfs_i_context *ctx =netfs_i_context (file_inode (file ));struct folio *folio; -struct inode *inode =file_inode (file);unsigned int debug_index =0 , fgp_flags;pgoff_t index = pos >>PAGE_SHIFT ;int ret;@@ -986,9 +981,9 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,if (!folio)return -ENOMEM ; -if (ops->check_write_begin) { +if (ctx->ops->check_write_begin) {/* Allow the netfs (eg. ceph) to flush conflicts. */ - ret = ops->check_write_begin (file, pos, len, folio, _fsdata); + ret = ctx->ops->check_write_begin (file, pos, len, folio, _fsdata);if (ret <0 ) {trace_netfs_failure (NULL ,NULL , ret, netfs_fail_check_write_begin);if (ret == -EAGAIN )@@ -1004,13 +999,13 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,* within the cache granule containing the EOF, in which case we need * to preload the granule. */ -if (!ops->is_cache_enabled (inode) && -netfs_skip_folio_read (folio, pos, len)) { +if (!netfs_is_cache_enabled (ctx) && +netfs_skip_folio_read (folio, pos, len, false)) {netfs_stat (&netfs_n_rh_write_zskip); goto have_folio_no_wait; } - rreq =netfs_alloc_request (mapping, file, ops, netfs_priv, + rreq =netfs_alloc_request (mapping, file,folio_file_pos (folio),folio_size (folio),NETFS_READ_FOR_WRITE );if (IS_ERR (rreq)) {@@ -1019,10 +1014,9 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, } rreq->no_unlock_folio =folio_index (folio);__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); - netfs_priv =NULL ; -if (ops->begin_cache_operation) { - ret = ops->begin_cache_operation (rreq); +if (ctx->ops->begin_cache_operation) { + ret = ctx->ops->begin_cache_operation (rreq);if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) goto error_put; }@@ -1076,8 +1070,6 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,if (ret <0 ) goto error; have_folio_no_wait: -if (netfs_priv) - ops->cleanup (mapping, netfs_priv); *_folio = folio;_leave (" = 0" );return 0 ;@@ -1087,8 +1079,6 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, error:folio_unlock (folio);folio_put (folio); -if (netfs_priv) - ops->cleanup (mapping, netfs_priv);_leave (" = %d" , ret);return ret; }fs/netfs/stats.c +0
-1@@ -7,7 +7,6 @@#include <linux/export.h> #include <linux/seq_file.h> -#include <linux/netfs.h> #include "internal.h" atomic_t netfs_n_rh_readahead;include/linux/netfs.h +61
-11@@ -118,6 +118,16 @@ enum netfs_io_source {typedef void (*netfs_io_terminated_t )(void *priv,ssize_t transferred_or_error,bool was_async); +/* +* Per-inode description. This must be directly after the inode struct. +*/ +struct netfs_i_context { +const struct netfs_request_ops *ops; +#if IS_ENABLED (CONFIG_FSCACHE ) +struct fscache_cookie *cache; +#endif +}; +/* * Resources required to do operations on a cache. */ @@ -192,7 +202,6 @@ struct netfs_io_request {* Operations the network filesystem can/must provide to the helpers. */ struct netfs_request_ops { -bool (*is_cache_enabled)(struct inode *inode);int (*init_request)(struct netfs_io_request *rreq,struct file *file);int (*begin_cache_operation)(struct netfs_io_request *rreq);void (*expand_readahead)(struct netfs_io_request *rreq);@@ -263,18 +272,11 @@ struct netfs_cache_ops { };struct readahead_control ; -extern void netfs_readahead (struct readahead_control *, -const struct netfs_request_ops *, -void *); -extern int netfs_readpage (struct file *, -struct folio *, -const struct netfs_request_ops *, -void *); +extern void netfs_readahead (struct readahead_control *); +extern int netfs_readpage (struct file *,struct page *);extern int netfs_write_begin (struct file *,struct address_space *,loff_t ,unsigned int ,unsigned int ,struct folio **, -void **, -const struct netfs_request_ops *, -void *); +void **);extern void netfs_subreq_terminated (struct netfs_io_subrequest *,ssize_t ,bool ); extern void netfs_get_subrequest(struct netfs_io_subrequest *subreq,@@ -283,4 +285,61 @@ extern void netfs_put_subrequest(struct netfs_io_subrequest *subreq, bool was_async, enum netfs_sreq_ref_trace what);extern void netfs_stats_show (struct seq_file *); +/** +* netfs_i_context - Get the netfs inode context from the inode +* @inode: The inode to query +* +* Get the netfs lib inode context from the network filesystem's inode. The +* context struct is expected to directly follow on from the VFS inode struct. +*/ +static inline struct netfs_i_context *netfs_i_context (struct inode *inode) +{ +return (struct netfs_i_context *)(inode +1 ); +} + +/** +* netfs_inode - Get the netfs inode from the inode context +* @ctx: The context to query +* +* Get the netfs inode from the netfs library's inode context. The VFS inode +* is expected to directly precede the context struct. +*/ +static inline struct inode *netfs_inode (struct netfs_i_context *ctx) +{ +return ((struct inode *)ctx) -1 ; +} + +/** +* netfs_i_context_init - Initialise a netfs lib context +* @inode: The inode with which the context is associated +* @ops: The netfs's operations list +* +* Initialise the netfs library context struct. This is expected to follow on +* directly from the VFS inode struct. +*/ +static inline void netfs_i_context_init (struct inode *inode, +const struct netfs_request_ops *ops) +{ +struct netfs_i_context *ctx =netfs_i_context (inode); + +memset (ctx,0 ,sizeof (*ctx)); + ctx->ops = ops; +} + +/** +* netfs_i_cookie - Get the cache cookie from the inode +* @inode: The inode to query +* +* Get the caching cookie (if enabled) from the network filesystem's inode. +*/ +static inline struct fscache_cookie *netfs_i_cookie (struct inode *inode)
include/linux/netfs.h extern void netfs_put_subrequest(struct netfs_io_subrequest *subreq, · line 345
Quoted 10 lines
include/linux/netfs.h +9
-0+{ +#if IS_ENABLED (CONFIG_FSCACHE ) +struct netfs_i_context *ctx =netfs_i_context (inode); +return ctx->cache; +#else +return NULL ; +#endif +} +#endif /* _LINUX_NETFS_H */
I still think a struct netfs_inode would be cleaner, but I'll concede that this does mean less churn in the filesystems.
It's still a big patch though, and reverting (or backporting) it will be ugly. It might be worth it to break this up into a patch-per-fs conversion series.
Either way, this is probably the most reasonable way forward.
David Howells
maintainerRe: [PATCH v3 13/20] netfs: Add a netfs inode context
In reply to David HowellsI found a couple of issues here:
Firstly, netfs_is_cache_enabled() causes the generic/522 xfstest to take 60s longer. This can be fixed by:
- return fscache_cookie_valid(cookie) && fscache_cookie_enabled(cookie);
+ return fscache_cookie_valid(cookie) && cookie->cache_priv &&
+ fscache_cookie_enabled(cookie);
There's no point trying to do caching if there's no cache actually attached. I wonder if I should actually make this change in fscache_cookie_enabled() rather than here.
Secondly, the above causes netfs_skip_folio_read() to be skipped a lot more often than it should, and this hides an incorrect change there. I made netfs_skip_folio_read() copy the folio size into a variable to avoid issuing the calculation multiple times, but I then gave the wrong length when clearing the tail of the page. This can be fixed by:
- zero_user_segments(&folio->page, 0, offset, offset + len, len);
+ zero_user_segments(&folio->page, 0, offset, offset + len, plen);
David
David Howells
maintainerPATCH v4 13/20 netfs: Add a netfs inode context
In reply to David HowellsAdd a netfs_i_context struct that should be included in the network filesystem's own inode struct wrapper, directly after the VFS's inode struct, e.g.:
struct my_inode {
struct {
/* These must be contiguous */
struct inode vfs_inode;
struct netfs_i_context netfs_ctx;
};
};The netfs_i_context struct so far contains a single field for the network filesystem to use - the cache cookie:
struct netfs_i_context {
...
struct fscache_cookie *cache;
};Three functions are provided to help with this:
(1) void netfs_i_context_init(struct inode *inode,
const struct netfs_request_ops *ops);
Initialise the netfs context and set the operations.
(2) struct netfs_i_context *netfs_i_context(struct inode *inode);
Find the netfs context from the VFS inode.
(3) struct inode *netfs_inode(struct netfs_i_context *ctx);
Find the VFS inode from the netfs context.
Changes
=======
ver #4)
- Fix netfs_is_cache_enabled() to check cookie->cache_priv to see if a cache is present[3].
- Fix netfs_skip_folio_read() to zero out all of the page, not just some of it[3].
ver #3)
- Split out the bit to move ceph cap-getting on readahead into ceph_init_request()[1].
- Stick in a comment to the netfs inode structs indicating the contiguity requirements[2].
ver #2)
- Adjust documentation to match.
- Use "#if IS_ENABLED()" in netfs_i_cookie(), not "#ifdef".
- Move the cap check from ceph_readahead() to ceph_init_request() to be called from netfslib.
- Remove ceph_readahead() and use netfs_readahead() directly instead.
--- Documentation/filesystems/netfs_library.rst | 101 +++++++++++++++++++--------- fs/9p/cache.c | 10 +- fs/9p/v9fs.c | 4 - fs/9p/v9fs.h | 13 ++- fs/9p/vfs_addr.c | 43 +---------- fs/9p/vfs_inode.c | 13 ++- fs/afs/dynroot.c | 1 fs/afs/file.c | 26 ------- fs/afs/inode.c | 31 +++++--- fs/afs/internal.h | 19 +++-- fs/afs/super.c | 4 - fs/afs/write.c | 3 fs/ceph/addr.c | 31 +------- fs/ceph/cache.c | 28 +++---- fs/ceph/cache.h | 11 --- fs/ceph/inode.c | 6 - fs/ceph/super.h | 17 ++-- fs/cifs/cifsglob.h | 10 +- fs/cifs/fscache.c | 11 +-- fs/cifs/fscache.h | 2 fs/netfs/internal.h | 18 ++++ fs/netfs/objects.c | 12 +-- fs/netfs/read_helper.c | 100 ++++++++++++--------------- fs/netfs/stats.c | 1 include/linux/netfs.h | 81 +++++++++++++++++++--- 25 files changed, 318 insertions(+), 278 deletions(-)
Documentation/filesystems/netfs_library.rst +72 -29
@@ -7,6 +7,8 @@ Network Filesystem Helper Library .. Contents: - Overview. + - Per-inode context. + - Inode context helper functions. - Buffered read helpers. - Read helper functions. - Read helper structures.
@@ -28,6 +30,69 @@ Note that the library module doesn't link against local caching directly, so access must be provided by the netfs. +Per-Inode Context +================= + +The network filesystem helper library needs a place to store a bit of state for +its use on each netfs inode it is helping to manage. To this end, a context +structure is defined:: + + struct netfs_i_context { + const struct netfs_request_ops *ops; + struct fscache_cookie *cache; + }; + +A network filesystem that wants to use netfs lib must place one of these +directly after the VFS ``struct inode`` it allocates, usually as part of its +own struct. This can be done in a way similar to the following:: + + struct my_inode { + struct { + /* These must be contiguous */ + struct inode vfs_inode; + struct netfs_i_context netfs_ctx; + }; + ... + }; + +This allows netfslib to find its state by simple offset from the inode pointer, +thereby allowing the netfslib helper functions to be pointed to directly by the +VFS/VM operation tables. + +The structure contains the following fields: + + * ``ops`` + + The set of operations provided by the network filesystem to netfslib. + + * ``cache`` + + Local caching cookie, or NULL if no caching is enabled. This field does not + exist if fscache is disabled. + + +Inode Context Helper Functions +------------------------------ + +To help deal with the per-inode context, a number helper functions are +provided. Firstly, a function to perform basic initialisation on a context and +set the operations table pointer:: + + void netfs_i_context_init(struct inode *inode, + const struct netfs_request_ops *ops); + +then two functions to cast between the VFS inode structure and the netfs +context:: + + struct netfs_i_context *netfs_i_context(struct inode *inode); + struct inode *netfs_inode(struct netfs_i_context *ctx); + +and finally, a function to get the cache cookie pointer from the context +attached to an inode (or NULL if fscache is disabled):: + + struct fscache_cookie *netfs_i_cookie(struct inode *inode); + + Buffered Read Helpers =====================
@@ -70,38 +135,22 @@ Read Helper Functions Three read helpers are provided:: - void netfs_readahead(struct readahead_control *ractl, - const struct netfs_request_ops *ops, - void *netfs_priv); + void netfs_readahead(struct readahead_control *ractl); int netfs_readpage(struct file *file, - struct folio *folio, - const struct netfs_request_ops *ops, - void *netfs_priv); + struct page *page); int netfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int flags, struct folio **_folio, - void **_fsdata, - const struct netfs_request_ops *ops, - void *netfs_priv); - -Each corresponds to a VM operation, with the addition of a couple of parameters -for the use of the read helpers: + void **_fsdata); - * ``ops`` - - A table of operations through which the helpers can talk to the filesystem. - - * ``netfs_priv`` +Each corresponds to a VM address space operation. These operations use the +state in the per-inode context. - Filesystem private data (can be NULL). - -Both of these values will be stored into the read request structure. - -For ->readahead() and ->readpage(), the network filesystem should just jump -into the corresponding read helper; whereas for ->write_begin(), it may be a +For ->readahead() and ->readpage(), the network filesystem just point directly +at the corresponding read helper; whereas for ->write_begin(), it may be a little more complicated as the network filesystem might want to flush conflicting writes or track dirty data and needs to put the acquired folio if an error occurs after calling the helper.
@@ -246,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); - bool (*is_cache_enabled)(struct inode *inode); 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);
@@ -265,11 +313,6 @@ The operations are as follows: [Optional] This is called to initialise the request structure. It is given the file for reference and can modify the ->netfs_priv value. - * ``is_cache_enabled()`` - - [Required] This is called by netfs_write_begin() to ask if the file is being - cached. It should return true if it is being cached and false otherwise. - * ``begin_cache_operation()`` [Optional] This is called to ask the network filesystem to call into the
fs/9p/cache.c +4 -6
@@ -49,22 +49,20 @@ int v9fs_cache_session_get_cookie(struct v9fs_session_info *v9ses,void v9fs_cache_inode_get_cookie (struct inode *inode) { -struct v9fs_inode *v9inode; +struct v9fs_inode *v9inode =V9FS_I (inode);struct v9fs_session_info *v9ses;__le32 version;__le64 path;if (!S_ISREG (inode->i_mode))return ; - - v9inode =V9FS_I (inode); -if (WARN_ON (v9inode->fscache)) +if (WARN_ON (v9fs_inode_cookie (v9inode)))return ; version =cpu_to_le32 (v9inode->qid.version); path =cpu_to_le64 (v9inode->qid.path); v9ses =v9fs_inode2v9ses (inode); - v9inode->fscache = + v9inode->netfs_ctx.cache = fscache_acquire_cookie(v9fs_session_cache(v9ses), 0, &path, sizeof(path),
@@ -72,5 +70,5 @@ void v9fs_cache_inode_get_cookie(struct inode *inode) i_size_read(&v9inode->vfs_inode));p9_debug (P9_DEBUG_FSC ,"inode %p get cookie %p\n" , - inode, v9inode->fscache); + inode,v9fs_inode_cookie (v9inode)); }
fs/9p/v9fs.c +1 -3
@@ -623,9 +623,7 @@ static void v9fs_sysfs_cleanup(void)static void v9fs_inode_init_once (void *foo) {struct v9fs_inode *v9inode = (struct v9fs_inode *)foo; -#ifdef CONFIG_9P_FSCACHE - v9inode->fscache =NULL ; -#endif +memset (&v9inode->qid,0 ,sizeof (v9inode->qid));inode_init_once (&v9inode->vfs_inode); }
fs/9p/v9fs.h +8 -5
@@ -9,6 +9,7 @@#define FS_9P_V9FS_H #include <linux/backing-dev.h> +#include <linux/netfs.h> /** * enum p9_session_flags - option flags for each 9P session
@@ -108,14 +109,15 @@ struct v9fs_session_info {#define V9FS_INO_INVALID_ATTR 0x01struct v9fs_inode { -#ifdef CONFIG_9P_FSCACHE -struct fscache_cookie *fscache; -#endif +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct p9_qid qid;unsigned int cache_validity;struct p9_fid *writeback_fid;struct mutex v_mutex; -struct inode vfs_inode; };static inline struct v9fs_inode *V9FS_I (const struct inode *inode)
@@ -126,7 +128,7 @@ static inline struct v9fs_inode *V9FS_I(const struct inode *inode)static inline struct fscache_cookie *v9fs_inode_cookie (struct v9fs_inode *v9inode) {#ifdef CONFIG_9P_FSCACHE -return v9inode->fscache; +return netfs_i_cookie (&v9inode->vfs_inode);#else return NULL ;#endif
@@ -163,6 +165,7 @@ extern struct inode *v9fs_inode_from_fid(struct v9fs_session_info *v9ses,extern const struct inode_operations v9fs_dir_inode_operations_dotl;extern const struct inode_operations v9fs_file_inode_operations_dotl;extern const struct inode_operations v9fs_symlink_inode_operations_dotl; +extern const struct netfs_request_ops v9fs_req_ops;extern struct inode *v9fs_inode_from_fid_dotl (struct v9fs_session_info *v9ses,struct p9_fid *fid,struct super_block *sb,int new);
fs/9p/vfs_addr.c +4 -39
73 lines not on this page · raw message
fs/9p/vfs_inode.c +10 -3
@@ -231,9 +231,6 @@ struct inode *v9fs_alloc_inode(struct super_block *sb) v9inode =kmem_cache_alloc (v9fs_inode_cache,GFP_KERNEL );if (!v9inode)return NULL ; -#ifdef CONFIG_9P_FSCACHE - v9inode->fscache =NULL ; -#endif v9inode->writeback_fid =NULL ; v9inode->cache_validity =0 ;mutex_init (&v9inode->v_mutex);
@@ -250,6 +247,14 @@ void v9fs_free_inode(struct inode *inode)kmem_cache_free (v9fs_inode_cache,V9FS_I (inode)); } +/* +* Set parameters for the netfs library +*/ +static void v9fs_set_netfs_context (struct inode *inode) +{ +netfs_i_context_init (inode, &v9fs_req_ops); +} +int v9fs_init_inode (struct v9fs_session_info *v9ses,struct inode *inode,umode_t mode,dev_t rdev) {
@@ -338,6 +343,8 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses, err = -EINVAL ; goto error; } + +v9fs_set_netfs_context (inode); error:return err;
fs/afs/dynroot.c +1 -0
@@ -76,6 +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_i_context_init (inode,NULL ); inode->i_size =0 ; inode->i_mode =S_IFDIR |S_IRUGO |S_IXUGO ;if (root) {
fs/afs/file.c +2 -24
@@ -19,13 +19,11 @@#include "internal.h" static int afs_file_mmap (struct file *file,struct vm_area_struct *vma); -static int afs_readpage (struct file *file,struct page *page);static int afs_symlink_readpage (struct file *file,struct page *page);static void afs_invalidatepage (struct page *page,unsigned int offset,unsigned int length);static int afs_releasepage (struct page *page,gfp_t gfp_flags); -static void afs_readahead (struct readahead_control *ractl);static ssize_t afs_file_read_iter (struct kiocb *iocb,struct iov_iter *iter);static void afs_vm_open (struct vm_area_struct *area);static void afs_vm_close (struct vm_area_struct *area);
@@ -52,8 +50,8 @@ const struct inode_operations afs_file_inode_operations = { };const struct address_space_operations afs_file_aops = { - .readpage = afs_readpage, - .readahead = afs_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .set_page_dirty = afs_set_page_dirty, .launder_page = afs_launder_page, .releasepage = afs_releasepage,
@@ -365,13 +363,6 @@ static int afs_init_request(struct netfs_io_request *rreq, struct file *file)return 0 ; } -static bool afs_is_cache_enabled (struct inode *inode) -{ -struct fscache_cookie *cookie =afs_vnode_cache (AFS_FS_I (inode)); - -return fscache_cookie_enabled (cookie) && cookie->cache_priv; -} -static int afs_begin_cache_operation (struct netfs_io_request *rreq) {#ifdef CONFIG_AFS_FSCACHE
@@ -399,25 +390,12 @@ static void afs_priv_cleanup(struct address_space *mapping, void *netfs_priv)const struct netfs_request_ops afs_req_ops = { .init_request = afs_init_request, - .is_cache_enabled = afs_is_cache_enabled, .begin_cache_operation = afs_begin_cache_operation, .check_write_begin = afs_check_write_begin, .issue_read = afs_issue_read, .cleanup = afs_priv_cleanup, }; -static int afs_readpage (struct file *file,struct page *page) -{ -struct folio *folio =page_folio (page); - -return netfs_readpage (file, folio, &afs_req_ops,NULL ); -} - -static void afs_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &afs_req_ops,NULL ); -} -int afs_write_inode (struct inode *inode,struct writeback_control *wbc) {fscache_unpin_writeback (wbc,afs_vnode_cache (AFS_FS_I (inode)));
fs/afs/inode.c +20 -11
@@ -53,6 +53,14 @@ static noinline void dump_vnode(struct afs_vnode *vnode, struct afs_vnode *parendump_stack (); } +/* +* Set parameters for the netfs library +*/ +static void afs_set_netfs_context (struct afs_vnode *vnode) +{ +netfs_i_context_init (&vnode->vfs_inode, &afs_req_ops); +} +/* * Initialise an inode from the vnode status. */
@@ -128,6 +136,7 @@ static int afs_inode_init_from_status(struct afs_operation *op, }afs_set_i_size (vnode, status->size); +afs_set_netfs_context (vnode); vnode->invalid_before = status->data_version;inode_set_iversion_raw (&vnode->vfs_inode, status->data_version);
@@ -420,7 +429,7 @@ static void afs_get_inode_cache(struct afs_vnode *vnode)struct afs_vnode_cache_aux aux;if (vnode->status.type !=AFS_FTYPE_FILE ) { - vnode->cache =NULL ; + vnode->netfs_ctx.cache =NULL ;return ; }
@@ -430,12 +439,14 @@ static void afs_get_inode_cache(struct afs_vnode *vnode) key.vnode_id_ext[1 ] =htonl (vnode->fid.vnode_hi);afs_set_cache_aux (vnode, &aux); - vnode->cache =fscache_acquire_cookie ( - vnode->volume->cache, - vnode->status.type ==AFS_FTYPE_FILE ?0 :FSCACHE_ADV_SINGLE_CHUNK , - &key,sizeof (key), - &aux,sizeof (aux), - vnode->status.size); +afs_vnode_set_cache (vnode, +fscache_acquire_cookie ( + vnode->volume->cache, + vnode->status.type ==AFS_FTYPE_FILE ? +0 :FSCACHE_ADV_SINGLE_CHUNK , + &key,sizeof (key), + &aux,sizeof (aux), + vnode->status.size));#endif }
@@ -528,6 +539,7 @@ struct inode *afs_root_iget(struct super_block *sb, struct key *key) vnode =AFS_FS_I (inode); vnode->cb_v_break = as->volume->cb_v_break, +afs_set_netfs_context (vnode); op =afs_alloc_operation (key, as->volume);if (IS_ERR (op)) {
@@ -786,11 +798,8 @@ void afs_evict_inode(struct inode *inode)afs_put_wb_key (wbk); } -#ifdef CONFIG_AFS_FSCACHE -fscache_relinquish_cookie (vnode->cache, +fscache_relinquish_cookie (afs_vnode_cache (vnode),test_bit (AFS_VNODE_DELETED , &vnode->flags)); - vnode->cache =NULL ; -#endif afs_prune_wb_keys (vnode);afs_put_permits (rcu_access_pointer (vnode->permit_cache));
fs/afs/internal.h +14 -5
@@ -619,15 +619,16 @@ enum afs_lock_state {* leak from one inode to another. */ struct afs_vnode { -struct inode vfs_inode;/* the VFS's inode record */ +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct afs_volume *volume;/* volume on which vnode resides */ struct afs_fid fid;/* the file identifier for this inode */ struct afs_file_status status;/* AFS status info for this file */ afs_dataversion_t invalid_before;/* Child dentries are invalid before this */ -#ifdef CONFIG_AFS_FSCACHE -struct fscache_cookie *cache;/* caching cookie */ -#endif struct afs_permits __rcu *permit_cache;/* cache of permits so far obtained */ struct mutex io_lock;/* Lock for serialising I/O on this mutex */ struct rw_semaphore validate_lock;/* lock for validating this vnode */
@@ -674,12 +675,20 @@ struct afs_vnode {static inline struct fscache_cookie *afs_vnode_cache (struct afs_vnode *vnode) {#ifdef CONFIG_AFS_FSCACHE -return vnode->cache; +return netfs_i_cookie (&vnode->vfs_inode);#else return NULL ;#endif } +static inline void afs_vnode_set_cache (struct afs_vnode *vnode, +struct fscache_cookie *cookie) +{ +#ifdef CONFIG_AFS_FSCACHE + vnode->netfs_ctx.cache = cookie; +#endif +} +/* * cached security record for one user's attempt to access a vnode */
fs/afs/super.c +1 -3
@@ -688,13 +688,11 @@ static struct inode *afs_alloc_inode(struct super_block *sb)/* Reset anything that shouldn't leak from one inode to the next. */ memset (&vnode->fid,0 ,sizeof (vnode->fid));memset (&vnode->status,0 ,sizeof (vnode->status)); +afs_vnode_set_cache (vnode,NULL ); vnode->volume =NULL ; vnode->lock_key =NULL ; vnode->permit_cache =NULL ; -#ifdef CONFIG_AFS_FSCACHE - vnode->cache =NULL ; -#endif vnode->flags =1 <<AFS_VNODE_UNSET ; vnode->lock_state =AFS_VNODE_LOCK_NONE ;
fs/afs/write.c +1 -2
@@ -59,8 +59,7 @@ int afs_write_begin(struct file *file, struct address_space *mapping,* 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. */ - ret =netfs_write_begin (file, mapping, pos, len, flags, &folio, fsdata, - &afs_req_ops,NULL ); + ret =netfs_write_begin (file, mapping, pos, len, flags, &folio, fsdata);if (ret <0 )return ret;
fs/ceph/addr.c +4 -27
@@ -403,7 +403,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)ceph_put_cap_refs (ci, got); } -static const struct netfs_request_ops ceph_netfs_read_ops = { +const struct netfs_request_ops ceph_netfs_ops = { .init_request = ceph_init_request, .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read,
@@ -413,28 +413,6 @@ static const struct netfs_request_ops ceph_netfs_read_ops = { .cleanup = ceph_readahead_cleanup, }; -/* read a single page, without unlocking it. */ -static int ceph_readpage (struct file *file,struct page *subpage) -{ -struct folio *folio =page_folio (subpage); -struct inode *inode =file_inode (file); -struct ceph_inode_info *ci =ceph_inode (inode); -struct ceph_vino vino =ceph_vino (inode); -size_t len =folio_size (folio); -u64 off =folio_file_pos (folio); - -dout ("readpage ino %llx.%llx file %p off %llu len %zu folio %p index %lu\n inline %d" , - vino.ino, vino.snap, file, off, len, folio,folio_index (folio), - ci->i_inline_version !=CEPH_INLINE_NONE ); - -return netfs_readpage (file, folio, &ceph_netfs_read_ops,NULL ); -} - -static void ceph_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &ceph_netfs_read_ops,NULL ); -} -#ifdef CONFIG_CEPH_FSCACHE static void ceph_set_page_fscache (struct page *page) {
@@ -1333,8 +1311,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,struct folio *folio =NULL ;int r; - r =netfs_write_begin (file, inode->i_mapping, pos, len,0 , &folio,NULL , - &ceph_netfs_read_ops,NULL ); + r =netfs_write_begin (file, inode->i_mapping, pos, len,0 , &folio,NULL );if (r ==0 )folio_wait_fscache (folio);if (r <0 ) {
@@ -1388,8 +1365,8 @@ static int ceph_write_end(struct file *file, struct address_space *mapping, }const struct address_space_operations ceph_aops = { - .readpage = ceph_readpage, - .readahead = ceph_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .writepage = ceph_writepage, .writepages = ceph_writepages_start, .write_begin = ceph_write_begin,
fs/ceph/cache.c +14 -14
@@ -29,26 +29,25 @@ void ceph_fscache_register_inode_cookie(struct inode *inode)if (!(inode->i_state &I_NEW ))return ; -WARN_ON_ONCE (ci->fscache); +WARN_ON_ONCE (ci->netfs_ctx.cache); - ci->fscache =fscache_acquire_cookie (fsc->fscache,0 , - &ci->i_vino,sizeof (ci->i_vino), - &ci->i_version,sizeof (ci->i_version), -i_size_read (inode)); + ci->netfs_ctx.cache = +fscache_acquire_cookie (fsc->fscache,0 , + &ci->i_vino,sizeof (ci->i_vino), + &ci->i_version,sizeof (ci->i_version), +i_size_read (inode)); } -void ceph_fscache_unregister_inode_cookie (struct ceph_inode_info * ci) +void ceph_fscache_unregister_inode_cookie (struct ceph_inode_info *ci) { -struct fscache_cookie *cookie = ci->fscache; - -fscache_relinquish_cookie (cookie, false); +fscache_relinquish_cookie (ceph_fscache_cookie (ci), false); }void ceph_fscache_use_cookie (struct inode *inode,bool will_modify) {struct ceph_inode_info *ci =ceph_inode (inode); -fscache_use_cookie (ci->fscache, will_modify); +fscache_use_cookie (ceph_fscache_cookie (ci), will_modify); }void ceph_fscache_unuse_cookie (struct inode *inode,bool update)
@@ -58,9 +57,10 @@ void ceph_fscache_unuse_cookie(struct inode *inode, bool update)if (update) {loff_t i_size =i_size_read (inode); -fscache_unuse_cookie (ci->fscache, &ci->i_version, &i_size); +fscache_unuse_cookie (ceph_fscache_cookie (ci), + &ci->i_version, &i_size); }else { -fscache_unuse_cookie (ci->fscache,NULL ,NULL ); +fscache_unuse_cookie (ceph_fscache_cookie (ci),NULL ,NULL ); } }
@@ -69,14 +69,14 @@ void ceph_fscache_update(struct inode *inode)struct ceph_inode_info *ci =ceph_inode (inode);loff_t i_size =i_size_read (inode); -fscache_update_cookie (ci->fscache, &ci->i_version, &i_size); +fscache_update_cookie (ceph_fscache_cookie (ci), &ci->i_version, &i_size); }void ceph_fscache_invalidate (struct inode *inode,bool dio_write) {struct ceph_inode_info *ci =ceph_inode (inode); -fscache_invalidate (ceph_inode (inode)->fscache, +fscache_invalidate (ceph_fscache_cookie (ci), &ci->i_version,i_size_read (inode), dio_write ?FSCACHE_INVAL_DIO_WRITE :0 ); }
fs/ceph/cache.h +1 -10
@@ -26,14 +26,9 @@ void ceph_fscache_unuse_cookie(struct inode *inode, bool update);void ceph_fscache_update (struct inode *inode);void ceph_fscache_invalidate (struct inode *inode,bool dio_write); -static inline void ceph_fscache_inode_init (struct ceph_inode_info *ci) -{ - ci->fscache =NULL ; -} -static inline struct fscache_cookie *ceph_fscache_cookie (struct ceph_inode_info *ci) { -return ci->fscache; +return netfs_i_cookie (&ci->vfs_inode); }static inline void ceph_fscache_resize (struct inode *inode,loff_t to)
@@ -91,10 +86,6 @@ static inline void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc) { } -static inline void ceph_fscache_inode_init (struct ceph_inode_info *ci) -{ -} -static inline void ceph_fscache_register_inode_cookie (struct inode *inode) { }
fs/ceph/inode.c +3 -3
@@ -453,6 +453,9 @@ struct inode *ceph_alloc_inode(struct super_block *sb)dout ("alloc_inode %p\n" , &ci->vfs_inode); +/* Set parameters for the netfs library */ +netfs_i_context_init (&ci->vfs_inode, &ceph_netfs_ops); +spin_lock_init (&ci->i_ceph_lock); ci->i_version =0 ;
@@ -538,9 +541,6 @@ struct inode *ceph_alloc_inode(struct super_block *sb)INIT_WORK (&ci->i_work, ceph_inode_work); ci->i_work_mask =0 ;memset (&ci->i_btime,'\0' ,sizeof (ci->i_btime)); - -ceph_fscache_inode_init (ci); -return &ci->vfs_inode; }
fs/ceph/super.h +8 -9
@@ -17,13 +17,11 @@#include <linux/posix_acl.h> #include <linux/refcount.h> #include <linux/security.h> +#include <linux/netfs.h> +#include <linux/fscache.h> #include <linux/ceph/libceph.h> -#ifdef CONFIG_CEPH_FSCACHE -#include <linux/fscache.h> -#endif -/* large granularity for statfs utilization stats to facilitate * large volume sizes on 32-bit machines. */ #define CEPH_BLOCK_SHIFT 22/* 4 MB */
@@ -317,6 +315,11 @@ struct ceph_inode_xattrs_info {* Ceph inode. */ struct ceph_inode_info { +struct { +/* These must be contiguous */ +struct inode vfs_inode; +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct ceph_vino i_vino;/* ceph ino + snap */ spinlock_t i_ceph_lock;
@@ -427,11 +430,6 @@ struct ceph_inode_info {struct work_struct i_work;unsigned long i_work_mask; - -#ifdef CONFIG_CEPH_FSCACHE -struct fscache_cookie *fscache; -#endif -struct inode vfs_inode;/* at end */ }; static inline struct ceph_inode_info *
@@ -1215,6 +1213,7 @@ extern void __ceph_touch_fmode(struct ceph_inode_info *ci,/* addr.c */ extern const struct address_space_operations ceph_aops; +extern const struct netfs_request_ops ceph_netfs_ops;extern int ceph_mmap (struct file *file,struct vm_area_struct *vma);extern int ceph_uninline_data (struct file *file);extern int ceph_pool_perm_check (struct inode *inode,int need);
fs/cifs/cifsglob.h +6 -4
@@ -16,6 +16,7 @@#include <linux/mempool.h> #include <linux/workqueue.h> #include <linux/utsname.h> +#include <linux/netfs.h> #include "cifs_fs_sb.h" #include "cifsacl.h" #include <crypto/internal/hash.h>
@@ -1402,6 +1403,11 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file);*/ struct cifsInodeInfo { +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };bool can_cache_brlcks;struct list_head llist;/* locks helb by this inode */ /*
@@ -1432,10 +1438,6 @@ struct cifsInodeInfo {u64 uniqueid;/* server inode number */ u64 createtime;/* creation time on server */ __u8 lease_key[SMB2_LEASE_KEY_SIZE ];/* lease key for this inode */ -#ifdef CONFIG_CIFS_FSCACHE -struct fscache_cookie *fscache; -#endif -struct inode vfs_inode;struct list_head deferred_closes;/* list of deferred closes */ spinlock_t deferred_lock;/* protection on deferred list */ bool lease_granted;/* Flag to indicate whether lease or oplock is granted. */
fs/cifs/fscache.c +6 -5
@@ -103,7 +103,7 @@ void cifs_fscache_get_inode_cookie(struct inode *inode)cifs_fscache_fill_coherency (&cifsi->vfs_inode, &cd); - cifsi->fscache = + cifsi->netfs_ctx.cache = fscache_acquire_cookie(tcon->fscache, 0, &cifsi->uniqueid, sizeof(cifsi->uniqueid), &cd, sizeof(cd),
@@ -126,11 +126,12 @@ void cifs_fscache_unuse_inode_cookie(struct inode *inode, bool update)void cifs_fscache_release_inode_cookie (struct inode *inode) {struct cifsInodeInfo *cifsi =CIFS_I (inode); +struct fscache_cookie *cookie =cifs_inode_cookie (inode); -if (cifsi->fscache) { -cifs_dbg (FYI ,"%s: (0x%p)\n" , __func__, cifsi->fscache); -fscache_relinquish_cookie (cifsi->fscache, false); - cifsi->fscache =NULL ; +if (cookie) { +cifs_dbg (FYI ,"%s: (0x%p)\n" , __func__, cookie); +fscache_relinquish_cookie (cookie, false); + cifsi->netfs_ctx.cache =NULL ; } }
fs/cifs/fscache.h +1 -1
@@ -61,7 +61,7 @@ void cifs_fscache_fill_coherency(struct inode *inode,static inline struct fscache_cookie *cifs_inode_cookie (struct inode *inode) { -return CIFS_I (inode)->fscache; +return netfs_i_cookie (inode); }static inline void cifs_invalidate_cache (struct inode *inode,unsigned int flags)
fs/netfs/internal.h +16 -2
@@ -6,6 +6,7 @@*/ #include <linux/netfs.h> +#include <linux/fscache.h> #include <trace/events/netfs.h> #ifdef pr_fmt
@@ -19,8 +20,6 @@*/ struct netfs_io_request *netfs_alloc_request (struct address_space *mapping,struct file *file, -const struct netfs_request_ops *ops, -void *netfs_priv,loff_t start,size_t len,enum netfs_io_origin origin);void netfs_get_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what);
@@ -81,6 +80,21 @@ static inline void netfs_stat_d(atomic_t *stat)#define netfs_stat_d (x) do {} while(0)#endif +/* +* Miscellaneous functions. +*/ +static inline bool netfs_is_cache_enabled (struct netfs_i_context *ctx) +{ +#if IS_ENABLED (CONFIG_FSCACHE ) +struct fscache_cookie *cookie = ctx->cache; + +return fscache_cookie_valid (cookie) && cookie->cache_priv && +fscache_cookie_enabled (cookie); +#else +return false; +#endif +} +/*****************************************************************************/ /* * debug tracing
fs/netfs/objects.c +6 -6
@@ -13,12 +13,12 @@*/ struct netfs_io_request *netfs_alloc_request (struct address_space *mapping,struct file *file, -const struct netfs_request_ops *ops, -void *netfs_priv,loff_t start,size_t len,enum netfs_io_origin origin) {static atomic_t debug_ids; +struct inode *inode = file ?file_inode (file) : mapping->host; +struct netfs_i_context *ctx =netfs_i_context (inode);struct netfs_io_request *rreq;int ret;
@@ -29,11 +29,10 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, rreq->start = start; rreq->len = len; rreq->origin = origin; - rreq->netfs_ops = ops; - rreq->netfs_priv = netfs_priv; + rreq->netfs_ops = ctx->ops; rreq->mapping = mapping; - rreq->inode =file_inode (file); - rreq->i_size =i_size_read (rreq->inode); + rreq->inode = inode; + rreq->i_size =i_size_read (inode); rreq->debug_id =atomic_inc_return (&debug_ids);INIT_LIST_HEAD (&rreq->subrequests);INIT_WORK (&rreq->work, netfs_rreq_work);
@@ -76,6 +75,7 @@ static void netfs_free_request(struct work_struct *work) {struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work); +netfs_clear_subrequests (rreq, false);if (rreq->netfs_priv) rreq->netfs_ops->cleanup (rreq->mapping, rreq->netfs_priv);
fs/netfs/read_helper.c +45 -55
256 lines not on this page · raw message
fs/netfs/stats.c +0 -1
@@ -7,7 +7,6 @@#include <linux/export.h> #include <linux/seq_file.h> -#include <linux/netfs.h> #include "internal.h" atomic_t netfs_n_rh_readahead;
include/linux/netfs.h +70 -11
105 lines not on this page · raw message
Re: [PATCH v4 13/20] netfs: Add a netfs inode context
Quoted 1,044 lines · David Howells
Add a
netfs_i_contextstruct that should be included in the network filesystem's own inode struct wrapper, directly after the VFS's inode struct, e.g.:struct my_inode { struct { /* These must be contiguous */ struct inode vfs_inode; struct netfs_i_context netfs_ctx; }; };The
netfs_i_contextstruct so far contains a single field for the network filesystem to use - the cache cookie:struct netfs_i_context { ... struct fscache_cookie *cache; };Three functions are provided to help with this:
(1) void netfs_i_context_init(struct inode *inode,
const structnetfs_request_ops*ops);Initialise the netfs context and set the operations.
(2) struct
netfs_i_context*netfs_i_context(struct inode *inode);Find the netfs context from the VFS inode.
(3) struct inode *netfs_inode(struct
netfs_i_context*ctx);Find the VFS inode from the netfs context.
Changes
=======
ver #4)
- Fixnetfs_is_cache_enabled()to checkcookie->cache_privto see if a cache is present[3].
- Fixnetfs_skip_folio_read()to zero out all of the page, not just some of it[3].ver #3)
- Split out the bit to move ceph cap-getting on readahead into ceph_init_request()[1].
- Stick in a comment to the netfs inode structs indicating the contiguity requirements[2].ver #2)
- Adjust documentation to match.
- Use "#ifIS_ENABLED()" innetfs_i_cookie(), not "#ifdef".
- Move the cap check fromceph_readahead()toceph_init_request()to be called from netfslib.
- Removeceph_readahead()and usenetfs_readahead()directly instead.Signed-off-by David Howells <[email protected]>Acked-by Jeff Layton <[email protected]>Link https://lore.kernel.org/r/164622984545.3564931.15691742939278418580.stgit@warthog.procyon.org.uk/ # v1 open here--- Documentation/filesystems/netfs_library.rst | 101 +++++++++++++++++++--------- fs/9p/cache.c | 10 +- fs/9p/v9fs.c | 4 - fs/9p/v9fs.h | 13 ++- fs/9p/vfs_addr.c | 43 +---------- fs/9p/vfs_inode.c | 13 ++- fs/afs/dynroot.c | 1 fs/afs/file.c | 26 ------- fs/afs/inode.c | 31 +++++--- fs/afs/internal.h | 19 +++-- fs/afs/super.c | 4 - fs/afs/write.c | 3 fs/ceph/addr.c | 31 +------- fs/ceph/cache.c | 28 +++---- fs/ceph/cache.h | 11 --- fs/ceph/inode.c | 6 - fs/ceph/super.h | 17 ++-- fs/cifs/cifsglob.h | 10 +- fs/cifs/fscache.c | 11 +-- fs/cifs/fscache.h | 2 fs/netfs/internal.h | 18 ++++ fs/netfs/objects.c | 12 +-- fs/netfs/read_helper.c | 100 ++++++++++++--------------- fs/netfs/stats.c | 1 include/linux/netfs.h | 81 +++++++++++++++++++--- 25 files changed, 318 insertions(+), 278 deletions(-)Documentation/filesystems/netfs_library.rst +72
-29@@ -7,6 +7,8 @@ Network Filesystem Helper Library .. Contents: - Overview. + - Per-inode context. + - Inode context helper functions. - Buffered read helpers. - Read helper functions. - Read helper structures.@@ -28,6 +30,69 @@ Note that the library module doesn't link against local caching directly, so access must be provided by the netfs. +Per-Inode Context +================= + +The network filesystem helper library needs a place to store a bit of state for +its use on each netfs inode it is helping to manage. To this end, a context +structure is defined:: + + struct netfs_i_context { + const struct netfs_request_ops *ops; + struct fscache_cookie *cache; + }; + +A network filesystem that wants to use netfs lib must place one of these +directly after the VFS ``struct inode`` it allocates, usually as part of its +own struct. This can be done in a way similar to the following:: + + struct my_inode { + struct { + /* These must be contiguous */ + struct inode vfs_inode; + struct netfs_i_context netfs_ctx; + }; + ... + }; + +This allows netfslib to find its state by simple offset from the inode pointer, +thereby allowing the netfslib helper functions to be pointed to directly by the +VFS/VM operation tables. + +The structure contains the following fields: + + * ``ops`` + + The set of operations provided by the network filesystem to netfslib. + + * ``cache`` + + Local caching cookie, or NULL if no caching is enabled. This field does not + exist if fscache is disabled. + + +Inode Context Helper Functions +------------------------------ + +To help deal with the per-inode context, a number helper functions are +provided. Firstly, a function to perform basic initialisation on a context and +set the operations table pointer:: + + void netfs_i_context_init(struct inode *inode, + const struct netfs_request_ops *ops); + +then two functions to cast between the VFS inode structure and the netfs +context:: + + struct netfs_i_context *netfs_i_context(struct inode *inode); + struct inode *netfs_inode(struct netfs_i_context *ctx); + +and finally, a function to get the cache cookie pointer from the context +attached to an inode (or NULL if fscache is disabled):: + + struct fscache_cookie *netfs_i_cookie(struct inode *inode); + + Buffered Read Helpers =====================@@ -70,38 +135,22 @@ Read Helper Functions Three read helpers are provided:: - void netfs_readahead(struct readahead_control *ractl, - const struct netfs_request_ops *ops, - void *netfs_priv); + void netfs_readahead(struct readahead_control *ractl); int netfs_readpage(struct file *file, - struct folio *folio, - const struct netfs_request_ops *ops, - void *netfs_priv); + struct page *page); int netfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int flags, struct folio **_folio, - void **_fsdata, - const struct netfs_request_ops *ops, - void *netfs_priv); - -Each corresponds to a VM operation, with the addition of a couple of parameters -for the use of the read helpers: + void **_fsdata); - * ``ops`` - - A table of operations through which the helpers can talk to the filesystem. - - * ``netfs_priv`` +Each corresponds to a VM address space operation. These operations use the +state in the per-inode context. - Filesystem private data (can be NULL). - -Both of these values will be stored into the read request structure. - -For ->readahead() and ->readpage(), the network filesystem should just jump -into the corresponding read helper; whereas for ->write_begin(), it may be a +For ->readahead() and ->readpage(), the network filesystem just point directly +at the corresponding read helper; whereas for ->write_begin(), it may be a little more complicated as the network filesystem might want to flush conflicting writes or track dirty data and needs to put the acquired folio if an error occurs after calling the helper.@@ -246,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); - bool (*is_cache_enabled)(struct inode *inode); 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);@@ -265,11 +313,6 @@ The operations are as follows: [Optional] This is called to initialise the request structure. It is given the file for reference and can modify the ->netfs_priv value. - * ``is_cache_enabled()`` - - [Required] This is called by netfs_write_begin() to ask if the file is being - cached. It should return true if it is being cached and false otherwise. - * ``begin_cache_operation()`` [Optional] This is called to ask the network filesystem to call into thefs/9p/cache.c +4
-6@@ -49,22 +49,20 @@ int v9fs_cache_session_get_cookie(struct v9fs_session_info *v9ses,void v9fs_cache_inode_get_cookie (struct inode *inode) { -struct v9fs_inode *v9inode; +struct v9fs_inode *v9inode =V9FS_I (inode);struct v9fs_session_info *v9ses;__le32 version;__le64 path;if (!S_ISREG (inode->i_mode))return ; - - v9inode =V9FS_I (inode); -if (WARN_ON (v9inode->fscache)) +if (WARN_ON (v9fs_inode_cookie (v9inode)))return ; version =cpu_to_le32 (v9inode->qid.version); path =cpu_to_le64 (v9inode->qid.path); v9ses =v9fs_inode2v9ses (inode); - v9inode->fscache = + v9inode->netfs_ctx.cache = fscache_acquire_cookie(v9fs_session_cache(v9ses), 0, &path, sizeof(path),@@ -72,5 +70,5 @@ void v9fs_cache_inode_get_cookie(struct inode *inode) i_size_read(&v9inode->vfs_inode));p9_debug (P9_DEBUG_FSC ,"inode %p get cookie %p\n" , - inode, v9inode->fscache); + inode,v9fs_inode_cookie (v9inode)); }fs/9p/v9fs.c +1
-3@@ -623,9 +623,7 @@ static void v9fs_sysfs_cleanup(void)static void v9fs_inode_init_once (void *foo) {struct v9fs_inode *v9inode = (struct v9fs_inode *)foo; -#ifdef CONFIG_9P_FSCACHE - v9inode->fscache =NULL ; -#endif +memset (&v9inode->qid,0 ,sizeof (v9inode->qid));inode_init_once (&v9inode->vfs_inode); }fs/9p/v9fs.h +8
-5@@ -9,6 +9,7 @@#define FS_9P_V9FS_H #include <linux/backing-dev.h> +#include <linux/netfs.h> /** * enum p9_session_flags - option flags for each 9P session @@ -108,14 +109,15 @@ struct v9fs_session_info {#define V9FS_INO_INVALID_ATTR 0x01struct v9fs_inode { -#ifdef CONFIG_9P_FSCACHE -struct fscache_cookie *fscache; -#endif +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct p9_qid qid;unsigned int cache_validity;struct p9_fid *writeback_fid;struct mutex v_mutex; -struct inode vfs_inode; };static inline struct v9fs_inode *V9FS_I (const struct inode *inode)@@ -126,7 +128,7 @@ static inline struct v9fs_inode *V9FS_I(const struct inode *inode)static inline struct fscache_cookie *v9fs_inode_cookie (struct v9fs_inode *v9inode) {#ifdef CONFIG_9P_FSCACHE -return v9inode->fscache; +return netfs_i_cookie (&v9inode->vfs_inode);#else return NULL ;#endif @@ -163,6 +165,7 @@ extern struct inode *v9fs_inode_from_fid(struct v9fs_session_info *v9ses,extern const struct inode_operations v9fs_dir_inode_operations_dotl;extern const struct inode_operations v9fs_file_inode_operations_dotl;extern const struct inode_operations v9fs_symlink_inode_operations_dotl; +extern const struct netfs_request_ops v9fs_req_ops;extern struct inode *v9fs_inode_from_fid_dotl (struct v9fs_session_info *v9ses,struct p9_fid *fid,struct super_block *sb,int new);fs/9p/vfs_addr.c +4
-39@@ -77,17 +77,6 @@ static void v9fs_req_cleanup(struct address_space *mapping, void *priv)p9_client_clunk (fid); } -/** -* v9fs_is_cache_enabled - Determine if caching is enabled for an inode -* @inode: The inode to check -*/ -static bool v9fs_is_cache_enabled (struct inode *inode) -{ -struct fscache_cookie *cookie =v9fs_inode_cookie (V9FS_I (inode)); - -return fscache_cookie_enabled (cookie) && cookie->cache_priv; -} -/** * v9fs_begin_cache_operation - Begin a cache operation for a read * @rreq: The read request @@ -103,36 +92,13 @@ static int v9fs_begin_cache_operation(struct netfs_io_request *rreq)#endif } -static const struct netfs_request_ops v9fs_req_ops = { +const struct netfs_request_ops v9fs_req_ops = { .init_request = v9fs_init_request, - .is_cache_enabled = v9fs_is_cache_enabled, .begin_cache_operation = v9fs_begin_cache_operation, .issue_read = v9fs_issue_read, .cleanup = v9fs_req_cleanup, }; -/** -* v9fs_vfs_readpage - read an entire page in from 9P -* @file: file being read -* @page: structure to page -* -*/ -static int v9fs_vfs_readpage (struct file *file,struct page *page) -{ -struct folio *folio =page_folio (page); - -return netfs_readpage (file, folio, &v9fs_req_ops,NULL ); -} - -/** -* v9fs_vfs_readahead - read a set of pages from 9P -* @ractl: The readahead parameters -*/ -static void v9fs_vfs_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &v9fs_req_ops,NULL ); -} -/** * v9fs_release_page - release the private state associated with a page * @page: The page to be released @@ -326,8 +292,7 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping,* 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 (filp, mapping, pos, len, flags, &folio, fsdata, - &v9fs_req_ops,NULL ); + retval =netfs_write_begin (filp, mapping, pos, len, flags, &folio, fsdata);if (retval <0 )return retval;@@ -388,8 +353,8 @@ static int v9fs_set_page_dirty(struct page *page)#endif const struct address_space_operations v9fs_addr_operations = { - .readpage = v9fs_vfs_readpage, - .readahead = v9fs_vfs_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .set_page_dirty = v9fs_set_page_dirty, .writepage = v9fs_vfs_writepage, .write_begin = v9fs_write_begin,fs/9p/vfs_inode.c +10
-3@@ -231,9 +231,6 @@ struct inode *v9fs_alloc_inode(struct super_block *sb) v9inode =kmem_cache_alloc (v9fs_inode_cache,GFP_KERNEL );if (!v9inode)return NULL ; -#ifdef CONFIG_9P_FSCACHE - v9inode->fscache =NULL ; -#endif v9inode->writeback_fid =NULL ; v9inode->cache_validity =0 ;mutex_init (&v9inode->v_mutex);@@ -250,6 +247,14 @@ void v9fs_free_inode(struct inode *inode)kmem_cache_free (v9fs_inode_cache,V9FS_I (inode)); } +/* +* Set parameters for the netfs library +*/ +static void v9fs_set_netfs_context (struct inode *inode) +{ +netfs_i_context_init (inode, &v9fs_req_ops); +} +int v9fs_init_inode (struct v9fs_session_info *v9ses,struct inode *inode,umode_t mode,dev_t rdev) {@@ -338,6 +343,8 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses, err = -EINVAL ; goto error; } + +v9fs_set_netfs_context (inode); error:return err;fs/afs/dynroot.c +1
-0@@ -76,6 +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_i_context_init (inode,NULL ); inode->i_size =0 ; inode->i_mode =S_IFDIR |S_IRUGO |S_IXUGO ;if (root) {fs/afs/file.c +2
-24@@ -19,13 +19,11 @@#include "internal.h" static int afs_file_mmap (struct file *file,struct vm_area_struct *vma); -static int afs_readpage (struct file *file,struct page *page);static int afs_symlink_readpage (struct file *file,struct page *page);static void afs_invalidatepage (struct page *page,unsigned int offset,unsigned int length);static int afs_releasepage (struct page *page,gfp_t gfp_flags); -static void afs_readahead (struct readahead_control *ractl);static ssize_t afs_file_read_iter (struct kiocb *iocb,struct iov_iter *iter);static void afs_vm_open (struct vm_area_struct *area);static void afs_vm_close (struct vm_area_struct *area);@@ -52,8 +50,8 @@ const struct inode_operations afs_file_inode_operations = { };const struct address_space_operations afs_file_aops = { - .readpage = afs_readpage, - .readahead = afs_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .set_page_dirty = afs_set_page_dirty, .launder_page = afs_launder_page, .releasepage = afs_releasepage,@@ -365,13 +363,6 @@ static int afs_init_request(struct netfs_io_request *rreq, struct file *file)return 0 ; } -static bool afs_is_cache_enabled (struct inode *inode) -{ -struct fscache_cookie *cookie =afs_vnode_cache (AFS_FS_I (inode)); - -return fscache_cookie_enabled (cookie) && cookie->cache_priv; -} -static int afs_begin_cache_operation (struct netfs_io_request *rreq) {#ifdef CONFIG_AFS_FSCACHE @@ -399,25 +390,12 @@ static void afs_priv_cleanup(struct address_space *mapping, void *netfs_priv)const struct netfs_request_ops afs_req_ops = { .init_request = afs_init_request, - .is_cache_enabled = afs_is_cache_enabled, .begin_cache_operation = afs_begin_cache_operation, .check_write_begin = afs_check_write_begin, .issue_read = afs_issue_read, .cleanup = afs_priv_cleanup, }; -static int afs_readpage (struct file *file,struct page *page) -{ -struct folio *folio =page_folio (page); - -return netfs_readpage (file, folio, &afs_req_ops,NULL ); -} - -static void afs_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &afs_req_ops,NULL ); -} -int afs_write_inode (struct inode *inode,struct writeback_control *wbc) {fscache_unpin_writeback (wbc,afs_vnode_cache (AFS_FS_I (inode)));fs/afs/inode.c +20
-11@@ -53,6 +53,14 @@ static noinline void dump_vnode(struct afs_vnode *vnode, struct afs_vnode *parendump_stack (); } +/* +* Set parameters for the netfs library +*/ +static void afs_set_netfs_context (struct afs_vnode *vnode) +{ +netfs_i_context_init (&vnode->vfs_inode, &afs_req_ops); +} +/* * Initialise an inode from the vnode status. */ @@ -128,6 +136,7 @@ static int afs_inode_init_from_status(struct afs_operation *op, }afs_set_i_size (vnode, status->size); +afs_set_netfs_context (vnode); vnode->invalid_before = status->data_version;inode_set_iversion_raw (&vnode->vfs_inode, status->data_version);@@ -420,7 +429,7 @@ static void afs_get_inode_cache(struct afs_vnode *vnode)struct afs_vnode_cache_aux aux;if (vnode->status.type !=AFS_FTYPE_FILE ) { - vnode->cache =NULL ; + vnode->netfs_ctx.cache =NULL ;return ; }@@ -430,12 +439,14 @@ static void afs_get_inode_cache(struct afs_vnode *vnode) key.vnode_id_ext[1 ] =htonl (vnode->fid.vnode_hi);afs_set_cache_aux (vnode, &aux); - vnode->cache =fscache_acquire_cookie ( - vnode->volume->cache, - vnode->status.type ==AFS_FTYPE_FILE ?0 :FSCACHE_ADV_SINGLE_CHUNK , - &key,sizeof (key), - &aux,sizeof (aux), - vnode->status.size); +afs_vnode_set_cache (vnode, +fscache_acquire_cookie ( + vnode->volume->cache, + vnode->status.type ==AFS_FTYPE_FILE ? +0 :FSCACHE_ADV_SINGLE_CHUNK , + &key,sizeof (key), + &aux,sizeof (aux), + vnode->status.size));#endif }@@ -528,6 +539,7 @@ struct inode *afs_root_iget(struct super_block *sb, struct key *key) vnode =AFS_FS_I (inode); vnode->cb_v_break = as->volume->cb_v_break, +afs_set_netfs_context (vnode); op =afs_alloc_operation (key, as->volume);if (IS_ERR (op)) {@@ -786,11 +798,8 @@ void afs_evict_inode(struct inode *inode)afs_put_wb_key (wbk); } -#ifdef CONFIG_AFS_FSCACHE -fscache_relinquish_cookie (vnode->cache, +fscache_relinquish_cookie (afs_vnode_cache (vnode),test_bit (AFS_VNODE_DELETED , &vnode->flags)); - vnode->cache =NULL ; -#endif afs_prune_wb_keys (vnode);afs_put_permits (rcu_access_pointer (vnode->permit_cache));fs/afs/internal.h +14
-5@@ -619,15 +619,16 @@ enum afs_lock_state {* leak from one inode to another. */ struct afs_vnode { -struct inode vfs_inode;/* the VFS's inode record */ +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct afs_volume *volume;/* volume on which vnode resides */ struct afs_fid fid;/* the file identifier for this inode */ struct afs_file_status status;/* AFS status info for this file */ afs_dataversion_t invalid_before;/* Child dentries are invalid before this */ -#ifdef CONFIG_AFS_FSCACHE -struct fscache_cookie *cache;/* caching cookie */ -#endif struct afs_permits __rcu *permit_cache;/* cache of permits so far obtained */ struct mutex io_lock;/* Lock for serialising I/O on this mutex */ struct rw_semaphore validate_lock;/* lock for validating this vnode */ @@ -674,12 +675,20 @@ struct afs_vnode {static inline struct fscache_cookie *afs_vnode_cache (struct afs_vnode *vnode) {#ifdef CONFIG_AFS_FSCACHE -return vnode->cache; +return netfs_i_cookie (&vnode->vfs_inode);#else return NULL ;#endif } +static inline void afs_vnode_set_cache (struct afs_vnode *vnode, +struct fscache_cookie *cookie) +{ +#ifdef CONFIG_AFS_FSCACHE + vnode->netfs_ctx.cache = cookie; +#endif +} +/* * cached security record for one user's attempt to access a vnode */ fs/afs/super.c +1
-3@@ -688,13 +688,11 @@ static struct inode *afs_alloc_inode(struct super_block *sb)/* Reset anything that shouldn't leak from one inode to the next. */ memset (&vnode->fid,0 ,sizeof (vnode->fid));memset (&vnode->status,0 ,sizeof (vnode->status)); +afs_vnode_set_cache (vnode,NULL ); vnode->volume =NULL ; vnode->lock_key =NULL ; vnode->permit_cache =NULL ; -#ifdef CONFIG_AFS_FSCACHE - vnode->cache =NULL ; -#endif vnode->flags =1 <<AFS_VNODE_UNSET ; vnode->lock_state =AFS_VNODE_LOCK_NONE ;fs/afs/write.c +1
-2@@ -59,8 +59,7 @@ int afs_write_begin(struct file *file, struct address_space *mapping,* 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. */ - ret =netfs_write_begin (file, mapping, pos, len, flags, &folio, fsdata, - &afs_req_ops,NULL ); + ret =netfs_write_begin (file, mapping, pos, len, flags, &folio, fsdata);if (ret <0 )return ret;fs/ceph/addr.c +4
-27@@ -403,7 +403,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)ceph_put_cap_refs (ci, got); } -static const struct netfs_request_ops ceph_netfs_read_ops = { +const struct netfs_request_ops ceph_netfs_ops = { .init_request = ceph_init_request, .begin_cache_operation = ceph_begin_cache_operation, .issue_read = ceph_netfs_issue_read,@@ -413,28 +413,6 @@ static const struct netfs_request_ops ceph_netfs_read_ops = { .cleanup = ceph_readahead_cleanup, }; -/* read a single page, without unlocking it. */ -static int ceph_readpage (struct file *file,struct page *subpage) -{ -struct folio *folio =page_folio (subpage); -struct inode *inode =file_inode (file); -struct ceph_inode_info *ci =ceph_inode (inode); -struct ceph_vino vino =ceph_vino (inode); -size_t len =folio_size (folio); -u64 off =folio_file_pos (folio); - -dout ("readpage ino %llx.%llx file %p off %llu len %zu folio %p index %lu\n inline %d" , - vino.ino, vino.snap, file, off, len, folio,folio_index (folio), - ci->i_inline_version !=CEPH_INLINE_NONE ); - -return netfs_readpage (file, folio, &ceph_netfs_read_ops,NULL ); -} - -static void ceph_readahead (struct readahead_control *ractl) -{ -netfs_readahead (ractl, &ceph_netfs_read_ops,NULL ); -} -#ifdef CONFIG_CEPH_FSCACHE static void ceph_set_page_fscache (struct page *page) {@@ -1333,8 +1311,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,struct folio *folio =NULL ;int r; - r =netfs_write_begin (file, inode->i_mapping, pos, len,0 , &folio,NULL , - &ceph_netfs_read_ops,NULL ); + r =netfs_write_begin (file, inode->i_mapping, pos, len,0 , &folio,NULL );if (r ==0 )folio_wait_fscache (folio);if (r <0 ) {@@ -1388,8 +1365,8 @@ static int ceph_write_end(struct file *file, struct address_space *mapping, }const struct address_space_operations ceph_aops = { - .readpage = ceph_readpage, - .readahead = ceph_readahead, + .readpage = netfs_readpage, + .readahead = netfs_readahead, .writepage = ceph_writepage, .writepages = ceph_writepages_start, .write_begin = ceph_write_begin,fs/ceph/cache.c +14
-14@@ -29,26 +29,25 @@ void ceph_fscache_register_inode_cookie(struct inode *inode)if (!(inode->i_state &I_NEW ))return ; -WARN_ON_ONCE (ci->fscache); +WARN_ON_ONCE (ci->netfs_ctx.cache); - ci->fscache =fscache_acquire_cookie (fsc->fscache,0 , - &ci->i_vino,sizeof (ci->i_vino), - &ci->i_version,sizeof (ci->i_version), -i_size_read (inode)); + ci->netfs_ctx.cache = +fscache_acquire_cookie (fsc->fscache,0 , + &ci->i_vino,sizeof (ci->i_vino), + &ci->i_version,sizeof (ci->i_version), +i_size_read (inode)); } -void ceph_fscache_unregister_inode_cookie (struct ceph_inode_info * ci) +void ceph_fscache_unregister_inode_cookie (struct ceph_inode_info *ci) { -struct fscache_cookie *cookie = ci->fscache; - -fscache_relinquish_cookie (cookie, false); +fscache_relinquish_cookie (ceph_fscache_cookie (ci), false); }void ceph_fscache_use_cookie (struct inode *inode,bool will_modify) {struct ceph_inode_info *ci =ceph_inode (inode); -fscache_use_cookie (ci->fscache, will_modify); +fscache_use_cookie (ceph_fscache_cookie (ci), will_modify); }void ceph_fscache_unuse_cookie (struct inode *inode,bool update)@@ -58,9 +57,10 @@ void ceph_fscache_unuse_cookie(struct inode *inode, bool update)if (update) {loff_t i_size =i_size_read (inode); -fscache_unuse_cookie (ci->fscache, &ci->i_version, &i_size); +fscache_unuse_cookie (ceph_fscache_cookie (ci), + &ci->i_version, &i_size); }else { -fscache_unuse_cookie (ci->fscache,NULL ,NULL ); +fscache_unuse_cookie (ceph_fscache_cookie (ci),NULL ,NULL ); } }@@ -69,14 +69,14 @@ void ceph_fscache_update(struct inode *inode)struct ceph_inode_info *ci =ceph_inode (inode);loff_t i_size =i_size_read (inode); -fscache_update_cookie (ci->fscache, &ci->i_version, &i_size); +fscache_update_cookie (ceph_fscache_cookie (ci), &ci->i_version, &i_size); }void ceph_fscache_invalidate (struct inode *inode,bool dio_write) {struct ceph_inode_info *ci =ceph_inode (inode); -fscache_invalidate (ceph_inode (inode)->fscache, +fscache_invalidate (ceph_fscache_cookie (ci), &ci->i_version,i_size_read (inode), dio_write ?FSCACHE_INVAL_DIO_WRITE :0 ); }fs/ceph/cache.h +1
-10@@ -26,14 +26,9 @@ void ceph_fscache_unuse_cookie(struct inode *inode, bool update);void ceph_fscache_update (struct inode *inode);void ceph_fscache_invalidate (struct inode *inode,bool dio_write); -static inline void ceph_fscache_inode_init (struct ceph_inode_info *ci) -{ - ci->fscache =NULL ; -} -static inline struct fscache_cookie *ceph_fscache_cookie (struct ceph_inode_info *ci) { -return ci->fscache; +return netfs_i_cookie (&ci->vfs_inode); }static inline void ceph_fscache_resize (struct inode *inode,loff_t to)@@ -91,10 +86,6 @@ static inline void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc) { } -static inline void ceph_fscache_inode_init (struct ceph_inode_info *ci) -{ -} -static inline void ceph_fscache_register_inode_cookie (struct inode *inode) { }fs/ceph/inode.c +3
-3@@ -453,6 +453,9 @@ struct inode *ceph_alloc_inode(struct super_block *sb)dout ("alloc_inode %p\n" , &ci->vfs_inode); +/* Set parameters for the netfs library */ +netfs_i_context_init (&ci->vfs_inode, &ceph_netfs_ops); +spin_lock_init (&ci->i_ceph_lock); ci->i_version =0 ;@@ -538,9 +541,6 @@ struct inode *ceph_alloc_inode(struct super_block *sb)INIT_WORK (&ci->i_work, ceph_inode_work); ci->i_work_mask =0 ;memset (&ci->i_btime,'\0' ,sizeof (ci->i_btime)); - -ceph_fscache_inode_init (ci); -return &ci->vfs_inode; }fs/ceph/super.h +8
-9@@ -17,13 +17,11 @@#include <linux/posix_acl.h> #include <linux/refcount.h> #include <linux/security.h> +#include <linux/netfs.h> +#include <linux/fscache.h> #include <linux/ceph/libceph.h> -#ifdef CONFIG_CEPH_FSCACHE -#include <linux/fscache.h> -#endif -/* large granularity for statfs utilization stats to facilitate * large volume sizes on 32-bit machines. */ #define CEPH_BLOCK_SHIFT 22/* 4 MB */ @@ -317,6 +315,11 @@ struct ceph_inode_xattrs_info {* Ceph inode. */ struct ceph_inode_info { +struct { +/* These must be contiguous */ +struct inode vfs_inode; +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };struct ceph_vino i_vino;/* ceph ino + snap */ spinlock_t i_ceph_lock;@@ -427,11 +430,6 @@ struct ceph_inode_info {struct work_struct i_work;unsigned long i_work_mask; - -#ifdef CONFIG_CEPH_FSCACHE -struct fscache_cookie *fscache; -#endif -struct inode vfs_inode;/* at end */ }; static inline struct ceph_inode_info *@@ -1215,6 +1213,7 @@ extern void __ceph_touch_fmode(struct ceph_inode_info *ci,/* addr.c */ extern const struct address_space_operations ceph_aops; +extern const struct netfs_request_ops ceph_netfs_ops;extern int ceph_mmap (struct file *file,struct vm_area_struct *vma);extern int ceph_uninline_data (struct file *file);extern int ceph_pool_perm_check (struct inode *inode,int need);fs/cifs/cifsglob.h +6
-4@@ -16,6 +16,7 @@#include <linux/mempool.h> #include <linux/workqueue.h> #include <linux/utsname.h> +#include <linux/netfs.h> #include "cifs_fs_sb.h" #include "cifsacl.h" #include <crypto/internal/hash.h> @@ -1402,6 +1403,11 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file);*/ struct cifsInodeInfo { +struct { +/* These must be contiguous */ +struct inode vfs_inode;/* the VFS's inode record */ +struct netfs_i_context netfs_ctx;/* Netfslib context */ + };bool can_cache_brlcks;struct list_head llist;/* locks helb by this inode */ /* @@ -1432,10 +1438,6 @@ struct cifsInodeInfo {u64 uniqueid;/* server inode number */ u64 createtime;/* creation time on server */ __u8 lease_key[SMB2_LEASE_KEY_SIZE ];/* lease key for this inode */ -#ifdef CONFIG_CIFS_FSCACHE -struct fscache_cookie *fscache; -#endif -struct inode vfs_inode;struct list_head deferred_closes;/* list of deferred closes */ spinlock_t deferred_lock;/* protection on deferred list */ bool lease_granted;/* Flag to indicate whether lease or oplock is granted. */ fs/cifs/fscache.c +6
-5@@ -103,7 +103,7 @@ void cifs_fscache_get_inode_cookie(struct inode *inode)cifs_fscache_fill_coherency (&cifsi->vfs_inode, &cd); - cifsi->fscache = + cifsi->netfs_ctx.cache = fscache_acquire_cookie(tcon->fscache, 0, &cifsi->uniqueid, sizeof(cifsi->uniqueid), &cd, sizeof(cd),@@ -126,11 +126,12 @@ void cifs_fscache_unuse_inode_cookie(struct inode *inode, bool update)void cifs_fscache_release_inode_cookie (struct inode *inode) {struct cifsInodeInfo *cifsi =CIFS_I (inode); +struct fscache_cookie *cookie =cifs_inode_cookie (inode); -if (cifsi->fscache) { -cifs_dbg (FYI ,"%s: (0x%p)\n" , __func__, cifsi->fscache); -fscache_relinquish_cookie (cifsi->fscache, false); - cifsi->fscache =NULL ; +if (cookie) { +cifs_dbg (FYI ,"%s: (0x%p)\n" , __func__, cookie); +fscache_relinquish_cookie (cookie, false); + cifsi->netfs_ctx.cache =NULL ; } }fs/cifs/fscache.h +1
-1@@ -61,7 +61,7 @@ void cifs_fscache_fill_coherency(struct inode *inode,static inline struct fscache_cookie *cifs_inode_cookie (struct inode *inode) { -return CIFS_I (inode)->fscache; +return netfs_i_cookie (inode); }static inline void cifs_invalidate_cache (struct inode *inode,unsigned int flags)fs/netfs/internal.h +1
-2@@ -6,6 +6,7 @@*/ #include <linux/netfs.h> +#include <linux/fscache.h> #include <trace/events/netfs.h> #ifdef pr_fmt@@ -19,8 +20,6 @@*/ struct netfs_io_request *netfs_alloc_request (struct address_space *mapping,struct file *file, -const struct netfs_request_ops *ops, -void *netfs_priv,loff_t start,size_t len,enum netfs_io_origin origin);void netfs_get_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what);@@ -81,6 +80,21 @@ static inline void netfs_stat_d(atomic_t *stat)#define netfs_stat_d (x) do {} while(0)#endif
fs/netfs/internal.h static inline void netfs_stat_d(atomic_t *stat) · line 92
Quoted 10 lines
fs/netfs/internal.h +10
-0+/* +* Miscellaneous functions. +*/ +static inline bool netfs_is_cache_enabled (struct netfs_i_context *ctx) +{ +#if IS_ENABLED (CONFIG_FSCACHE ) +struct fscache_cookie *cookie = ctx->cache; + +return fscache_cookie_valid (cookie) && cookie->cache_priv && +fscache_cookie_enabled (cookie);
As you mentioned in the other thread, it may be cleaner to move the cookie->cache_priv check into fscache_cookie_enabled. Is there ever a case where you'd need to separate the two checks?
Quoted 442 lines
fs/netfs/internal.h +5
-0+#else +return false; +#endif +} +/*****************************************************************************/ /* * debug tracing fs/netfs/objects.c +6
-6@@ -13,12 +13,12 @@*/ struct netfs_io_request *netfs_alloc_request (struct address_space *mapping,struct file *file, -const struct netfs_request_ops *ops, -void *netfs_priv,loff_t start,size_t len,enum netfs_io_origin origin) {static atomic_t debug_ids; +struct inode *inode = file ?file_inode (file) : mapping->host; +struct netfs_i_context *ctx =netfs_i_context (inode);struct netfs_io_request *rreq;int ret;@@ -29,11 +29,10 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, rreq->start = start; rreq->len = len; rreq->origin = origin; - rreq->netfs_ops = ops; - rreq->netfs_priv = netfs_priv; + rreq->netfs_ops = ctx->ops; rreq->mapping = mapping; - rreq->inode =file_inode (file); - rreq->i_size =i_size_read (rreq->inode); + rreq->inode = inode; + rreq->i_size =i_size_read (inode); rreq->debug_id =atomic_inc_return (&debug_ids);INIT_LIST_HEAD (&rreq->subrequests);INIT_WORK (&rreq->work, netfs_rreq_work);@@ -76,6 +75,7 @@ static void netfs_free_request(struct work_struct *work) {struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work); +netfs_clear_subrequests (rreq, false);if (rreq->netfs_priv) rreq->netfs_ops->cleanup (rreq->mapping, rreq->netfs_priv);fs/netfs/read_helper.c +45
-55@@ -14,7 +14,6 @@#include <linux/uio.h> #include <linux/sched/mm.h> #include <linux/task_io_accounting_ops.h> -#include <linux/netfs.h> #include "internal.h" #define CREATE_TRACE_POINTS #include <trace/events/netfs.h> @@ -735,8 +734,6 @@ static void netfs_rreq_expand(struct netfs_io_request *rreq,/** * netfs_readahead - Helper to manage a read request * @ractl: The description of the readahead request -* @ops: The network filesystem's operations for the helper to use -* @netfs_priv: Private netfs data to be retained in the request * * Fulfil a readahead request by drawing data from the cache if possible, or * the netfs if not. Space beyond the EOF is zero-filled. Multiple I/O @@ -744,35 +741,32 @@ static void netfs_rreq_expand(struct netfs_io_request *rreq,* readahead window can be expanded in either direction to a more convenient * alighment for RPC efficiency or to make storage in the cache feasible. * -* The calling netfs must provide a table of operations, only one of which, -* issue_op, is mandatory. It may also be passed a private token, which will -* be retained in rreq->netfs_priv and will be cleaned up by ops->cleanup(). +* The calling netfs must initialise a netfs context contiguous to the vfs +* inode before calling this. * * This is usable whether or not caching is enabled. */ -void netfs_readahead (struct readahead_control *ractl, -const struct netfs_request_ops *ops, -void *netfs_priv) +void netfs_readahead (struct readahead_control *ractl) {struct netfs_io_request *rreq; +struct netfs_i_context *ctx =netfs_i_context (ractl->mapping->host);unsigned int debug_index =0 ;int ret;_enter ("%lx,%x" ,readahead_index (ractl),readahead_count (ractl));if (readahead_count (ractl) ==0 ) - goto cleanup; +return ; rreq =netfs_alloc_request (ractl->mapping, ractl->file, - ops, netfs_priv,readahead_pos (ractl),readahead_length (ractl),NETFS_READAHEAD );if (IS_ERR (rreq)) - goto cleanup; +return ; -if (ops->begin_cache_operation) { - ret = ops->begin_cache_operation (rreq); +if (ctx->ops->begin_cache_operation) { + ret = ctx->ops->begin_cache_operation (rreq);if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) goto cleanup_free; }@@ -804,42 +798,35 @@ void netfs_readahead(struct readahead_control *ractl, cleanup_free:netfs_put_request (rreq, false, netfs_rreq_trace_put_failed);return ; -cleanup: -if (netfs_priv) - ops->cleanup (ractl->mapping, netfs_priv); -return ; }EXPORT_SYMBOL (netfs_readahead);/** * netfs_readpage - Helper to manage a readpage request * @file: The file to read from -* @folio: The folio to read -* @ops: The network filesystem's operations for the helper to use -* @netfs_priv: Private netfs data to be retained in the request +* @subpage: A subpage of the folio to read * * Fulfil a readpage request by drawing data from the cache if possible, or the * netfs if not. Space beyond the EOF is zero-filled. Multiple I/O requests * from different sources will get munged together. * -* The calling netfs must provide a table of operations, only one of which, -* issue_op, is mandatory. It may also be passed a private token, which will -* be retained in rreq->netfs_priv and will be cleaned up by ops->cleanup(). +* The calling netfs must initialise a netfs context contiguous to the vfs +* inode before calling this. * * This is usable whether or not caching is enabled. */ -int netfs_readpage (struct file *file, -struct folio *folio, -const struct netfs_request_ops *ops, -void *netfs_priv) +int netfs_readpage (struct file *file,struct page *subpage) { +struct folio *folio =page_folio (subpage); +struct address_space *mapping = folio->mapping;struct netfs_io_request *rreq; +struct netfs_i_context *ctx =netfs_i_context (mapping->host);unsigned int debug_index =0 ;int ret;_enter ("%lx" ,folio_index (folio)); - rreq =netfs_alloc_request (folio->mapping, file, ops, netfs_priv, + rreq =netfs_alloc_request (mapping, file,folio_file_pos (folio),folio_size (folio),NETFS_READPAGE );if (IS_ERR (rreq)) {@@ -847,8 +834,8 @@ int netfs_readpage(struct file *file, goto alloc_error; } -if (ops->begin_cache_operation) { - ret = ops->begin_cache_operation (rreq); +if (ctx->ops->begin_cache_operation) { + ret = ctx->ops->begin_cache_operation (rreq);if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) {folio_unlock (folio); goto out;@@ -886,8 +873,6 @@ int netfs_readpage(struct file *file,netfs_put_request (rreq, false, netfs_rreq_trace_put_hold);return ret; alloc_error: -if (netfs_priv) - ops->cleanup (folio_file_mapping (folio), netfs_priv);folio_unlock (folio);return ret; }@@ -898,6 +883,7 @@ EXPORT_SYMBOL(netfs_readpage);* @folio: The folio being prepared * @pos: starting position for the write * @len: length of write +* @always_fill: T if the folio should always be completely filled/cleared * * In some cases, write_begin doesn't need to read at all: * - full folio write @@ -907,17 +893,27 @@ EXPORT_SYMBOL(netfs_readpage);* If any of these criteria are met, then zero out the unwritten parts * of the folio and return true. Otherwise, return false. */ -static bool netfs_skip_folio_read (struct folio *folio,loff_t pos,size_t len) +static bool netfs_skip_folio_read (struct folio *folio,loff_t pos,size_t len, +bool always_fill) {struct inode *inode =folio_inode (folio);loff_t i_size =i_size_read (inode);size_t offset =offset_in_folio (folio, pos); +size_t plen =folio_size (folio); + +if (unlikely (always_fill)) { +if (pos - offset + len <= i_size) +return false;/* Page entirely before EOF */ +zero_user_segment (&folio->page,0 , plen); +folio_mark_uptodate (folio); +return true; + }/* Full folio write */ -if (offset ==0 && len >=folio_size (folio)) +if (offset ==0 && len >= plen)return true; -/* pos beyond last folio in the file */ +/* Page entirely beyond the end of the file */ if (pos - offset >= i_size) goto zero_out;@@ -927,7 +923,7 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len)return false; zero_out: -zero_user_segments (&folio->page,0 , offset, offset + len,folio_size (folio)); +zero_user_segments (&folio->page,0 , offset, offset + len, plen);return true; }@@ -940,8 +936,6 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len)* @aop_flags: AOP_* flags * @_folio: Where to put the resultant folio * @_fsdata: Place for the netfs to store a cookie -* @ops: The network filesystem's operations for the helper to use -* @netfs_priv: Private netfs data to be retained in the request * * Pre-read data for a write-begin request by drawing data from the cache if * possible, or the netfs if not. Space beyond the EOF is zero-filled. @@ -960,17 +954,18 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len)* should go ahead; unlock the folio and return -EAGAIN to cause the folio to * be regot; or return an error. * +* The calling netfs must initialise a netfs context contiguous to the vfs +* inode before calling this. +* * This is usable whether or not caching is enabled. */ int netfs_write_begin (struct file *file,struct address_space *mapping,loff_t pos,unsigned int len,unsigned int aop_flags, -struct folio **_folio,void **_fsdata, -const struct netfs_request_ops *ops, -void *netfs_priv) +struct folio **_folio,void **_fsdata) {struct netfs_io_request *rreq; +struct netfs_i_context *ctx =netfs_i_context (file_inode (file ));struct folio *folio; -struct inode *inode =file_inode (file);unsigned int debug_index =0 , fgp_flags;pgoff_t index = pos >>PAGE_SHIFT ;int ret;@@ -986,9 +981,9 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,if (!folio)return -ENOMEM ; -if (ops->check_write_begin) { +if (ctx->ops->check_write_begin) {/* Allow the netfs (eg. ceph) to flush conflicts. */ - ret = ops->check_write_begin (file, pos, len, folio, _fsdata); + ret = ctx->ops->check_write_begin (file, pos, len, folio, _fsdata);if (ret <0 ) {trace_netfs_failure (NULL ,NULL , ret, netfs_fail_check_write_begin);if (ret == -EAGAIN )@@ -1004,13 +999,13 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,* within the cache granule containing the EOF, in which case we need * to preload the granule. */ -if (!ops->is_cache_enabled (inode) && -netfs_skip_folio_read (folio, pos, len)) { +if (!netfs_is_cache_enabled (ctx) && +netfs_skip_folio_read (folio, pos, len, false)) {netfs_stat (&netfs_n_rh_write_zskip); goto have_folio_no_wait; } - rreq =netfs_alloc_request (mapping, file, ops, netfs_priv, + rreq =netfs_alloc_request (mapping, file,folio_file_pos (folio),folio_size (folio),NETFS_READ_FOR_WRITE );if (IS_ERR (rreq)) {@@ -1019,10 +1014,9 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, } rreq->no_unlock_folio =folio_index (folio);__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); - netfs_priv =NULL ; -if (ops->begin_cache_operation) { - ret = ops->begin_cache_operation (rreq); +if (ctx->ops->begin_cache_operation) { + ret = ctx->ops->begin_cache_operation (rreq);if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) goto error_put; }@@ -1076,8 +1070,6 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,if (ret <0 ) goto error; have_folio_no_wait: -if (netfs_priv) - ops->cleanup (mapping, netfs_priv); *_folio = folio;_leave (" = 0" );return 0 ;@@ -1087,8 +1079,6 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, error:folio_unlock (folio);folio_put (folio); -if (netfs_priv) - ops->cleanup (mapping, netfs_priv);_leave (" = %d" , ret);return ret; }fs/netfs/stats.c +0
-1@@ -7,7 +7,6 @@#include <linux/export.h> #include <linux/seq_file.h> -#include <linux/netfs.h> #include "internal.h" atomic_t netfs_n_rh_readahead;include/linux/netfs.h +61
-11@@ -118,6 +118,16 @@ enum netfs_io_source {typedef void (*netfs_io_terminated_t )(void *priv,ssize_t transferred_or_error,bool was_async); +/* +* Per-inode description. This must be directly after the inode struct. +*/ +struct netfs_i_context { +const struct netfs_request_ops *ops; +#if IS_ENABLED (CONFIG_FSCACHE ) +struct fscache_cookie *cache; +#endif +}; +/* * Resources required to do operations on a cache. */ @@ -192,7 +202,6 @@ struct netfs_io_request {* Operations the network filesystem can/must provide to the helpers. */ struct netfs_request_ops { -bool (*is_cache_enabled)(struct inode *inode);int (*init_request)(struct netfs_io_request *rreq,struct file *file);int (*begin_cache_operation)(struct netfs_io_request *rreq);void (*expand_readahead)(struct netfs_io_request *rreq);@@ -263,18 +272,11 @@ struct netfs_cache_ops { };struct readahead_control ; -extern void netfs_readahead (struct readahead_control *, -const struct netfs_request_ops *, -void *); -extern int netfs_readpage (struct file *, -struct folio *, -const struct netfs_request_ops *, -void *); +extern void netfs_readahead (struct readahead_control *); +extern int netfs_readpage (struct file *,struct page *);extern int netfs_write_begin (struct file *,struct address_space *,loff_t ,unsigned int ,unsigned int ,struct folio **, -void **, -const struct netfs_request_ops *, -void *); +void **);extern void netfs_subreq_terminated (struct netfs_io_subrequest *,ssize_t ,bool ); extern void netfs_get_subrequest(struct netfs_io_subrequest *subreq,@@ -283,4 +285,61 @@ extern void netfs_put_subrequest(struct netfs_io_subrequest *subreq, bool was_async, enum netfs_sreq_ref_trace what);extern void netfs_stats_show (struct seq_file *); +/** +* netfs_i_context - Get the netfs inode context from the inode +* @inode: The inode to query +* +* Get the netfs lib inode context from the network filesystem's inode. The +* context struct is expected to directly follow on from the VFS inode struct. +*/ +static inline struct netfs_i_context *netfs_i_context (struct inode *inode) +{ +return (struct netfs_i_context *)(inode +1 ); +} + +/** +* netfs_inode - Get the netfs inode from the inode context +* @ctx: The context to query +* +* Get the netfs inode from the netfs library's inode context. The VFS inode +* is expected to directly precede the context struct. +*/ +static inline struct inode *netfs_inode (struct netfs_i_context *ctx) +{ +return ((struct inode *)ctx) -1 ; +} + +/** +* netfs_i_context_init - Initialise a netfs lib context +* @inode: The inode with which the context is associated +* @ops: The netfs's operations list +* +* Initialise the netfs library context struct. This is expected to follow on +* directly from the VFS inode struct. +*/ +static inline void netfs_i_context_init (struct inode *inode, +const struct netfs_request_ops *ops) +{ +struct netfs_i_context *ctx =netfs_i_context (inode); + +memset (ctx,0 ,sizeof (*ctx)); + ctx->ops = ops; +} + +/** +* netfs_i_cookie - Get the cache cookie from the inode +* @inode: The inode to query +* +* Get the caching cookie (if enabled) from the network filesystem's inode. +*/ +static inline struct fscache_cookie *netfs_i_cookie (struct inode *inode)
include/linux/netfs.h extern void netfs_put_subrequest(struct netfs_io_subrequest *subreq, · line 345
Quoted 10 lines
include/linux/netfs.h +9
-0+{ +#if IS_ENABLED (CONFIG_FSCACHE ) +struct netfs_i_context *ctx =netfs_i_context (inode); +return ctx->cache; +#else +return NULL ; +#endif +} +#endif /* _LINUX_NETFS_H */
The fscache_cookie_enabled question can be settled later...
David Howells
maintainerRe: [PATCH v4 13/20] netfs: Add a netfs inode context
Quoted 4 lines · Jeff Layton
Quoted 4 lines
fs/netfs/internal.h +4
-0+static inline bool netfs_is_cache_enabled (struct netfs_i_context *ctx) +{ +#if IS_ENABLED (CONFIG_FSCACHE ) +struct fscache_cookie *cookie = ctx->cache;
Quoted 8 lines
fs/netfs/internal.h static inline void netfs_stat_d(atomic_t *stat) · line 92
Quoted 3 lines
fs/netfs/internal.h +3
-0+ +return fscache_cookie_valid (cookie) && cookie->cache_priv && +fscache_cookie_enabled (cookie);As you mentioned in the other thread, it may be cleaner to move the
cookie->cache_privcheck intofscache_cookie_enabled. Is there ever a case where you'd need to separate the two checks?
I'm not sure, but I'd prefer not to do it in this series as it would affect NFS plus some other operations, so will need retesting thoroughly. I'd prefer to defer it.
David
David Howells
maintainerPATCH v3 14/20 netfs: Add a function to consolidate beginning a read
In reply to David HowellsAdd a function to do the steps needed to begin a read request, allowing this code to be removed from several other functions and consolidated.
Changes
=======
ver #2)
- Move before the unstaticking patch so that some functions can be left static.
- Set uninitialised return code in netfs_begin_read()[1][2].
- Fixed a refleak caused by non-removal of a get from netfs_write_begin() when the request submission code got moved to netfs_begin_read().
- Use INIT_WORK() to (re-)init the request work_struct[3].
---
fs/netfs/internal.h | 2 - fs/netfs/objects.c | 1 fs/netfs/read_helper.c | 144 +++++++++++++++++++++--------------------- include/trace/events/netfs.h | 5 + 4 files changed, 76 insertions(+), 76 deletions(-)
fs/netfs/internal.h +1 -1
@@ -39,7 +39,7 @@ static inline void netfs_see_request(struct netfs_io_request *rreq,*/ extern unsigned int netfs_debug; -void netfs_rreq_work (struct work_struct *work); +int netfs_begin_read (struct netfs_io_request *rreq,bool sync);/* * stats.c
fs/netfs/objects.c +0 -1
@@ -35,7 +35,6 @@ 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, netfs_rreq_work);refcount_set (&rreq->ref,1 );__set_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags);if (rreq->netfs_ops->init_request) {
fs/netfs/read_helper.c +72 -72
209 lines not on this page · raw message
include/trace/events/netfs.h +3 -2
@@ -56,17 +56,18 @@ EM(netfs_fail_check_write_begin, "check-write-begin") \ EM(netfs_fail_copy_to_cache, "copy-to-cache") \ EM(netfs_fail_read, "read") \ - EM(netfs_fail_short_readpage, "short-readpage") \ - EM(netfs_fail_short_write_begin, "short-write-begin") \ + EM(netfs_fail_short_read, "short-read") \ 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_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_subreq, "PUT SUBREQ ") \ + EM(netfs_rreq_trace_put_zero_len, "PUT ZEROLEN") \ E_(netfs_rreq_trace_new, "NEW ")#define netfs_sreq_ref_traces \
Re: [PATCH v3 14/20] netfs: Add a function to consolidate beginning a read
Quoted 291 lines · David Howells
Add a function to do the steps needed to begin a read request, allowing this code to be removed from several other functions and consolidated.
Changes
=======
ver #2)
- Move before the unstaticking patch so that some functions can be left static.
- Set uninitialised return code in netfs_begin_read()[1][2].
- Fixed a refleak caused by non-removal of a get fromnetfs_write_begin()when the request submission code got moved tonetfs_begin_read().
- UseINIT_WORK()to (re-)init the request work_struct[3].Signed-off-by David Howells <[email protected]>---
fs/netfs/internal.h | 2 - fs/netfs/objects.c | 1 fs/netfs/read_helper.c | 144 +++++++++++++++++++++--------------------- include/trace/events/netfs.h | 5 + 4 files changed, 76 insertions(+), 76 deletions(-)fs/netfs/internal.h +1
-1@@ -39,7 +39,7 @@ static inline void netfs_see_request(struct netfs_io_request *rreq,*/ extern unsigned int netfs_debug; -void netfs_rreq_work (struct work_struct *work); +int netfs_begin_read (struct netfs_io_request *rreq,bool sync);/* * stats.c fs/netfs/objects.c +0
-1@@ -35,7 +35,6 @@ 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, netfs_rreq_work);refcount_set (&rreq->ref,1 );__set_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags);if (rreq->netfs_ops->init_request) {fs/netfs/read_helper.c +72
-72@@ -443,7 +443,7 @@ static void netfs_rreq_assess(struct netfs_io_request *rreq, bool was_async)netfs_rreq_completed (rreq, was_async); } -void netfs_rreq_work (struct work_struct *work) +static void netfs_rreq_work (struct work_struct *work) {struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work);@@ -688,6 +688,69 @@ static bool netfs_rreq_submit_slice(struct netfs_io_request *rreq,return false; } +/* +* Begin the process of reading in a chunk of data, where that data may be +* stitched together from multiple sources, including multiple servers and the +* local cache. +*/ +int netfs_begin_read (struct netfs_io_request *rreq,bool sync) +{ +unsigned int debug_index =0 ; +int ret; + +_enter ("R=%x %llx-%llx" , + rreq->debug_id, rreq->start, rreq->start + rreq->len -1 ); + +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 ; + } + +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. +*/ +atomic_set (&rreq->nr_outstanding,1 ); +do { +if (!netfs_rreq_submit_slice (rreq, &debug_index)) +break ; + + }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. +*/ +for (;;) { +wait_var_event (&rreq->nr_outstanding, +atomic_read (&rreq->nr_outstanding) ==1 ); +netfs_rreq_assess (rreq, false); +if (!test_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags)) +break ; +cond_resched (); + } + + 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)) +netfs_rreq_assess (rreq, false); + ret =0 ; + } +return ret; +} +static void netfs_cache_expand_readahead (struct netfs_io_request *rreq,loff_t *_start,size_t *_len,loff_t i_size) {@@ -750,7 +813,6 @@ void netfs_readahead(struct readahead_control *ractl) {struct netfs_io_request *rreq;struct netfs_i_context *ctx =netfs_i_context (ractl->mapping->host); -unsigned int debug_index =0 ;int ret;_enter ("%lx,%x" ,readahead_index (ractl),readahead_count (ractl));@@ -777,22 +839,13 @@ void netfs_readahead(struct readahead_control *ractl)netfs_rreq_expand (rreq, ractl); -atomic_set (&rreq->nr_outstanding,1 ); -do { -if (!netfs_rreq_submit_slice (rreq, &debug_index)) -break ; - - }while (rreq->submitted < 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(). */ while (readahead_folio (ractl)) ; -/* If we decrement nr_outstanding to 0, the ref belongs to us. */ -if (atomic_dec_and_test (&rreq->nr_outstanding)) -netfs_rreq_assess (rreq, false); +netfs_begin_read (rreq, false);return ; cleanup_free:@@ -821,7 +874,6 @@ int netfs_readpage(struct file *file, struct page *subpage)struct address_space *mapping = folio->mapping;struct netfs_io_request *rreq;struct netfs_i_context *ctx =netfs_i_context (mapping->host); -unsigned int debug_index =0 ;int ret;_enter ("%lx" ,folio_index (folio));@@ -836,42 +888,16 @@ int netfs_readpage(struct file *file, struct page *subpage)if (ctx->ops->begin_cache_operation) { ret = ctx->ops->begin_cache_operation (rreq); -if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS ) { -folio_unlock (folio); - goto out; - } +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); +return netfs_begin_read (rreq, true); -netfs_get_request (rreq, netfs_rreq_trace_get_hold); - -atomic_set (&rreq->nr_outstanding,1 ); -do { -if (!netfs_rreq_submit_slice (rreq, &debug_index)) -break ; - - }while (rreq->submitted < rreq->len); - -/* 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. -*/ -do { -wait_var_event (&rreq->nr_outstanding, -atomic_read (&rreq->nr_outstanding) ==1 ); -netfs_rreq_assess (rreq, false); - }while (test_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags)); - - ret = rreq->error; -if (ret ==0 && rreq->submitted < rreq->len) { -trace_netfs_failure (rreq,NULL , ret, netfs_fail_short_readpage); - ret = -EIO ; - } -out: -netfs_put_request (rreq, false, netfs_rreq_trace_put_hold); -return ret; +discard: +netfs_put_request (rreq, false, netfs_rreq_trace_put_discard); alloc_error:folio_unlock (folio);return ret;@@ -966,7 +992,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,struct netfs_io_request *rreq;struct netfs_i_context *ctx =netfs_i_context (file_inode (file ));struct folio *folio; -unsigned int debug_index =0 , fgp_flags; +unsigned int fgp_flags;pgoff_t index = pos >>PAGE_SHIFT ;int ret;@@ -1029,39 +1055,13 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,*/ ractl._nr_pages =folio_nr_pages (folio);netfs_rreq_expand (rreq, &ractl); -netfs_get_request (rreq, netfs_rreq_trace_get_hold);/* We hold the folio locks, so we can drop the references */ folio_get (folio);while (readahead_folio (&ractl)) ; -atomic_set (&rreq->nr_outstanding,1 ); -do { -if (!netfs_rreq_submit_slice (rreq, &debug_index)) -break ; - - }while (rreq->submitted < rreq->len); - -/* 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. -*/ -for (;;) { -wait_var_event (&rreq->nr_outstanding, -atomic_read (&rreq->nr_outstanding) ==1 ); -netfs_rreq_assess (rreq, false); -if (!test_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags)) -break ; -cond_resched (); - } - - ret = rreq->error; -if (ret ==0 && rreq->submitted < rreq->len) { -trace_netfs_failure (rreq,NULL , ret, netfs_fail_short_write_begin); - ret = -EIO ; - } -netfs_put_request (rreq, false, netfs_rreq_trace_put_hold); + ret =netfs_begin_read (rreq, true);if (ret <0 ) goto error;include/trace/events/netfs.h +1
-2@@ -56,17 +56,18 @@ EM(netfs_fail_check_write_begin, "check-write-begin") \ EM(netfs_fail_copy_to_cache, "copy-to-cache") \ EM(netfs_fail_read, "read") \ - EM(netfs_fail_short_readpage, "short-readpage") \ - EM(netfs_fail_short_write_begin, "short-write-begin") \ + EM(netfs_fail_short_read, "short-read") \ E_(netfs_fail_prepare_write, "prep-write")#define netfs_rreq_ref_traces \ EM(netfs_rreq_trace_get_hold, "GET HOLD ") \
include/trace/events/netfs.h line 73
Quoted 10 lines
include/trace/events/netfs.h +2
-0EM(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_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 v3 15/20 netfs: Prepare to split read_helper.c
In reply to David HowellsRename netfs_rreq_unlock() to netfs_rreq_unlock_folios() to make it sound less like it's dropping a lock on an netfs_io_request struct.
Remove the 'static' marker on netfs_rreq_unlock_folios() and declaring it in internal.h preparatory to splitting the file.
Changes
=======
ver #2)
- Slide this patch to after the one adding netfs_begin_read().
- As a consequence, don't need to unstatic so many functions.
---
fs/netfs/internal.h | 5 +++++ fs/netfs/read_helper.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)
fs/netfs/internal.h +5 -0
@@ -15,6 +15,11 @@#define pr_fmt (fmt) "netfs: " fmt +/* +* buffered_read.c +*/ +void netfs_rreq_unlock_folios (struct netfs_io_request *rreq); +/* * objects.c */
fs/netfs/read_helper.c +2 -2
@@ -250,7 +250,7 @@ static void netfs_rreq_write_to_cache(struct netfs_io_request *rreq)* Unlock the folios in a read operation. We need to set PG_fscache on any * folios we're going to write back before we unlock them. */ -static void netfs_rreq_unlock (struct netfs_io_request *rreq) +void netfs_rreq_unlock_folios (struct netfs_io_request *rreq) {struct netfs_io_subrequest *subreq;struct folio *folio;
@@ -432,7 +432,7 @@ static void netfs_rreq_assess(struct netfs_io_request *rreq, bool was_async)return ; } -netfs_rreq_unlock (rreq); +netfs_rreq_unlock_folios (rreq);clear_bit_unlock (NETFS_RREQ_IN_PROGRESS , &rreq->flags);wake_up_bit (&rreq->flags,NETFS_RREQ_IN_PROGRESS );
David Howells
maintainerPATCH v3 16/20 netfs: Rename read_helper.c to io.c
In reply to David HowellsRename the read_helper.c file to io.c before splitting out the buffered read functions and some other bits.
Changes
=======
ver #2)
- Rename read_helper.c before splitting.
---
Documentation/filesystems/netfs_library.rst | 3 fs/netfs/Makefile | 4 fs/netfs/internal.h | 14 fs/netfs/io.c | 1085 +++++++++++++++++++++++++++ fs/netfs/read_helper.c | 1085 --------------------------- 5 files changed, 1096 insertions(+), 1095 deletions(-) create mode 100644 fs/netfs/io.c delete mode 100644 fs/netfs/read_helper.c
Documentation/filesystems/netfs_library.rst +2 -1
@@ -605,4 +605,5 @@ API Function Reference ====================== .. kernel-doc:: include/linux/netfs.h -.. kernel-doc:: fs/netfs/read_helper.c +.. kernel-doc:: fs/netfs/buffered_read.c +.. kernel-doc:: fs/netfs/io.c
fs/netfs/Makefile +2 -2
@@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 netfs-y := \ - objects.o \ - read_helper.o + io.o \ + objects.o netfs-$(CONFIG_NETFS_STATS) += stats.o
fs/netfs/internal.h +7 -7
@@ -20,6 +20,13 @@*/ void netfs_rreq_unlock_folios (struct netfs_io_request *rreq); +/* +* io.c +*/ +extern unsigned int netfs_debug; + +int netfs_begin_read (struct netfs_io_request *rreq,bool sync); +/* * objects.c */
@@ -39,13 +46,6 @@ static inline void netfs_see_request(struct netfs_io_request *rreq,trace_netfs_rreq_ref (rreq->debug_id,refcount_read (&rreq->ref), what); } -/* -* read_helper.c -*/ -extern unsigned int netfs_debug; - -int netfs_begin_read (struct netfs_io_request *rreq,bool sync); -/* * stats.c */
fs/netfs/io.c new file +1085 -0
1,085 lines not on this page · raw message
fs/netfs/read_helper.c deleted +0 -1085
1,085 lines not on this page · raw message
David Howells
maintainerPATCH v3 17/20 netfs: Split fs/netfs/read_helper.c
In reply to David HowellsSplit fs/netfs/read_helper.c into two pieces, one to deal with buffered writes and one to deal with the I/O mechanism.
Changes
=======
ver #2)
- Add kdoc reference to new file.
---
fs/netfs/Makefile | 1 fs/netfs/buffered_read.c | 428 ++++++++++++++++++++++++++++++++++++++++++++++ fs/netfs/io.c | 418 --------------------------------------------- 3 files changed, 429 insertions(+), 418 deletions(-) create mode 100644 fs/netfs/buffered_read.c
fs/netfs/Makefile +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 netfs-y := \ + buffered_read.o \ io.o \ objects.o
fs/netfs/buffered_read.c new file +428 -0
428 lines not on this page · raw message
fs/netfs/io.c +0 -418
427 lines not on this page · raw message
David Howells
maintainerPATCH v3 18/20 netfs: Split some core bits out into their own file
In reply to David HowellsSplit some core bits out into their own file. More bits will be added to this file later.
---
fs/netfs/Makefile | 1 + fs/netfs/internal.h | 7 +++++-- fs/netfs/io.c | 10 ---------- fs/netfs/main.c | 20 ++++++++++++++++++++ 4 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 fs/netfs/main.c
fs/netfs/Makefile +1 -0
@@ -3,6 +3,7 @@ netfs-y := \ buffered_read.o \ io.o \ + main.o \ objects.o netfs-$(CONFIG_NETFS_STATS) += stats.o
fs/netfs/internal.h +5 -2
@@ -23,10 +23,13 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq);/* * io.c */ -extern unsigned int netfs_debug; -int netfs_begin_read (struct netfs_io_request *rreq,bool sync); +/* +* main.c +*/ +extern unsigned int netfs_debug; +/* * objects.c */
fs/netfs/io.c +0 -10
@@ -15,16 +15,6 @@#include <linux/sched/mm.h> #include <linux/task_io_accounting_ops.h> #include "internal.h" -#define CREATE_TRACE_POINTS -#include <trace/events/netfs.h> - -MODULE_DESCRIPTION ("Network fs support" ); -MODULE_AUTHOR ("Red Hat, Inc." ); -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" );/* * Clear the unread part of an I/O request.
fs/netfs/main.c new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Miscellaneous bits for the netfs support library. +* +* Copyright (C) 2022 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +*/ + +#include <linux/module.h> +#include <linux/export.h> +#include "internal.h" +#define CREATE_TRACE_POINTS +#include <trace/events/netfs.h> + +MODULE_DESCRIPTION ("Network fs support" ); +MODULE_AUTHOR ("Red Hat, Inc." ); +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 v3 19/20 netfs: Keep track of the actual remote file size
In reply to David HowellsProvide a place in which to keep track of the actual remote file size in the netfs context. This is needed because inode->i_size will be updated as we buffer writes in the pagecache, but the server file size won't get updated until we flush them back.
---
include/linux/netfs.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
include/linux/netfs.h +16 -0
@@ -126,6 +126,7 @@ struct netfs_i_context {#if IS_ENABLED (CONFIG_FSCACHE )struct fscache_cookie *cache;#endif +loff_t remote_i_size;/* Size of the remote file */ };/*
@@ -324,6 +325,21 @@ static inline void netfs_i_context_init(struct inode *inode,memset (ctx,0 ,sizeof (*ctx)); ctx->ops = ops; + ctx->remote_i_size =i_size_read (inode); +} + +/** +* netfs_resize_file - Note that a file got resized +* @inode: The inode being resized +* @new_i_size: The new file size +* +* Inform the netfs lib that a file got resized so that it can adjust its state. +*/ +static inline void netfs_resize_file (struct inode *inode,loff_t new_i_size) +{ +struct netfs_i_context *ctx =netfs_i_context (inode); + + ctx->remote_i_size = new_i_size; }/**
David Howells
maintainerPATCH v3 20/20 afs: Maintain netfs_i_context::remote_i_size
In reply to David HowellsMake afs use netfslib's tracking for the server's idea of what the current inode size is independently of inode->i_size. We really want to use this value when calculating the new vnode size when initiating a StoreData RPC op rather than the size stat() presents to the user (ie. inode->i_size) as the latter is affected by as-yet uncommitted writes.
---
fs/afs/inode.c | 1 + fs/afs/write.c | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-)
fs/afs/inode.c +1 -0
@@ -246,6 +246,7 @@ static void afs_apply_status(struct afs_operation *op,* idea of what the size should be that's not the same as * what's on the server. */ + vnode->netfs_ctx.remote_i_size = status->size;if (change_size) {afs_set_i_size (vnode, status->size); inode->i_ctime = t;
fs/afs/write.c +3 -4
@@ -353,9 +353,10 @@ static const struct afs_operation_ops afs_store_data_operation = {static int afs_store_data (struct afs_vnode *vnode,struct iov_iter *iter,loff_t pos,bool laundering) { +struct netfs_i_context *ictx = &vnode->netfs_ctx;struct afs_operation *op;struct afs_wb_key *wbk =NULL ; -loff_t size =iov_iter_count (iter), i_size; +loff_t size =iov_iter_count (iter);int ret = -ENOKEY ; _enter("%s{%llx:%llu.%u},%llx,%llx",
@@ -377,15 +378,13 @@ static int afs_store_data(struct afs_vnode *vnode, struct iov_iter *iter, loff_treturn -ENOMEM ; } - i_size =i_size_read (&vnode->vfs_inode); -afs_op_set_vnode (op,0 , vnode); op->file[0 ].dv_delta =1 ; op->file[0 ].modification = true; op->store.write_iter = iter; op->store.pos = pos; op->store.size = size; - op->store.i_size =max (pos + size, i_size); + op->store.i_size =max (pos + size, ictx->remote_i_size); op->store.laundering = laundering; op->mtime = vnode->vfs_inode.i_mtime; op->flags |=AFS_OPERATION_UNINTR ;
Quoted 183 lines · David Howells
Having had a go at implementing write helpers and content encryption support in netfslib, it seems that the netfs_read_{,sub}request structs and the equivalent write request structs were almost the same and so should be merged, thereby requiring only one set of alloc/get/put functions and a common set of tracepoints.
Merging the structs also has the advantage that if a bounce buffer is added to the request struct, a read operation can be performed to fill the bounce buffer, the contents of the buffer can be modified and then a write operation can be performed on it to send the data wherever it needs to go using the same request structure all the way through. The I/O handlers would then transparently perform any required crypto. This should make it easy to perform RMW cycles if needed.
The potentially common functions and structs, however, by their names all proclaim themselves to be associated with the read side of things. The bulk of these changes alter this in the following ways:
(1) Rename struct netfs_read_{,sub}request to netfs_io_{,sub}request.
(2) Rename some enums, members and flags to make them more appropriate.
(3) Adjust some comments to match.
(4) Drop "read"/"rreq" from the names of common functions. For instance,
netfs_get_read_request()becomesnetfs_get_request().(5) The ->init_rreq() and ->issue_op() methods become ->init_request() and
->issue_read(). I've kept the latter as a read-specific function and in another branch added an ->issue_write() method.The driver source is then reorganised into a number of files:
fs/netfs/buffered_read.cCreate read reqs to the pagecache
fs/netfs/io.cDispatchers for read and write reqs
fs/netfs/main.cSome general miscellaneous bits
fs/netfs/objects.cAlloc, get and put functions
fs/netfs/stats.cOptional procfs statistics.and future development can be fitted into this scheme, e.g.:
fs/netfs/buffered_write.cModify the pagecache
fs/netfs/buffered_flush.cWriteback from the pagecache
fs/netfs/direct_read.cDIO read support
fs/netfs/direct_write.cDIO write support
fs/netfs/unbuffered_write.cWrite modifications directly backBeyond the above changes, there are also some changes that affect how things work:
(1) Make
fscache_end_operation()generally available.(2) In the netfs tracing header, generate enums from the symbol -> string mapping tables rather than manually coding them.
(3) Add a struct for filesystems that uses netfslib to put into their inode wrapper structs to hold extra state that netfslib is interested in, such as the fscache cookie. This allows netfslib functions to be set in filesystem operation tables and jumped to directly without having to have a filesystem wrapper.
(4) Add a member to the struct added in (3) to track the remote inode length as that may differ if local modifications are buffered. We may need to supply an appropriate EOF pointer when storing data (in AFS for example).
(5) Pass extra information to
netfs_alloc_request()so that the ->init_request() hook can access it and retain information to indicate the origin of the operation.(6) Make the ->init_request() hook return an error, thereby allowing a filesystem that isn't allowed to cache an inode (ceph or cifs, for example) to skip readahead.
(7) Switch to using
refcount_tfor subrequests and add tracepoints to log refcount changes for the request and subrequest structs.(8) Add a function to consolidate dispatching a read request. Similar code is used in three places and another couple are likely to be added in the future.
The patches can be found on this branch:
http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=fscache-next
This is based on top of ceph's master branch as some of the patches conflict.
David
---Changes
=======
ver #3)
- Rebased one patch back on the ceph tree as the top patch got removed[4].
- Split out the bit to move ceph cap-getting on readahead out from the patch adding an inode context[5].
- Madeceph_init_request()store the caps got inrreq->netfs_privfor later freeing.
- Comment the need to keep the netfs inode context contiguous with the VFS inode struct[6].
- Altered the traces to use 'R=' consistently to denote a request debug ID.ver #2)
- Changed kdoc references to renamed files[1].
- Switched the begin-read-function patch and the prepare-to-split patch as fewer functions then need unstatic'ing.
- Fixed an uninitialised var in netfs_begin_read()[2][3].
- Fixed a refleak caused by an unremoved line whennetfs_begin_read()was introduced.
- Used "#ifIS_ENABLED()" innetfs_i_cookie(), not "#ifdef".
- Implemented missing bit of ceph readahead throughnetfs_readahead().
- Rearranged the patch order to make the ceph readahead possible.---
David Howells (19):
netfs: Generate enums from trace symbol mapping lists
netfs: Rename netfs_read_*request to netfs_io_*request
netfs: Finish off rename ofnetfs_read_requesttonetfs_io_request
netfs: Split netfs_io_* object handling out
netfs: Adjust thenetfs_rreqtracepoint slightly
netfs: Trace refcounting on thenetfs_io_requeststruct
netfs: Trace refcounting on thenetfs_io_subrequeststruct
netfs: Adjust thenetfs_failuretracepoint to indicate non-subreq lines
netfs: Refactor arguments fornetfs_alloc_read_request
netfs: Change ->init_request() to return an error code
ceph: Makeceph_init_request()check caps on readahead
netfs: Add a netfs inode context
netfs: Add a function to consolidate beginning a read
netfs: Prepare to splitread_helper.c
netfs: Renameread_helper.ctoio.c
netfs: Splitfs/netfs/read_helper.c
netfs: Split some core bits out into their own file
netfs: Keep track of the actual remote file size
afs: Maintainnetfs_i_context::remote_i_sizeJeffle Xu (1):
fscache: exportfscache_end_operation()Documentation/filesystems/netfs_library.rst | 140 ++- fs/9p/cache.c | 10 +- fs/9p/v9fs.c | 4 +- fs/9p/v9fs.h | 13 +- fs/9p/vfs_addr.c | 62 +- fs/9p/vfs_inode.c | 13 +- fs/afs/dynroot.c | 1 + fs/afs/file.c | 41 +- fs/afs/inode.c | 32 +- fs/afs/internal.h | 23 +- fs/afs/super.c | 4 +- fs/afs/write.c | 10 +- fs/cachefiles/io.c | 10 +- fs/ceph/addr.c | 116 +- fs/ceph/cache.c | 28 +- fs/ceph/cache.h | 15 +- fs/ceph/inode.c | 6 +- fs/ceph/super.h | 17 +- fs/cifs/cifsglob.h | 10 +- fs/cifs/fscache.c | 19 +- fs/cifs/fscache.h | 2 +- fs/fscache/internal.h | 11 - fs/netfs/Makefile | 8 +- fs/netfs/buffered_read.c | 428 +++++++ fs/netfs/internal.h | 49 +- fs/netfs/io.c | 657 ++++++++++ fs/netfs/main.c | 20 + fs/netfs/objects.c | 160 +++ fs/netfs/read_helper.c | 1205 ------------------- fs/netfs/stats.c | 1 - fs/nfs/fscache.c | 8 - include/linux/fscache.h | 14 + include/linux/netfs.h | 162 ++-
Quoted 10 lines
include/trace/events/cachefiles.h | 6 +- include/trace/events/netfs.h | 190 ++- 35 files changed, 1867 insertions(+), 1628 deletions(-) create mode 100644 fs/netfs/buffered_read.c create mode 100644 fs/netfs/io.c create mode 100644 fs/netfs/main.c create mode 100644 fs/netfs/objects.c delete mode 100644 fs/netfs/read_helper.c
I ran this through xfstests on ceph, with fscache enabled and it seemed to do fine.
David Howells wrote on Thu, Mar 10, 2022 at 04:13:56PM +0000:
Quoted 3 lines
The patches can be found on this branch:
http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=fscache-next
Looks good to me from the 9p side:
writes being done by 4k chunk is really slow so will be glad to see this finished, keep it up! :)
Signature · 1 line
Dominique