shmem, splice: Fixes for shmem_splice_read()
Subsystems (4)
cover shmem, splice: Fixes for shmem_splice_read()
Hi Hugh,
Here are a couple of fix patches for shmem_splice_read():
(1) Fix the splicing of a zero_page in place of a missing page. This should only splice in the calculated part of the page and everything to the end of the page.
(2) Apply a couple of fixes already applied to filemap_splice_read(), including using in->f_mapping_host rather than file_inode(in) and ignoring splices that start at or after s_maxbytes.
I've pushed the patches here also:
https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=splice-fixes
David
David Howells (2):
shmem: Fix splice of a missing page
shmem: Apply a couple of filemap_splice_read() fixes to
shmem_splice_read()
mm/shmem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
PATCH 1/2 shmem: Fix splice of a missing page
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.
--- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/shmem.c +1 -1
@@ -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)
Andrew Morton
maintainerRe: [PATCH 1/2] shmem: Fix splice of a missing page
Quoted 6 lines · On Thu, 27 Jul 2023 17:10:15 +0100 David Howells <[email protected]> wrote:
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_SIZEin size. Without this fix, it splices extra data to round up toPAGE_SIZE.
This is already in mm-unstable (and hence linux-next) via Hugh's "shmem: minor fixes to splice-read implementation"
(https://lkml.kernel.org/r/[email protected])
Re: [PATCH 1/2] shmem: Fix splice of a missing page
Quoted 3 lines · Andrew Morton
This is already in mm-unstable (and hence linux-next) via Hugh's "shmem: minor fixes to splice-read implementation"
(https://lkml.kernel.org/r/[email protected])
And I've already reviewed it:-)
David
Hugh Dickins
maintainerRe: [PATCH 1/2] shmem: Fix splice of a missing page
Quoted 7 lines · David Howells
Quoted 3 lines · Andrew Morton
This is already in mm-unstable (and hence linux-next) via Hugh's "shmem: minor fixes to splice-read implementation"
(https://lkml.kernel.org/r/[email protected])And I've already reviewed it:-)
I'm not sure whether that ":-)" is implying (good-natured) denial.
You reviewed the original on 17 April, when Jens took it into his tree; then it vanished in a rewrite, and you didn't respond when I asked about that on 28 June; then you were Cc'ed when I sent it to Andrew on 23 July (where I explained about dropping two mods but keeping your Reviewed-by).
This version that Andrew has in mm-unstable includes the hwpoison fix that we agreed on before, in addition to the len -> part fix.
Hugh
Re: [PATCH 1/2] shmem: Fix splice of a missing page
Quoted 10 lines · Hugh Dickins
Quoted 7 lines · David Howells
Quoted 3 lines · Andrew Morton
This is already in mm-unstable (and hence linux-next) via Hugh's "shmem: minor fixes to splice-read implementation"
(https://lkml.kernel.org/r/[email protected])And I've already reviewed it:-)
I'm not sure whether that ":-)" is implying (good-natured) denial.
I've reviewed it, and the review still seems good.
Quoted 3 lines
You reviewed the original on 17 April, when Jens took it into his tree; then it vanished in a rewrite, and you didn't respond when I asked about that on 28 June;
I missed it in the rush to try and get everything debugged during the merge window prior to going on holiday.
Quoted 2 lines
then you were Cc'ed when I sent it to Andrew on 23 July (where I explained about dropping two mods but keeping your Reviewed-by).
Hmmm... I don't find that one in my inbox.
Quoted 2 lines
This version that Andrew has in mm-unstable includes the hwpoison fix that we agreed on before, in addition to the len -> part fix.
Ok.
David
PATCH 2/2 shmem: Apply a couple of filemap_splice_read() fixes to shmem_splice_read()
In reply to David HowellsFix shmem_splice_read() to use the inode from in->f_mapping->host rather than file_inode(in) and to skip the splice if it starts after s_maxbytes, analogously with fixes to filemap_splice_read().
--- mm/shmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
mm/shmem.c +4 -1
@@ -2780,13 +2780,16 @@ 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 inode *inode = in->f_mapping->host;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 ; +if (unlikely (*ppos >= inode->i_sb->s_maxbytes)) +return 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 );
Hugh Dickins
maintainerRe: [PATCH 2/2] shmem: Apply a couple of filemap_splice_read() fixes to shmem_splice_read()
Quoted 6 lines · David Howells
Fix
shmem_splice_read()to use the inode fromin->f_mapping->hostrather thanfile_inode(in)and to skip the splice if it starts afters_maxbytes, analogously with fixes tofilemap_splice_read().Fixes bd194b187115 ("shmem: Implement splice-read")Signed-off-by David Howells <[email protected]>
Thanks for trying to keep them in synch, but I already had to look into both of these two "fixes" before sending my patch to Andrew, and neither appears to be needed.
Neither of them does any harm either, but I think I'd prefer Andrew to drop this patch from mm-unstable, just because it changes nothing.
Comment on each below...
Quoted 20 lines
cc Hugh Dickins <[email protected]>cc Christoph Hellwig <[email protected]>cc Jens Axboe <[email protected]>cc Al Viro <[email protected]>cc John Hubbard <[email protected]>cc David Hildenbrand <[email protected]>cc Matthew Wilcox <[email protected]>cc Chuck Lever <[email protected]>--- mm/shmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)mm/shmem.c +0
-0
mm/shmem.c static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, · line 2783
Quoted 5 lines
mm/shmem.c +1
-1@@ -2780,13 +2780,16 @@ 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 inode *inode = in->f_mapping->host;
Haha, it's years and years since I had to worry about that distinction:
I noticed you'd made that change in filemap, and had to refresh old memories, before concluding that this change is not needed.
shmem_file_splice_read() is specified only in shmem_file_operations, and shmem_file_operations is connected up only when S_IFREG; so block and char device nodes will not ever arrive at shmem_file_splice_read().
And shmem does not appear to be out of step there: I did not search through many filesystems, but it appeared to be normal that only the regular files reach the splice_read.
Which made me wonder whether the file_inode -> f_mapping->host change was appropriate elsewhere. Wouldn't the splice_read always get called on the bd_inode? Ah, perhaps not: init_special_inode() sets i_fop to def_blk_fops (for shmem and everyone else), and that points to filemap_splice_read(), which explains why just that one needs to pivot to f_mapping->host (I think).
mm/shmem.c static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, · line 2795
Quoted 12 lines
mm/shmem.c +3
-0struct 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 ; +if (unlikely (*ppos >= inode->i_sb->s_maxbytes)) +return 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;I've added to the context there, to show that the very first thing the do loop does is check *ppos against i_size: so there's no need for that preliminary check against s_maxbytes - something would be wrong already if the file has grown beyond s_maxbytes.
So, thanks for the patch, but shmem does not need it.
Hugh
Re: [PATCH 2/2] shmem: Apply a couple of filemap_splice_read() fixes to shmem_splice_read()
Quoted 2 lines · Hugh Dickins
Which made me wonder whether the
file_inode->f_mapping->hostchange was appropriate elsewhere.
It's sometimes confusing. There are several (potentially) different inodes available at some points.
David