From: David Howells <dhowells@redhat.com>
To: Jens Axboe <axboe@kernel.dk>, Al Viro <viro@zeniv.linux.org.uk>,
Christoph Hellwig <hch@infradead.org>
Cc: David Howells <dhowells@redhat.com>,
Matthew Wilcox <willy@infradead.org>, Jan Kara <jack@suse.cz>,
Jeff Layton <jlayton@kernel.org>,
David Hildenbrand <david@redhat.com>,
Jason Gunthorpe <jgg@nvidia.com>,
Logan Gunthorpe <logang@deltatee.com>,
Hillf Danton <hdanton@sina.com>,
Christian Brauner <brauner@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Christoph Hellwig <hch@lst.de>, Jaegeuk Kim <jaegeuk@kernel.org>,
Chao Yu <chao@kernel.org>,
linux-f2fs-devel@lists.sourceforge.net
Subject: [PATCH v20 16/32] f2fs: Provide a splice-read stub
Date: Fri, 19 May 2023 08:40:31 +0100 [thread overview]
Message-ID: <20230519074047.1739879-17-dhowells@redhat.com> (raw)
In-Reply-To: <20230519074047.1739879-1-dhowells@redhat.com>
Provide a splice_read stub for f2fs. This does some checks and tracing
before proceeding and will switch from direct-I/O to buffered I/O if forced
or if misaligned. It also updates the iostats after doing a buffered I/O.
[Note: I wonder if I should only do the tracing if I call
filemap_splice_read() as direct_splice_read() will call
f2fs_file_read_iter().]
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Christoph Hellwig <hch@lst.de>
cc: Al Viro <viro@zeniv.linux.org.uk>
cc: Jens Axboe <axboe@kernel.dk>
cc: Jaegeuk Kim <jaegeuk@kernel.org>
cc: Chao Yu <chao@kernel.org>
cc: linux-f2fs-devel@lists.sourceforge.net
cc: linux-fsdevel@vger.kernel.org
cc: linux-block@vger.kernel.org
cc: linux-mm@kvack.org
---
fs/f2fs/file.c | 68 ++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 60 insertions(+), 8 deletions(-)
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 5ac53d2627d2..3723387f4a87 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4367,22 +4367,23 @@ static ssize_t f2fs_dio_read_iter(struct kiocb *iocb, struct iov_iter *to)
return ret;
}
-static void f2fs_trace_rw_file_path(struct kiocb *iocb, size_t count, int rw)
+static void f2fs_trace_rw_file_path(struct file *file, loff_t pos, size_t count,
+ int rw)
{
- struct inode *inode = file_inode(iocb->ki_filp);
+ struct inode *inode = file_inode(file);
char *buf, *path;
buf = f2fs_getname(F2FS_I_SB(inode));
if (!buf)
return;
- path = dentry_path_raw(file_dentry(iocb->ki_filp), buf, PATH_MAX);
+ path = dentry_path_raw(file_dentry(file), buf, PATH_MAX);
if (IS_ERR(path))
goto free_buf;
if (rw == WRITE)
- trace_f2fs_datawrite_start(inode, iocb->ki_pos, count,
+ trace_f2fs_datawrite_start(inode, pos, count,
current->pid, path, current->comm);
else
- trace_f2fs_dataread_start(inode, iocb->ki_pos, count,
+ trace_f2fs_dataread_start(inode, pos, count,
current->pid, path, current->comm);
free_buf:
f2fs_putname(buf);
@@ -4398,7 +4399,8 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
return -EOPNOTSUPP;
if (trace_f2fs_dataread_start_enabled())
- f2fs_trace_rw_file_path(iocb, iov_iter_count(to), READ);
+ f2fs_trace_rw_file_path(iocb->ki_filp, iocb->ki_pos,
+ iov_iter_count(to), READ);
if (f2fs_should_use_dio(inode, iocb, to)) {
ret = f2fs_dio_read_iter(iocb, to);
@@ -4413,6 +4415,55 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
return ret;
}
+static ssize_t f2fs_file_splice_read(struct file *in, loff_t *ppos,
+ struct pipe_inode_info *pipe,
+ size_t len, unsigned int flags)
+{
+ struct inode *inode = file_inode(in);
+ const loff_t pos = *ppos;
+ ssize_t ret;
+
+ if (!f2fs_is_compress_backend_ready(inode))
+ return -EOPNOTSUPP;
+
+ if (trace_f2fs_dataread_start_enabled())
+ f2fs_trace_rw_file_path(in, pos, len, READ);
+
+ if (in->f_flags & O_DIRECT) {
+ if (f2fs_force_buffered_io(inode, READ))
+ goto buffered;
+
+ /*
+ * Direct I/O not aligned to the disk's logical_block_size will
+ * be attempted, but will fail with -EINVAL.
+ *
+ * f2fs additionally requires that direct I/O be aligned to the
+ * filesystem block size, which is often a stricter
+ * requirement. However, f2fs traditionally falls back to
+ * buffered I/O on requests that are logical_block_size-aligned
+ * but not fs-block aligned.
+ *
+ * The below logic implements this behavior.
+ */
+ if (!IS_ALIGNED(pos, i_blocksize(inode)) &&
+ IS_ALIGNED(pos, bdev_logical_block_size(inode->i_sb->s_bdev)))
+ goto buffered;
+ ret = direct_splice_read(in, ppos, pipe, len, flags);
+ goto done;
+ }
+
+buffered:
+ ret = filemap_splice_read(in, ppos, pipe, len, flags);
+ if (ret > 0)
+ f2fs_update_iostat(F2FS_I_SB(inode), inode,
+ APP_BUFFERED_READ_IO, ret);
+
+done:
+ if (trace_f2fs_dataread_end_enabled())
+ trace_f2fs_dataread_end(inode, pos, ret);
+ return ret;
+}
+
static ssize_t f2fs_write_checks(struct kiocb *iocb, struct iov_iter *from)
{
struct file *file = iocb->ki_filp;
@@ -4714,7 +4765,8 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
ret = preallocated;
} else {
if (trace_f2fs_datawrite_start_enabled())
- f2fs_trace_rw_file_path(iocb, orig_count, WRITE);
+ f2fs_trace_rw_file_path(iocb->ki_filp, iocb->ki_pos,
+ orig_count, WRITE);
/* Do the actual write. */
ret = dio ?
@@ -4919,7 +4971,7 @@ const struct file_operations f2fs_file_operations = {
#ifdef CONFIG_COMPAT
.compat_ioctl = f2fs_compat_ioctl,
#endif
- .splice_read = generic_file_splice_read,
+ .splice_read = f2fs_file_splice_read,
.splice_write = iter_file_splice_write,
.fadvise = f2fs_file_fadvise,
};
next prev parent reply other threads:[~2023-05-19 7:42 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-19 7:40 [PATCH v20 00/32] splice, block: Use page pinning and kill ITER_PIPE David Howells
2023-05-19 7:40 ` [PATCH v20 01/32] splice: Fix filemap of a blockdev David Howells
2023-05-19 8:06 ` Christoph Hellwig
2023-05-19 9:11 ` David Howells
2023-05-19 7:40 ` [PATCH v20 02/32] splice: Clean up direct_splice_read() a bit David Howells
2023-05-19 7:40 ` [PATCH v20 03/32] splice: Make direct_read_splice() limit to eof where appropriate David Howells
2023-05-19 8:09 ` Christoph Hellwig
2023-05-19 8:43 ` David Howells
2023-05-19 8:47 ` Christoph Hellwig
2023-05-19 22:27 ` David Howells
2023-05-20 3:54 ` Christoph Hellwig
2023-05-19 16:31 ` Linus Torvalds
2023-05-19 16:47 ` David Howells
2023-05-19 17:37 ` Linus Torvalds
2023-05-19 7:40 ` [PATCH v20 04/32] splice: Make do_splice_to() generic and export it David Howells
2023-05-19 7:40 ` [PATCH v20 05/32] splice: Make splice from a DAX file use direct_splice_read() David Howells
2023-05-19 8:10 ` Christoph Hellwig
2023-05-19 8:48 ` David Howells
2023-05-19 7:40 ` [PATCH v20 06/32] shmem: Implement splice-read David Howells
2023-05-19 7:40 ` [PATCH v20 07/32] overlayfs: " David Howells
2023-05-19 7:40 ` [PATCH v20 08/32] coda: " David Howells
2023-05-19 7:40 ` [PATCH v20 09/32] tty, proc, kernfs, random: Use direct_splice_read() David Howells
2023-05-19 8:12 ` Christoph Hellwig
2023-05-19 16:22 ` Linus Torvalds
2023-05-19 7:40 ` [PATCH v20 10/32] net: Make sock_splice_read() use direct_splice_read() by default David Howells
2023-05-19 7:40 ` [PATCH v20 11/32] 9p: Add splice_read stub David Howells
2023-05-19 7:40 ` [PATCH v20 12/32] afs: Provide a splice-read stub David Howells
2023-05-19 7:40 ` [PATCH v20 13/32] ceph: " David Howells
2023-05-19 8:40 ` Xiubo Li
2023-05-19 9:24 ` David Howells
2023-05-22 1:53 ` Xiubo Li
2023-05-19 7:40 ` [PATCH v20 14/32] ecryptfs: " David Howells
2023-05-19 7:40 ` [PATCH v20 15/32] ext4: " David Howells
2023-05-19 7:40 ` David Howells [this message]
2023-05-19 7:40 ` [PATCH v20 17/32] nfs: " David Howells
2023-05-19 7:40 ` [PATCH v20 18/32] ntfs3: " David Howells
2023-05-19 7:40 ` [PATCH v20 19/32] ocfs2: " David Howells
2023-05-19 7:40 ` [PATCH v20 20/32] orangefs: " David Howells
2023-05-19 7:40 ` [PATCH v20 21/32] xfs: " David Howells
2023-05-19 7:40 ` [PATCH v20 22/32] zonefs: " David Howells
2023-05-19 7:40 ` [PATCH v20 23/32] splice: Convert trace/seq to use direct_splice_read() David Howells
2023-05-22 14:29 ` Steven Rostedt
2023-05-22 14:50 ` David Howells
2023-05-22 17:42 ` Linus Torvalds
2023-05-22 18:38 ` Steven Rostedt
2023-05-19 7:40 ` [PATCH v20 24/32] splice: Do splice read from a file without using ITER_PIPE David Howells
2023-05-19 7:40 ` [PATCH v20 25/32] cifs: Use generic_file_splice_read() David Howells
2023-05-19 7:40 ` [PATCH v20 26/32] iov_iter: Kill ITER_PIPE David Howells
2023-05-19 7:40 ` [PATCH v20 27/32] iomap: Don't get an reference on ZERO_PAGE for direct I/O block zeroing David Howells
2023-05-19 7:40 ` [PATCH v20 28/32] block: Fix bio_flagged() so that gcc can better optimise it David Howells
2023-05-19 7:40 ` [PATCH v20 29/32] block: Replace BIO_NO_PAGE_REF with BIO_PAGE_REFFED with inverted logic David Howells
2023-05-20 1:26 ` Kent Overstreet
2023-05-20 3:56 ` Christoph Hellwig
2023-05-20 4:13 ` Kent Overstreet
2023-05-20 4:17 ` Christoph Hellwig
2023-05-20 5:52 ` Kent Overstreet
2023-05-20 8:40 ` David Howells
2023-05-19 7:40 ` [PATCH v20 30/32] block: Add BIO_PAGE_PINNED and associated infrastructure David Howells
2023-05-19 7:40 ` [PATCH v20 31/32] block: Convert bio_iov_iter_get_pages to use iov_iter_extract_pages David Howells
2023-05-19 7:40 ` [PATCH v20 32/32] block: convert bio_map_user_iov " David Howells
2023-05-19 7:49 ` [PATCH] iov_iter: Add automatic-alloc for ITER_BVEC and use in direct_splice_read() David Howells
2023-05-19 8:18 ` Christoph Hellwig
2023-05-19 8:06 ` [PATCH v20 00/32] splice, block: Use page pinning and kill ITER_PIPE Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230519074047.1739879-17-dhowells@redhat.com \
--to=dhowells@redhat.com \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=david@redhat.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=hdanton@sina.com \
--cc=jack@suse.cz \
--cc=jaegeuk@kernel.org \
--cc=jgg@nvidia.com \
--cc=jlayton@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=logang@deltatee.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox