splice: emit a single fsnotify access event per NFSD READ
Subsystems (3)
Chuck Lever
maintainerPATCH v2 1/1 splice: emit a single fsnotify access event per NFSD READ
nfsd_finish_read() calls fsnotify_access() on both NFSD read paths, because splice_direct_to_actor() does not emit the event itself. The iterator path reaches nfsd_finish_read() from vfs_iocb_iter_read(), which has already emitted one. A READ served without splice therefore emits two access events.
NFSD does not use splice for the GSS integrity and privacy services, so a READ on a sec=krb5i or sec=krb5p mount takes the iterator. An inotify watch on that file sees the READ twice.
---
Changes in v2:
- Rename the new helper to vfs_splice_to_actor()
- Take pos, count, and actor data, not a splice_desc
- Link to v1: https://lore.kernel.org/r/[email protected]
--- fs/nfsd/vfs.c | 13 ++-------- fs/splice.c | 58 +++++++++++++++++++++++++++++++----------- include/linux/splice.h | 4 +-- 3 files changed, 47 insertions(+), 28 deletions(-)
fs/nfsd/vfs.c +2 -11
@@ -1046,7 +1046,6 @@ static __be32 nfsd_finish_read(struct svc_rqst *rqstp, struct svc_fh *fhp,nfsd_stats_io_read_add (nn, fhp->fh_export, host_err); *eof =nfsd_eof_on_read (file, offset, host_err, *count); *count = host_err; -fsnotify_access (file);trace_nfsd_read_io_done (rqstp, fhp, offset, *count);return 0 ; }else {
@@ -1071,19 +1070,11 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, loff_t offset, unsigned long *count, u32 *eof) { - struct splice_desc sd = { - .len =0 , - .total_len = *count, - .pos = offset, - .u.data = rqstp, - }; ssize_t host_err;trace_nfsd_read_splice (rqstp, fhp, offset, *count); - host_err =rw_verify_area (READ , file, &offset, *count); -if (!host_err) - host_err =splice_direct_to_actor (file, &sd, - nfsd_direct_splice_actor); + host_err =vfs_splice_to_actor (file, offset, *count, + nfsd_direct_splice_actor, rqstp);return nfsd_finish_read (rqstp, fhp, file, offset, count, eof, host_err); }
fs/splice.c +43 -15
71 lines not on this page · raw message
include/linux/splice.h +2 -2
@@ -79,8 +79,8 @@ ssize_t add_to_pipe(struct pipe_inode_info *pipe, struct pipe_buffer *buf);ssize_t vfs_splice_read (struct file *in,loff_t *ppos,struct pipe_inode_info *pipe,size_t len,unsigned int flags); -ssize_t splice_direct_to_actor (struct file *file,struct splice_desc *sd, -splice_direct_actor *actor); +ssize_t vfs_splice_to_actor (struct file *file,loff_t pos,size_t count, +splice_direct_actor *actor,void *private);ssize_t do_splice (struct file *in,loff_t *off_in,struct file *out,loff_t *off_out,size_t len,unsigned int flags); ssize_t do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
Signature · 1 line
2.55.0
Quoted 10 lines · Chuck Lever
nfsd_finish_read()callsfsnotify_access()on both NFSD read paths, becausesplice_direct_to_actor()does not emit the event itself. The iterator path reachesnfsd_finish_read()fromvfs_iocb_iter_read(), which has already emitted one. A READ served without splice therefore emits two access events.NFSD does not use splice for the GSS integrity and privacy services, so a READ on a sec=krb5i or sec=krb5p mount takes the iterator. An inotify watch on that file sees the READ twice.
Quoted 6 lines
Looks good. Feel free to add:
Honza
Quoted 140 lines
---
Changes in v2:
- Rename the new helper tovfs_splice_to_actor()
- Take pos, count, and actor data, not asplice_desc
- Link to v1: https://lore.kernel.org/r/[email protected]--- fs/nfsd/vfs.c | 13 ++-------- fs/splice.c | 58 +++++++++++++++++++++++++++++++----------- include/linux/splice.h | 4 +-- 3 files changed, 47 insertions(+), 28 deletions(-)fs/nfsd/vfs.c +2
-11@@ -1046,7 +1046,6 @@ static __be32 nfsd_finish_read(struct svc_rqst *rqstp, struct svc_fh *fhp,nfsd_stats_io_read_add (nn, fhp->fh_export, host_err); *eof =nfsd_eof_on_read (file, offset, host_err, *count); *count = host_err; -fsnotify_access (file);trace_nfsd_read_io_done (rqstp, fhp, offset, *count);return 0 ; }else {@@ -1071,19 +1070,11 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, loff_t offset, unsigned long *count, u32 *eof) { - struct splice_desc sd = { - .len =0 , - .total_len = *count, - .pos = offset, - .u.data = rqstp, - }; ssize_t host_err;trace_nfsd_read_splice (rqstp, fhp, offset, *count); - host_err =rw_verify_area (READ , file, &offset, *count); -if (!host_err) - host_err =splice_direct_to_actor (file, &sd, - nfsd_direct_splice_actor); + host_err =vfs_splice_to_actor (file, offset, *count, + nfsd_direct_splice_actor, rqstp);return nfsd_finish_read (rqstp, fhp, file, offset, count, eof, host_err); }fs/splice.c +43
-15@@ -1009,21 +1009,14 @@ ssize_t vfs_splice_read(struct file *in, loff_t *ppos, }EXPORT_SYMBOL_GPL (vfs_splice_read); -/** -* splice_direct_to_actor - splices data directly between two non-pipes -* @in: file to splice from -* @sd: actor information on where to splice to -* @actor: handles the data splicing -* -* Description: -* This is a special case helper to splice directly between two -* points, without requiring an explicit pipe. Internally an allocated -* pipe is cached in the process, and reused during the lifetime of -* that process. -* +/* +* This is a special case helper to splice directly between two +* points, without requiring an explicit pipe. Internally an allocated +* pipe is cached in the process, and reused during the lifetime of +* that process. */ -ssize_t splice_direct_to_actor (struct file *in,struct splice_desc *sd, -splice_direct_actor *actor) +static ssize_t splice_direct_to_actor (struct file *in,struct splice_desc *sd, +splice_direct_actor *actor) {struct pipe_inode_info *pipe;ssize_t ret, bytes;@@ -1147,7 +1140,42 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, goto done; } -EXPORT_SYMBOL (splice_direct_to_actor); + +/** +* vfs_splice_to_actor - call an actor on data read from a file +* @in: file to read from +* @pos: file offset +* @count: maximum number of bytes to read +* @actor: callback to process a pipe's worth of data +* @private: private data passed to @actor +* +* Read up to @count worth of data from @in at @pos, and call @actor +* when the hidden pipe used to buffer the data is full. Ensures the +* read is allowed using rw_verify_area() and emits fsnotify access +* events. @in must be seekable (FMODE_LSEEK). +* +* Return: The number of bytes spliced, or a negative errno. +*/ +ssize_t vfs_splice_to_actor (struct file *in,loff_t pos,size_t count, +splice_direct_actor *actor,void *private) +{ +struct splice_desc sd = { + .total_len = count, + .pos = pos, + .u.data = private, + }; +ssize_t ret; + + ret =rw_verify_area (READ , in, &sd.pos, sd.total_len); +if (ret <0 ) +return ret; + + ret =splice_direct_to_actor (in, &sd, actor); +if (ret >=0 ) +fsnotify_access (in); +return ret; +} +EXPORT_SYMBOL (vfs_splice_to_actor);static int direct_splice_actor (struct pipe_inode_info *pipe,struct splice_desc *sd)include/linux/splice.h +2
-2@@ -79,8 +79,8 @@ ssize_t add_to_pipe(struct pipe_inode_info *pipe, struct pipe_buffer *buf);ssize_t vfs_splice_read (struct file *in,loff_t *ppos,struct pipe_inode_info *pipe,size_t len,unsigned int flags); -ssize_t splice_direct_to_actor (struct file *file,struct splice_desc *sd, -splice_direct_actor *actor); +ssize_t vfs_splice_to_actor (struct file *file,loff_t pos,size_t count, +splice_direct_actor *actor,void *private);ssize_t do_splice (struct file *in,loff_t *off_in,struct file *out,loff_t *off_out,size_t len,unsigned int flags); ssize_t do_splice_direct(struct file *in, loff_t *ppos, struct file *out,Signature · 1 line
2.55.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Looks good:
Quoted 1 line · Chuck Lever
splice: emit a single fsnotify access event per NFSD READ
Applied to the vfs-7.4.misc branch of the vfs/vfs.git tree. Patches in the vfs-7.4.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-7.4.misc
[1/1] splice: emit a single fsnotify access event per NFSD READ
https://git.kernel.org/vfs/vfs/c/24973c36a6ea