Skip to contentSkip to conversation

vfs: fix readahead(2) on block devices

PATCH Applied Reuben Hawkins 4 participants 4 messages Sep 11, 2023 – Sep 14, 2023

Subsystems (3)

v2 of 4 Applied Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 vfs: fix readahead(2) on block devices

Readahead was factored to call generic_fadvise. That refactor added an S_ISREG restriction which broke readahead on block devices.

This change removes the S_ISREG restriction to fix block device readahead. The change also means that readahead will return -ESPIPE on FIFO files instead of -EINVAL.

Fixes 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED")
---
 mm/readahead.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/readahead.c +1 -2
index e815c114de21..ef3b23a41973 100644
@@ -734,8 +734,7 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count)
 	 * on this file, then we must return -EINVAL.
 	 */
 	ret = -EINVAL;
-	if (!f.file->f_mapping || !f.file->f_mapping->a_ops ||
-	    !S_ISREG(file_inode(f.file)->i_mode))
+	if (!f.file->f_mapping || !f.file->f_mapping->a_ops)
 		goto out;
 
 	ret = vfs_fadvise(f.file, offset, count, POSIX_FADV_WILLNEED);
Signature · 1 line
2.34.1
maintainer Applied
#1 lore raw
Quoted 8 lines · Reuben Hawkins

Readahead was factored to call generic_fadvise. That refactor added an S_ISREG restriction which broke readahead on block devices.

This change removes the S_ISREG restriction to fix block device readahead. The change also means that readahead will return -ESPIPE on FIFO files instead of -EINVAL.

[...]

Applied to the vfs.misc branch of the vfs/vfs.git tree. Patches in the vfs.misc branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.misc

[1/1] vfs: fix readahead(2) on block devices

      https://git.kernel.org/vfs/vfs/c/d05ad99006a6
Reviewed-by on v2 1/1
#2 lore raw
In reply to Reuben Hawkins
Quoted 11 lines · Reuben Hawkins

Readahead was factored to call generic_fadvise. That refactor added an S_ISREG restriction which broke readahead on block devices.

This change removes the S_ISREG restriction to fix block device readahead. The change also means that readahead will return -ESPIPE on FIFO files instead of -EINVAL.

Fixes 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED")

---

Christian,

I suggest adding the link to the original bug report on commit:

Thanks,
Amir.

Quoted 20 lines
 mm/readahead.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/readahead.c +1 -3
index e815c114de21..ef3b23a41973 100644
@@ -734,8 +734,7 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count)
         * on this file, then we must return -EINVAL.
         */
        ret = -EINVAL;
-       if (!f.file->f_mapping || !f.file->f_mapping->a_ops ||
-           !S_ISREG(file_inode(f.file)->i_mode))
+       if (!f.file->f_mapping || !f.file->f_mapping->a_ops)
                goto out;
 
        ret = vfs_fadvise(f.file, offset, count, POSIX_FADV_WILLNEED);
--

2.34.1

maintainer Reviewed-by on v2 1/1
#3 lore raw
In reply to Reuben Hawkins
Quoted 9 lines · Reuben Hawkins

Readahead was factored to call generic_fadvise. That refactor added an S_ISREG restriction which broke readahead on block devices.

This change removes the S_ISREG restriction to fix block device readahead. The change also means that readahead will return -ESPIPE on FIFO files instead of -EINVAL.

Fixes 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED")

Nice catch! Feel free to add:

Honza

Quoted 21 lines
---
 mm/readahead.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/readahead.c +1 -2
index e815c114de21..ef3b23a41973 100644
@@ -734,8 +734,7 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count)
 	 * on this file, then we must return -EINVAL.
 	 */
 	ret = -EINVAL;
-	if (!f.file->f_mapping || !f.file->f_mapping->a_ops ||
-	    !S_ISREG(file_inode(f.file)->i_mode))
+	if (!f.file->f_mapping || !f.file->f_mapping->a_ops)
 		goto out;
 
 	ret = vfs_fadvise(f.file, offset, count, POSIX_FADV_WILLNEED);
Signature · 1 line
2.34.1
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR