2023-05-20 01:11:03

by David Howells

Subject: [PATCH v21 07/30] splice: Make splice from an O_DIRECT fd use copy_splice_read()

Make a read splice from a file descriptor that's open O_DIRECT use
copy_splice_read() to do the reading as filemap_splice_read() is unlikely
to find any pagecache to splice.

Signed-off-by: David Howells <[email protected]>
cc: Christoph Hellwig <[email protected]>
cc: Al Viro <[email protected]>
cc: Jens Axboe <[email protected]>
cc: [email protected]
cc: [email protected]
cc: [email protected]
---

Notes:
ver #21)
- Needs to be in vfs_splice_read(), not generic_file_splice_read().

fs/splice.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/fs/splice.c b/fs/splice.c
index fe3309ffeb26..76126b1aafcb 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -907,6 +907,12 @@ long vfs_splice_read(struct file *in, loff_t *ppos,

if (unlikely(!in->f_op->splice_read))
return warn_unsupported(in, "read");
+ /*
+ * O_DIRECT doesn't deal with the pagecache, so we allocate a buffer,
+ * copy into it and splice that into the pipe.
+ */
+ if ((in->f_flags & O_DIRECT))
+ return copy_splice_read(in, ppos, pipe, len, flags);
return in->f_op->splice_read(in, ppos, pipe, len, flags);
}
EXPORT_SYMBOL_GPL(vfs_splice_read);

2023-05-20 04:13:20

by Christoph Hellwig

Subject: Re: [PATCH v21 07/30] splice: Make splice from an O_DIRECT fd use copy_splice_read()

Looks good:

Reviewed-by: Christoph Hellwig <[email protected]>

2023-05-20 09:49:18

by Christian Brauner

Subject: Re: [PATCH v21 07/30] splice: Make splice from an O_DIRECT fd use copy_splice_read()

On Sat, May 20, 2023 at 01:00:26AM +0100, David Howells wrote:
> Make a read splice from a file descriptor that's open O_DIRECT use
> copy_splice_read() to do the reading as filemap_splice_read() is unlikely
> to find any pagecache to splice.
>
> Signed-off-by: David Howells <[email protected]>
> cc: Christoph Hellwig <[email protected]>
> cc: Al Viro <[email protected]>
> cc: Jens Axboe <[email protected]>
> cc: [email protected]
> cc: [email protected]
> cc: [email protected]
> ---

Reviewed-by: Christian Brauner <[email protected]>