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,
Daniel Golle <daniel@makrotopia.org>,
Guenter Roeck <groeck7@gmail.com>, Christoph Hellwig <hch@lst.de>,
John Hubbard <jhubbard@nvidia.com>,
Hugh Dickins <hughd@google.com>
Subject: [PATCH v21 09/30] shmem: Implement splice-read
Date: Sat, 20 May 2023 01:00:28 +0100 [thread overview]
Message-ID: <20230520000049.2226926-10-dhowells@redhat.com> (raw)
In-Reply-To: <20230520000049.2226926-1-dhowells@redhat.com>
The new filemap_splice_read() has an implicit expectation via
filemap_get_pages() that ->read_folio() exists if ->readahead() doesn't
fully populate the pagecache of the file it is reading from[1], potentially
leading to a jump to NULL if this doesn't exist. shmem, however, (and by
extension, tmpfs, ramfs and rootfs), doesn't have ->read_folio(),
Work around this by equipping shmem with its own splice-read
implementation, based on filemap_splice_read(), but able to paste in
zero_page when there's a page missing.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Daniel Golle <daniel@makrotopia.org>
cc: Guenter Roeck <groeck7@gmail.com>
cc: Christoph Hellwig <hch@lst.de>
cc: Jens Axboe <axboe@kernel.dk>
cc: Al Viro <viro@zeniv.linux.org.uk>
cc: John Hubbard <jhubbard@nvidia.com>
cc: David Hildenbrand <david@redhat.com>
cc: Matthew Wilcox <willy@infradead.org>
cc: Hugh Dickins <hughd@google.com>
cc: linux-block@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/Y+pdHFFTk1TTEBsO@makrotopia.org/ [1]
---
Notes:
ver #19)
- Remove a missed get_page() on the zero page.
ver #18)
- Don't take/release a ref on the zero page.
mm/shmem.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 133 insertions(+), 1 deletion(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index e40a08c5c6d7..1f504ed982cf 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2731,6 +2731,138 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
return retval ? retval : error;
}
+static bool zero_pipe_buf_get(struct pipe_inode_info *pipe,
+ struct pipe_buffer *buf)
+{
+ return true;
+}
+
+static void zero_pipe_buf_release(struct pipe_inode_info *pipe,
+ struct pipe_buffer *buf)
+{
+}
+
+static bool zero_pipe_buf_try_steal(struct pipe_inode_info *pipe,
+ struct pipe_buffer *buf)
+{
+ return false;
+}
+
+static const struct pipe_buf_operations zero_pipe_buf_ops = {
+ .release = zero_pipe_buf_release,
+ .try_steal = zero_pipe_buf_try_steal,
+ .get = zero_pipe_buf_get,
+};
+
+static size_t splice_zeropage_into_pipe(struct pipe_inode_info *pipe,
+ loff_t fpos, size_t size)
+{
+ size_t offset = fpos & ~PAGE_MASK;
+
+ size = min_t(size_t, size, PAGE_SIZE - offset);
+
+ if (!pipe_full(pipe->head, pipe->tail, pipe->max_usage)) {
+ struct pipe_buffer *buf = pipe_head_buf(pipe);
+
+ *buf = (struct pipe_buffer) {
+ .ops = &zero_pipe_buf_ops,
+ .page = ZERO_PAGE(0),
+ .offset = offset,
+ .len = size,
+ };
+ pipe->head++;
+ }
+
+ return size;
+}
+
+static ssize_t shmem_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);
+ struct address_space *mapping = inode->i_mapping;
+ struct folio *folio = NULL;
+ size_t total_spliced = 0, used, npages, n, part;
+ loff_t isize;
+ int error = 0;
+
+ /* Work out how much data we can actually add into the pipe */
+ used = pipe_occupancy(pipe->head, pipe->tail);
+ npages = max_t(ssize_t, pipe->max_usage - used, 0);
+ len = min_t(size_t, len, npages * PAGE_SIZE);
+
+ do {
+ if (*ppos >= i_size_read(inode))
+ break;
+
+ error = shmem_get_folio(inode, *ppos / PAGE_SIZE, &folio, SGP_READ);
+ if (error) {
+ if (error == -EINVAL)
+ error = 0;
+ break;
+ }
+ if (folio) {
+ folio_unlock(folio);
+
+ if (folio_test_hwpoison(folio)) {
+ error = -EIO;
+ break;
+ }
+ }
+
+ /*
+ * i_size must be checked after we know the pages are Uptodate.
+ *
+ * Checking i_size after the check allows us to calculate
+ * the correct value for "nr", which means the zero-filled
+ * part of the page is not copied back to userspace (unless
+ * another truncate extends the file - this is desired though).
+ */
+ isize = i_size_read(inode);
+ if (unlikely(*ppos >= isize))
+ break;
+ part = min_t(loff_t, isize - *ppos, len);
+
+ if (folio) {
+ /*
+ * If users can be writing to this page using arbitrary
+ * virtual addresses, take care about potential aliasing
+ * before reading the page on the kernel side.
+ */
+ if (mapping_writably_mapped(mapping))
+ flush_dcache_folio(folio);
+ folio_mark_accessed(folio);
+ /*
+ * Ok, we have the page, and it's up-to-date, so we can
+ * now splice it into the pipe.
+ */
+ n = splice_folio_into_pipe(pipe, folio, *ppos, part);
+ folio_put(folio);
+ folio = NULL;
+ } else {
+ n = splice_zeropage_into_pipe(pipe, *ppos, len);
+ }
+
+ if (!n)
+ break;
+ len -= n;
+ total_spliced += n;
+ *ppos += n;
+ in->f_ra.prev_pos = *ppos;
+ if (pipe_full(pipe->head, pipe->tail, pipe->max_usage))
+ break;
+
+ cond_resched();
+ } while (len);
+
+ if (folio)
+ folio_put(folio);
+
+ file_accessed(in);
+ return total_spliced ? total_spliced : error;
+}
+
static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence)
{
struct address_space *mapping = file->f_mapping;
@@ -3971,7 +4103,7 @@ static const struct file_operations shmem_file_operations = {
.read_iter = shmem_file_read_iter,
.write_iter = generic_file_write_iter,
.fsync = noop_fsync,
- .splice_read = generic_file_splice_read,
+ .splice_read = shmem_file_splice_read,
.splice_write = iter_file_splice_write,
.fallocate = shmem_fallocate,
#endif
next prev parent reply other threads:[~2023-05-20 0:03 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-20 0:00 [PATCH v21 00/30] splice: Kill ITER_PIPE David Howells
2023-05-20 0:00 ` [PATCH v21 01/30] splice: Fix filemap of a blockdev David Howells
2023-05-20 4:08 ` Christoph Hellwig
2023-05-20 9:14 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 02/30] splice: Make filemap_splice_read() check s_maxbytes David Howells
2023-05-20 4:09 ` Christoph Hellwig
2023-05-20 9:21 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 03/30] splice: Rename direct_splice_read() to copy_splice_read() David Howells
2023-05-20 4:09 ` Christoph Hellwig
2023-05-20 9:23 ` Christian Brauner
2023-05-20 9:51 ` David Howells
2023-05-22 7:55 ` David Howells
2023-05-22 12:53 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 04/30] splice: Clean up copy_splice_read() a bit David Howells
2023-05-20 9:34 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 05/30] splice: Make do_splice_to() generic and export it David Howells
2023-05-20 9:35 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 06/30] splice: Check for zero count in vfs_splice_read() David Howells
2023-05-20 9:38 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 07/30] splice: Make splice from an O_DIRECT fd use copy_splice_read() David Howells
2023-05-20 4:11 ` Christoph Hellwig
2023-05-20 9:39 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 08/30] splice: Make splice from a DAX file " David Howells
2023-05-20 4:11 ` Christoph Hellwig
2023-05-20 9:41 ` Christian Brauner
2023-05-21 0:28 ` Theodore Ts'o
2023-05-21 14:55 ` Gao Xiang
2023-05-20 0:00 ` David Howells [this message]
2023-05-20 0:00 ` [PATCH v21 10/30] overlayfs: Implement splice-read David Howells
2023-05-20 9:47 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 11/30] coda: " David Howells
2023-05-20 0:00 ` [PATCH v21 12/30] tty, proc, kernfs, random: Use copy_splice_read() David Howells
2023-05-20 0:00 ` [PATCH v21 13/30] net: Make sock_splice_read() use copy_splice_read() by default David Howells
2023-05-20 0:00 ` [PATCH v21 14/30] 9p: Add splice_read stub David Howells
2023-05-20 0:00 ` [PATCH v21 15/30] afs: Provide a splice-read stub David Howells
2023-05-20 0:00 ` [PATCH v21 16/30] ceph: " David Howells
2023-05-22 2:12 ` Xiubo Li
2023-05-20 0:00 ` [PATCH v21 17/30] ecryptfs: " David Howells
2023-05-20 0:00 ` [PATCH v21 18/30] ext4: " David Howells
2023-05-20 4:12 ` Christoph Hellwig
2023-05-20 7:21 ` David Howells
2023-05-20 9:01 ` Christoph Hellwig
2023-05-21 0:26 ` Theodore Ts'o
2023-05-20 0:00 ` [PATCH v21 19/30] f2fs: " David Howells
2023-07-06 0:18 ` [f2fs-dev] " patchwork-bot+f2fs
2023-05-20 0:00 ` [PATCH v21 20/30] nfs: " David Howells
2023-05-20 0:00 ` [PATCH v21 21/30] ntfs3: " David Howells
2023-05-20 0:00 ` [PATCH v21 22/30] ocfs2: " David Howells
2023-05-22 2:49 ` Joseph Qi
2023-05-22 6:28 ` David Howells
2023-05-22 6:34 ` Joseph Qi
2023-05-22 6:49 ` David Howells
2023-05-22 6:54 ` Joseph Qi
2023-05-20 0:00 ` [PATCH v21 23/30] orangefs: " David Howells
2023-05-20 0:00 ` [PATCH v21 24/30] xfs: " David Howells
2023-05-20 4:13 ` Christoph Hellwig
2023-05-20 0:00 ` [PATCH v21 25/30] zonefs: " David Howells
2023-05-20 0:00 ` [PATCH v21 26/30] splice: Convert trace/seq to use copy_splice_read() David Howells
2023-05-20 4:14 ` Christoph Hellwig
2023-05-21 10:28 ` Masami Hiramatsu
2023-05-21 12:50 ` David Howells
2023-05-23 14:27 ` Steven Rostedt
2023-05-20 0:00 ` [PATCH v21 27/30] cifs: Use filemap_splice_read() David Howells
2023-05-20 0:00 ` [PATCH v21 28/30] splice: Use filemap_splice_read() instead of generic_file_splice_read() David Howells
2023-05-20 4:14 ` Christoph Hellwig
2023-05-20 9:56 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 29/30] splice: Remove generic_file_splice_read() David Howells
2023-05-20 4:14 ` Christoph Hellwig
2023-05-20 9:57 ` Christian Brauner
2023-05-20 0:00 ` [PATCH v21 30/30] iov_iter: Kill ITER_PIPE David Howells
2023-05-20 4:15 ` Christoph Hellwig
2023-05-20 9:58 ` Christian Brauner
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=20230520000049.2226926-10-dhowells@redhat.com \
--to=dhowells@redhat.com \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=daniel@makrotopia.org \
--cc=david@redhat.com \
--cc=groeck7@gmail.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=hdanton@sina.com \
--cc=hughd@google.com \
--cc=jack@suse.cz \
--cc=jgg@nvidia.com \
--cc=jhubbard@nvidia.com \
--cc=jlayton@kernel.org \
--cc=linux-block@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).