From: David Howells <dhowells@redhat.com>
To: Hugh Dickins <hughd@google.com>
Cc: David Howells <dhowells@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
Al Viro <viro@zeniv.linux.org.uk>,
John Hubbard <jhubbard@nvidia.com>,
David Hildenbrand <david@redhat.com>,
Matthew Wilcox <willy@infradead.org>,
Chuck Lever <chuck.lever@oracle.com>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 1/2] shmem: Fix splice of a missing page
Date: Thu, 27 Jul 2023 17:10:15 +0100 [thread overview]
Message-ID: <20230727161016.169066-2-dhowells@redhat.com> (raw)
In-Reply-To: <20230727161016.169066-1-dhowells@redhat.com>
Fix shmem_splice_read() to splice only part of the partial page at the end
of a splice and not all of it.
This can be seen by splicing from a tmpfs file that's not a multiple of
PAGE_SIZE in size. Without this fix, it splices extra data to round up to
PAGE_SIZE.
Fixes: bd194b187115 ("shmem: Implement splice-read")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Hugh Dickins <hughd@google.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: Chuck Lever <chuck.lever@oracle.com>
cc: linux-block@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
---
mm/shmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 2f2e0e618072..0164cccdcd71 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2841,7 +2841,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,
folio_put(folio);
folio = NULL;
} else {
- n = splice_zeropage_into_pipe(pipe, *ppos, len);
+ n = splice_zeropage_into_pipe(pipe, *ppos, part);
}
if (!n)
next prev parent reply other threads:[~2023-07-27 16:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-27 16:10 [PATCH 0/2] shmem, splice: Fixes for shmem_splice_read() David Howells
2023-07-27 16:10 ` David Howells [this message]
2023-07-27 16:35 ` [PATCH 1/2] shmem: Fix splice of a missing page Andrew Morton
2023-07-27 16:47 ` David Howells
2023-07-27 18:45 ` Hugh Dickins
2023-07-27 19:49 ` David Howells
2023-07-27 16:10 ` [PATCH 2/2] shmem: Apply a couple of filemap_splice_read() fixes to shmem_splice_read() David Howells
2023-07-27 19:23 ` Hugh Dickins
2023-07-27 19:50 ` David Howells
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=20230727161016.169066-2-dhowells@redhat.com \
--to=dhowells@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=chuck.lever@oracle.com \
--cc=david@redhat.com \
--cc=hch@lst.de \
--cc=hughd@google.com \
--cc=jhubbard@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.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).