Skip to contentSkip to conversation

splice: Fix filemap of a blockdev

PATCH Applied David Howells 3 participants 6 messages Apr 19, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 splice: Fix filemap of a blockdev

Fix the new filemap_splice_read() function to get i_size from in->f_mapping->host, not in->f_inode so that it works with block devices too (in->f_inode points to the device file, which is typically zero size).

Fixes 07073eb01c5f ("splice: Add a func to do a splice from a buffered file without ITER_PIPE")
cc Jens Axboe <[email protected]>
cc Christoph Hellwig <[email protected]>
cc Al Viro <[email protected]>
cc David Hildenbrand <[email protected]>
cc John Hubbard <[email protected]>
cc Steve French <[email protected]>
---
 mm/filemap.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/filemap.c +2 -2
index 470be06b6096..f86cc8acf33a 100644
@@ -2902,7 +2902,7 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos,
 	do {
 		cond_resched();
 
-		if (*ppos >= i_size_read(file_inode(in)))
+		if (*ppos >= i_size_read(in->f_mapping->host))
 			break;
 
 		iocb.ki_pos = *ppos;
@@ -2918,7 +2918,7 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos,
 		 * part of the page is not copied back to userspace (unless
 		 * another truncate extends the file - this is desired though).
 		 */
-		isize = i_size_read(file_inode(in));
+		isize = i_size_read(in->f_mapping->host);
 		if (unlikely(*ppos >= isize))
 			break;
 		end_offset = min_t(loff_t, isize, *ppos + len);
Tested-by on v1 1/1
#1 lore raw

Hello David,

This resolves the Fio-test issue that i reported in

Quoted 7 lines · David Howells

Fix the new filemap_splice_read() function to get i_size from in->f_mapping->host, not in->f_inode so that it works with block devices too (in->f_inode points to the device file, which is typically zero size).

Fixes 07073eb01c5f ("splice: Add a func to do a splice from a buffered file without ITER_PIPE")
Quoted 28 lines
cc Jens Axboe <[email protected]>
cc Christoph Hellwig <[email protected]>
cc Al Viro <[email protected]>
cc David Hildenbrand <[email protected]>
cc John Hubbard <[email protected]>
cc Steve French <[email protected]>
---
  mm/filemap.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
mm/filemap.c +1 -1
index 470be06b6096..f86cc8acf33a 100644
@@ -2902,7 +2902,7 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos,
  	do {
  		cond_resched();
 
-		if (*ppos >= i_size_read(file_inode(in)))
+		if (*ppos >= i_size_read(in->f_mapping->host))
  			break;
 
  		iocb.ki_pos = *ppos;

mm/filemap.c ssize_t filemap_splice_read(struct file *in, loff_t *ppos, · line 2924

Quoted 8 lines
mm/filemap.c +1 -1
@@ -2918,7 +2918,7 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos,
  		 * part of the page is not copied back to userspace (unless
  		 * another truncate extends the file - this is desired though).
  		 */
-		isize = i_size_read(file_inode(in));
+		isize = i_size_read(in->f_mapping->host);
  		if (unlikely(*ppos >= isize))
  			break;
  		end_offset = min_t(loff_t, isize, *ppos + len);

Regards,
Ayush Jain

maintainer Applied
#2 lore raw
In reply to David Howells
Quoted 5 lines · David Howells

Fix the new filemap_splice_read() function to get i_size from in->f_mapping->host, not in->f_inode so that it works with block devices too (in->f_inode points to the device file, which is typically zero size).

Applied, thanks!

[1/1] splice: Fix filemap of a blockdev

      commit: 5a9515a407d1aec1dd76c24fe99d9981730b74fb

Best regards,

Signature · 1 line
Jens Axboe
#3 lore raw
Quoted 1 line · Jens Axboe

[1/1] splice: Fix filemap of a blockdev

Actually, would you be able to fix the subject? I left a word out:

splice: Fix filemap splice of a blockdev

or maybe:

splice: Fix buffered splice of a blockdev

Sorry about that,
David

maintainer
#4 lore raw
Quoted 11 lines · David Howells
Quoted 1 line · Jens Axboe

[1/1] splice: Fix filemap of a blockdev

Actually, would you be able to fix the subject? I left a word out:

splice: Fix filemap splice of a blockdev

or maybe:

splice: Fix buffered splice of a blockdev

Fixed it up.

Signature · 1 line
Jens Axboe
#5 lore raw
In reply to Jens Axboe

Note that this shouldn't affect direct_splice_read() as that doesn't look at the size of the file, but rather just keeps reading from it until the requested amount is read, the pipe is full or ->read_iter() indicates EOF by returning 0 (so it could work for copy-splicing from a pipe/socket/chardev too).

David