splice simplification
Subsystems (31)
Hi all,
this series (which is on top of the previews readv/writev patches) cleans up the splice read/write support a bit. The first patch implicitly uses the iov_iter based implementations unless explcitiy splice read/write methods are set. This removes a lot of churn, and wires up proper splice for many file systems that implement read_iter / write_iter but didn't bother to wire up the splice methods. The second patch then removes the old default splice fallback methods as everything that matters now uses explicit methods or the iov_iter based implementations. The last once marks vfs_readv and vfs_writev static as they are internal helpers for fs/read_write.c now.
PATCH 1/3 splice: default to iter based versions implicitly
If a file_operations instance has the read or write iter methods we should use the iter based splice code by default. We still allow to overide it with explicit ->read_iter and ->write_iter methods, but few of them are left, and there is a non-zero chance that we could get rid of them in the future.
--- drivers/staging/lustre/lustre/llite/file.c | 3 --- fs/adfs/file.c | 1 - fs/affs/file.c | 1 - fs/afs/file.c | 1 - fs/bfs/file.c | 1 - fs/block_dev.c | 2 -- fs/btrfs/file.c | 1 - fs/ceph/file.c | 2 -- fs/cifs/cifsfs.c | 6 ------ fs/coda/file.c | 1 - fs/ecryptfs/file.c | 1 - fs/exofs/file.c | 2 -- fs/ext2/file.c | 2 -- fs/ext4/file.c | 2 -- fs/f2fs/file.c | 2 -- fs/fat/file.c | 1 - fs/fuse/file.c | 1 - fs/gfs2/file.c | 2 -- fs/hfs/inode.c | 1 - fs/hfsplus/inode.c | 1 - fs/hostfs/hostfs_kern.c | 1 - fs/hpfs/file.c | 1 - fs/jffs2/file.c | 1 - fs/jfs/file.c | 2 -- fs/minix/file.c | 1 - fs/nfs/file.c | 2 -- fs/nfs/nfs4file.c | 2 -- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/vfs.c | 3 ++- fs/nilfs2/file.c | 1 - fs/ntfs/file.c | 1 - fs/ocfs2/file.c | 4 ---- fs/omfs/file.c | 1 - fs/ramfs/file-mmu.c | 2 -- fs/ramfs/file-nommu.c | 2 -- fs/read_write.c | 1 - fs/reiserfs/file.c | 2 -- fs/romfs/mmap-nommu.c | 1 - fs/splice.c | 9 ++++++--- fs/sysv/file.c | 1 - fs/ubifs/file.c | 2 -- fs/udf/file.c | 1 - fs/ufs/file.c | 1 - fs/xfs/xfs_file.c | 2 -- include/linux/fs.h | 2 -- mm/shmem.c | 2 -- 46 files changed, 9 insertions(+), 75 deletions(-)
drivers/staging/lustre/lustre/llite/file.c +0 -3
@@ -3122,7 +3122,6 @@ struct file_operations ll_file_operations = { .release = ll_file_release, .mmap = ll_file_mmap, .llseek = ll_file_seek, - .splice_read = generic_file_splice_read, .fsync = ll_fsync, .flush = ll_flush };
@@ -3135,7 +3134,6 @@ struct file_operations ll_file_operations_flock = { .release = ll_file_release, .mmap = ll_file_mmap, .llseek = ll_file_seek, - .splice_read = generic_file_splice_read, .fsync = ll_fsync, .flush = ll_flush, .flock = ll_file_flock,
@@ -3151,7 +3149,6 @@ struct file_operations ll_file_operations_noflock = { .release = ll_file_release, .mmap = ll_file_mmap, .llseek = ll_file_seek, - .splice_read = generic_file_splice_read, .fsync = ll_fsync, .flush = ll_flush, .flock = ll_file_noflock,
fs/adfs/file.c +0 -1
@@ -27,7 +27,6 @@ const struct file_operations adfs_file_operations = { .mmap = generic_file_mmap, .fsync = generic_file_fsync, .write_iter = generic_file_write_iter, - .splice_read = generic_file_splice_read, };const struct inode_operations adfs_file_inode_operations = {
fs/affs/file.c +0 -1
@@ -974,7 +974,6 @@ const struct file_operations affs_file_operations = { .open = affs_file_open, .release = affs_file_release, .fsync = affs_file_fsync, - .splice_read = generic_file_splice_read, };const struct inode_operations affs_file_inode_operations = {
fs/afs/file.c +0 -1
@@ -36,7 +36,6 @@ const struct file_operations afs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = afs_file_write, .mmap = generic_file_readonly_mmap, - .splice_read = generic_file_splice_read, .fsync = afs_fsync, .lock = afs_lock, .flock = afs_flock,
fs/bfs/file.c +0 -1
@@ -26,7 +26,6 @@ const struct file_operations bfs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, - .splice_read = generic_file_splice_read, }; static int bfs_move_block(unsigned long from, unsigned long to,
fs/block_dev.c +0 -2
@@ -2027,8 +2027,6 @@ const struct file_operations def_blk_fops = {#ifdef CONFIG_COMPAT .compat_ioctl = compat_blkdev_ioctl, #endif - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fallocate = blkdev_fallocate, };
fs/btrfs/file.c +0 -1
@@ -3074,7 +3074,6 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int whence)const struct file_operations btrfs_file_operations = { .llseek = btrfs_file_llseek, .read_iter = generic_file_read_iter, - .splice_read = generic_file_splice_read, .write_iter = btrfs_file_write_iter, .mmap = btrfs_file_mmap, .open = generic_file_open,
fs/ceph/file.c +0 -2
@@ -1721,8 +1721,6 @@ const struct file_operations ceph_file_fops = { .fsync = ceph_fsync, .lock = ceph_lock, .flock = ceph_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .unlocked_ioctl = ceph_ioctl, .compat_ioctl = ceph_ioctl, .fallocate = ceph_fallocate,
fs/cifs/cifsfs.c +0 -6
@@ -1068,7 +1068,6 @@ const struct file_operations cifs_file_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range,
@@ -1086,7 +1085,6 @@ const struct file_operations cifs_file_strict_ops = { .fsync = cifs_strict_fsync, .flush = cifs_flush, .mmap = cifs_file_strict_mmap, - .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range,
@@ -1105,7 +1103,6 @@ const struct file_operations cifs_file_direct_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range,
@@ -1122,7 +1119,6 @@ const struct file_operations cifs_file_nobrl_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range,
@@ -1139,7 +1135,6 @@ const struct file_operations cifs_file_strict_nobrl_ops = { .fsync = cifs_strict_fsync, .flush = cifs_flush, .mmap = cifs_file_strict_mmap, - .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range,
@@ -1157,7 +1152,6 @@ const struct file_operations cifs_file_direct_nobrl_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range,
fs/coda/file.c +0 -1
@@ -204,6 +204,5 @@ const struct file_operations coda_file_operations = { .open = coda_open, .release = coda_release, .fsync = coda_fsync, - .splice_read = generic_file_splice_read, };
fs/ecryptfs/file.c +0 -1
@@ -422,5 +422,4 @@ const struct file_operations ecryptfs_main_fops = { .release = ecryptfs_release, .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, - .splice_read = generic_file_splice_read, };
fs/exofs/file.c +0 -2
@@ -74,8 +74,6 @@ const struct file_operations exofs_file_operations = { .release = exofs_release_file, .fsync = exofs_file_fsync, .flush = exofs_flush, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, };const struct inode_operations exofs_file_inode_operations = {
fs/ext2/file.c +0 -2
@@ -217,8 +217,6 @@ const struct file_operations ext2_file_operations = { .release = ext2_release_file, .fsync = ext2_fsync, .get_unmapped_area = thp_get_unmapped_area, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, };const struct inode_operations ext2_file_inode_operations = {
fs/ext4/file.c +0 -2
@@ -750,8 +750,6 @@ const struct file_operations ext4_file_operations = { .release = ext4_release_file, .fsync = ext4_sync_file, .get_unmapped_area = thp_get_unmapped_area, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fallocate = ext4_fallocate, };
fs/f2fs/file.c +0 -2
@@ -2404,6 +2404,4 @@ const struct file_operations f2fs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = f2fs_compat_ioctl,#endif - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, };
fs/fat/file.c +0 -1
@@ -180,7 +180,6 @@ const struct file_operations fat_file_operations = { .compat_ioctl = fat_generic_compat_ioctl, #endif .fsync = fat_file_fsync, - .splice_read = generic_file_splice_read, .fallocate = fat_fallocate, };
fs/fuse/file.c +0 -1
@@ -3015,7 +3015,6 @@ static const struct file_operations fuse_file_operations = { .fsync = fuse_fsync, .lock = fuse_file_lock, .flock = fuse_file_flock, - .splice_read = generic_file_splice_read, .unlocked_ioctl = fuse_file_ioctl, .compat_ioctl = fuse_file_compat_ioctl, .poll = fuse_file_poll,
fs/gfs2/file.c +0 -2
@@ -1120,7 +1120,6 @@ const struct file_operations gfs2_file_fops = { .fsync = gfs2_fsync, .lock = gfs2_lock, .flock = gfs2_flock, - .splice_read = generic_file_splice_read, .splice_write = gfs2_file_splice_write, .setlease = simple_nosetlease, .fallocate = gfs2_fallocate,
@@ -1148,7 +1147,6 @@ const struct file_operations gfs2_file_fops_nolock = { .open = gfs2_open, .release = gfs2_release, .fsync = gfs2_fsync, - .splice_read = generic_file_splice_read, .splice_write = gfs2_file_splice_write, .setlease = generic_setlease, .fallocate = gfs2_fallocate,
fs/hfs/inode.c +0 -1
@@ -680,7 +680,6 @@ static const struct file_operations hfs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, - .splice_read = generic_file_splice_read, .fsync = hfs_file_fsync, .open = hfs_file_open, .release = hfs_file_release,
fs/hfsplus/inode.c +0 -1
@@ -346,7 +346,6 @@ static const struct file_operations hfsplus_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, - .splice_read = generic_file_splice_read, .fsync = hfsplus_file_fsync, .open = hfsplus_file_open, .release = hfsplus_file_release,
fs/hostfs/hostfs_kern.c +0 -1
@@ -387,7 +387,6 @@ static int hostfs_fsync(struct file *file, loff_t start, loff_t end,static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, - .splice_read = generic_file_splice_read, .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap,
fs/hpfs/file.c +0 -1
@@ -212,7 +212,6 @@ const struct file_operations hpfs_file_ops = .mmap = generic_file_mmap, .release = hpfs_file_release, .fsync = hpfs_file_fsync, - .splice_read = generic_file_splice_read, .unlocked_ioctl = hpfs_ioctl, };
fs/jffs2/file.c +0 -1
@@ -56,7 +56,6 @@ const struct file_operations jffs2_file_operations = .unlocked_ioctl=jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, - .splice_read = generic_file_splice_read, };/* jffs2_file_inode_operations */
fs/jfs/file.c +0 -2
@@ -154,8 +154,6 @@ const struct file_operations jfs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fsync = jfs_fsync, .release = jfs_release, .unlocked_ioctl = jfs_ioctl,
fs/minix/file.c +0 -1
@@ -18,7 +18,6 @@ const struct file_operations minix_file_operations = { .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, };static int minix_setattr (struct dentry *dentry,struct iattr *attr)
fs/nfs/file.c +0 -2
@@ -852,8 +852,6 @@ const struct file_operations nfs_file_operations = { .fsync = nfs_file_fsync, .lock = nfs_lock, .flock = nfs_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .check_flags = nfs_check_flags, .setlease = simple_nosetlease, };
fs/nfs/nfs4file.c +0 -2
@@ -248,8 +248,6 @@ const struct file_operations nfs4_file_operations = { .fsync = nfs_file_fsync, .lock = nfs_lock, .flock = nfs_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .check_flags = nfs_check_flags, .setlease = simple_nosetlease,#ifdef CONFIG_NFS_V4_2
fs/nfsd/nfs4xdr.c +1 -1
@@ -3579,7 +3579,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,if (read->rd_tmp_file) ra =nfsd_init_raparms (file); -if (file->f_op->splice_read && +if ((file->f_op->read_iter || file->f_op->splice_read) &&test_bit (RQ_SPLICE_OK , &resp->rqstp->rq_flags)) nfserr =nfsd4_encode_splice_read (resp, read, file, maxcount);else
fs/nfsd/vfs.c +2 -1
@@ -1032,7 +1032,8 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,trace_read_opened (rqstp, fhp, offset, vlen); -if (file->f_op->splice_read &&test_bit (RQ_SPLICE_OK , &rqstp->rq_flags)) +if ((file->f_op->read_iter || file->f_op->splice_read) && +test_bit (RQ_SPLICE_OK , &rqstp->rq_flags)) err =nfsd_splice_read (rqstp, file, offset, count);else err =nfsd_readv (file, offset, vec, vlen, count);
fs/nilfs2/file.c +0 -1
@@ -149,7 +149,6 @@ const struct file_operations nilfs_file_operations = { .open = generic_file_open, /* .release = nilfs_release_file, */ .fsync = nilfs_sync_file, - .splice_read = generic_file_splice_read, };const struct inode_operations nilfs_file_inode_operations = {
fs/ntfs/file.c +0 -1
@@ -2026,7 +2026,6 @@ const struct file_operations ntfs_file_ops = {#endif /* NTFS_RW */ .mmap = generic_file_mmap, .open = ntfs_file_open, - .splice_read = generic_file_splice_read, };const struct inode_operations ntfs_file_inode_ops = {
fs/ocfs2/file.c +0 -4
@@ -2531,8 +2531,6 @@ const struct file_operations ocfs2_fops = {#endif .lock = ocfs2_lock, .flock = ocfs2_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fallocate = ocfs2_fallocate, .clone_file_range = ocfs2_file_clone_range, .dedupe_file_range = ocfs2_file_dedupe_range,
@@ -2578,8 +2576,6 @@ const struct file_operations ocfs2_fops_no_plocks = { .compat_ioctl = ocfs2_compat_ioctl, #endif .flock = ocfs2_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fallocate = ocfs2_fallocate, .clone_file_range = ocfs2_file_clone_range, .dedupe_file_range = ocfs2_file_dedupe_range,
fs/omfs/file.c +0 -1
@@ -341,7 +341,6 @@ const struct file_operations omfs_file_operations = { .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, };static int omfs_setattr (struct dentry *dentry,struct iattr *attr)
fs/ramfs/file-mmu.c +0 -2
@@ -43,8 +43,6 @@ const struct file_operations ramfs_file_operations = { .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = noop_fsync, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .llseek = generic_file_llseek, .get_unmapped_area = ramfs_mmu_get_unmapped_area, };
fs/ramfs/file-nommu.c +0 -2
@@ -47,8 +47,6 @@ const struct file_operations ramfs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .fsync = noop_fsync, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .llseek = generic_file_llseek, };
fs/read_write.c +0 -1
@@ -28,7 +28,6 @@ const struct file_operations generic_ro_fops = { .llseek = generic_file_llseek, .read_iter = generic_file_read_iter, .mmap = generic_file_readonly_mmap, - .splice_read = generic_file_splice_read, };EXPORT_SYMBOL (generic_ro_fops);
fs/reiserfs/file.c +0 -2
@@ -253,8 +253,6 @@ const struct file_operations reiserfs_file_operations = { .fsync = reiserfs_sync_file, .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .llseek = generic_file_llseek, };
fs/romfs/mmap-nommu.c +0 -1
@@ -82,7 +82,6 @@ static unsigned romfs_mmap_capabilities(struct file *file)const struct file_operations romfs_ro_fops = { .llseek = generic_file_llseek, .read_iter = generic_file_read_iter, - .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, .mmap_capabilities = romfs_mmap_capabilities,
fs/splice.c +6 -3
@@ -280,7 +280,7 @@ void splice_shrink_spd(struct splice_pipe_desc *spd) }/** -* generic_file_splice_read - splice data from file to a pipe +* iter_file_splice_read - splice data from file to a pipe * @in: file to splice from * @ppos: position in @in * @pipe: pipe to splice to
@@ -292,7 +292,7 @@ void splice_shrink_spd(struct splice_pipe_desc *spd)* used as long as it has more or less sane ->read_iter(). * */ -ssize_t generic_file_splice_read (struct file *in,loff_t *ppos, +static ssize_t iter_file_splice_read (struct file *in,loff_t *ppos,struct pipe_inode_info *pipe,size_t len,unsigned int flags) {
@@ -322,7 +322,6 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,return ret; } -EXPORT_SYMBOL (generic_file_splice_read);const struct pipe_buf_operations default_pipe_buf_ops = { .can_merge =0 ,
@@ -861,6 +860,8 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,if (out->f_op->splice_write) splice_write = out->f_op->splice_write; +else if (out->f_op->write_iter) + splice_write = iter_file_splice_write;else splice_write = default_file_splice_write;
@@ -890,6 +891,8 @@ static long do_splice_to(struct file *in, loff_t *ppos,if (in->f_op->splice_read) splice_read = in->f_op->splice_read; +else if (in->f_op->read_iter) + splice_read = iter_file_splice_read;else splice_read = default_file_splice_read;
fs/sysv/file.c +0 -1
@@ -25,7 +25,6 @@ const struct file_operations sysv_file_operations = { .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, };static int sysv_setattr (struct dentry *dentry,struct iattr *attr)
fs/ubifs/file.c +0 -2
@@ -1748,8 +1748,6 @@ const struct file_operations ubifs_file_operations = { .mmap = ubifs_file_mmap, .fsync = ubifs_fsync, .unlocked_ioctl = ubifs_ioctl, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .open = ubifs_file_open, #ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,
fs/udf/file.c +0 -1
@@ -244,7 +244,6 @@ const struct file_operations udf_file_operations = { .write_iter = udf_file_write_iter, .release = udf_release_file, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, .llseek = generic_file_llseek, };
fs/ufs/file.c +0 -1
@@ -40,5 +40,4 @@ const struct file_operations ufs_file_operations = { .mmap = generic_file_mmap, .open = generic_file_open, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, };
fs/xfs/xfs_file.c +0 -2
@@ -1520,8 +1520,6 @@ const struct file_operations xfs_file_operations = { .llseek = xfs_file_llseek, .read_iter = xfs_file_read_iter, .write_iter = xfs_file_write_iter, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .unlocked_ioctl = xfs_file_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = xfs_file_compat_ioctl,
include/linux/fs.h +0 -2
@@ -2802,8 +2802,6 @@ extern int blkdev_fsync(struct file *filp, loff_t start, loff_t end,extern void block_sync_page (struct page *page);/* fs/splice.c */ -extern ssize_t generic_file_splice_read (struct file *,loff_t *, -struct pipe_inode_info *,size_t ,unsigned int );extern ssize_t iter_file_splice_write (struct pipe_inode_info *,struct file *,loff_t *,size_t ,unsigned int ); extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
mm/shmem.c +0 -2
@@ -3843,8 +3843,6 @@ 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_write = iter_file_splice_write, .fallocate = shmem_fallocate,#endif };
Signature · 1 line
2.11.0
Re: [PATCH 1/3] splice: default to iter based versions implicitly
Quoted 47 lines · Christoph Hellwig
If a
file_operationsinstance has the read or write iter methods we should use the iter based splice code by default. We still allow to overide it with explicit ->read_iter and ->write_iter methods, but few of them are left, and there is a non-zero chance that we could get rid of them in the future.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/staging/lustre/lustre/llite/file.c | 3 --- fs/adfs/file.c | 1 - fs/affs/file.c | 1 - fs/afs/file.c | 1 - fs/bfs/file.c | 1 - fs/block_dev.c | 2 -- fs/btrfs/file.c | 1 - fs/ceph/file.c | 2 -- fs/cifs/cifsfs.c | 6 ------ fs/coda/file.c | 1 - fs/ecryptfs/file.c | 1 - fs/exofs/file.c | 2 -- fs/ext2/file.c | 2 -- fs/ext4/file.c | 2 -- fs/f2fs/file.c | 2 -- fs/fat/file.c | 1 - fs/fuse/file.c | 1 - fs/gfs2/file.c | 2 -- fs/hfs/inode.c | 1 - fs/hfsplus/inode.c | 1 - fs/hostfs/hostfs_kern.c | 1 - fs/hpfs/file.c | 1 - fs/jffs2/file.c | 1 - fs/jfs/file.c | 2 -- fs/minix/file.c | 1 - fs/nfs/file.c | 2 -- fs/nfs/nfs4file.c | 2 -- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/vfs.c | 3 ++- fs/nilfs2/file.c | 1 - fs/ntfs/file.c | 1 - fs/ocfs2/file.c | 4 ---- fs/omfs/file.c | 1 - fs/ramfs/file-mmu.c | 2 -- fs/ramfs/file-nommu.c | 2 -- fs/read_write.c | 1 - fs/reiserfs/file.c | 2 -- fs/romfs/mmap-nommu.c | 1 - fs/splice.c | 9 ++++++---
Quoted 9 lines
fs/sysv/file.c | 1 - fs/ubifs/file.c | 2 -- fs/udf/file.c | 1 - fs/ufs/file.c | 1 - fs/xfs/xfs_file.c | 2 -- include/linux/fs.h | 2 -- mm/shmem.c | 2 -- 46 files changed, 9 insertions(+), 75 deletions(-)
Love that diffstat:
Quoted 666 lines
drivers/staging/lustre/lustre/llite/file.c +0
-3@@ -3122,7 +3122,6 @@ struct file_operations ll_file_operations = { .release = ll_file_release, .mmap = ll_file_mmap, .llseek = ll_file_seek, - .splice_read = generic_file_splice_read, .fsync = ll_fsync, .flush = ll_flush };@@ -3135,7 +3134,6 @@ struct file_operations ll_file_operations_flock = { .release = ll_file_release, .mmap = ll_file_mmap, .llseek = ll_file_seek, - .splice_read = generic_file_splice_read, .fsync = ll_fsync, .flush = ll_flush, .flock = ll_file_flock,@@ -3151,7 +3149,6 @@ struct file_operations ll_file_operations_noflock = { .release = ll_file_release, .mmap = ll_file_mmap, .llseek = ll_file_seek, - .splice_read = generic_file_splice_read, .fsync = ll_fsync, .flush = ll_flush, .flock = ll_file_noflock,fs/adfs/file.c +0
-1@@ -27,7 +27,6 @@ const struct file_operations adfs_file_operations = { .mmap = generic_file_mmap, .fsync = generic_file_fsync, .write_iter = generic_file_write_iter, - .splice_read = generic_file_splice_read, };const struct inode_operations adfs_file_inode_operations = {fs/affs/file.c +0
-1@@ -974,7 +974,6 @@ const struct file_operations affs_file_operations = { .open = affs_file_open, .release = affs_file_release, .fsync = affs_file_fsync, - .splice_read = generic_file_splice_read, };const struct inode_operations affs_file_inode_operations = {fs/afs/file.c +0
-1@@ -36,7 +36,6 @@ const struct file_operations afs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = afs_file_write, .mmap = generic_file_readonly_mmap, - .splice_read = generic_file_splice_read, .fsync = afs_fsync, .lock = afs_lock, .flock = afs_flock,fs/bfs/file.c +0
-1@@ -26,7 +26,6 @@ const struct file_operations bfs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, - .splice_read = generic_file_splice_read, }; static int bfs_move_block(unsigned long from, unsigned long to,fs/block_dev.c +0
-2@@ -2027,8 +2027,6 @@ const struct file_operations def_blk_fops = {#ifdef CONFIG_COMPAT .compat_ioctl = compat_blkdev_ioctl, #endif - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fallocate = blkdev_fallocate, };fs/btrfs/file.c +0
-1@@ -3074,7 +3074,6 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int whence)const struct file_operations btrfs_file_operations = { .llseek = btrfs_file_llseek, .read_iter = generic_file_read_iter, - .splice_read = generic_file_splice_read, .write_iter = btrfs_file_write_iter, .mmap = btrfs_file_mmap, .open = generic_file_open,fs/ceph/file.c +0
-2@@ -1721,8 +1721,6 @@ const struct file_operations ceph_file_fops = { .fsync = ceph_fsync, .lock = ceph_lock, .flock = ceph_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .unlocked_ioctl = ceph_ioctl, .compat_ioctl = ceph_ioctl, .fallocate = ceph_fallocate,fs/cifs/cifsfs.c +0
-6@@ -1068,7 +1068,6 @@ const struct file_operations cifs_file_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range,@@ -1086,7 +1085,6 @@ const struct file_operations cifs_file_strict_ops = { .fsync = cifs_strict_fsync, .flush = cifs_flush, .mmap = cifs_file_strict_mmap, - .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range,@@ -1105,7 +1103,6 @@ const struct file_operations cifs_file_direct_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range,@@ -1122,7 +1119,6 @@ const struct file_operations cifs_file_nobrl_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range,@@ -1139,7 +1135,6 @@ const struct file_operations cifs_file_strict_nobrl_ops = { .fsync = cifs_strict_fsync, .flush = cifs_flush, .mmap = cifs_file_strict_mmap, - .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range,@@ -1157,7 +1152,6 @@ const struct file_operations cifs_file_direct_nobrl_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, .unlocked_ioctl = cifs_ioctl, .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range,fs/coda/file.c +0
-1@@ -204,6 +204,5 @@ const struct file_operations coda_file_operations = { .open = coda_open, .release = coda_release, .fsync = coda_fsync, - .splice_read = generic_file_splice_read, };fs/ecryptfs/file.c +0
-1@@ -422,5 +422,4 @@ const struct file_operations ecryptfs_main_fops = { .release = ecryptfs_release, .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, - .splice_read = generic_file_splice_read, };fs/exofs/file.c +0
-2@@ -74,8 +74,6 @@ const struct file_operations exofs_file_operations = { .release = exofs_release_file, .fsync = exofs_file_fsync, .flush = exofs_flush, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, };const struct inode_operations exofs_file_inode_operations = {fs/ext2/file.c +0
-2@@ -217,8 +217,6 @@ const struct file_operations ext2_file_operations = { .release = ext2_release_file, .fsync = ext2_fsync, .get_unmapped_area = thp_get_unmapped_area, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, };const struct inode_operations ext2_file_inode_operations = {fs/ext4/file.c +0
-2@@ -750,8 +750,6 @@ const struct file_operations ext4_file_operations = { .release = ext4_release_file, .fsync = ext4_sync_file, .get_unmapped_area = thp_get_unmapped_area, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fallocate = ext4_fallocate, };fs/f2fs/file.c +0
-2@@ -2404,6 +2404,4 @@ const struct file_operations f2fs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = f2fs_compat_ioctl,#endif - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, };fs/fat/file.c +0
-1@@ -180,7 +180,6 @@ const struct file_operations fat_file_operations = { .compat_ioctl = fat_generic_compat_ioctl, #endif .fsync = fat_file_fsync, - .splice_read = generic_file_splice_read, .fallocate = fat_fallocate, };fs/fuse/file.c +0
-1@@ -3015,7 +3015,6 @@ static const struct file_operations fuse_file_operations = { .fsync = fuse_fsync, .lock = fuse_file_lock, .flock = fuse_file_flock, - .splice_read = generic_file_splice_read, .unlocked_ioctl = fuse_file_ioctl, .compat_ioctl = fuse_file_compat_ioctl, .poll = fuse_file_poll,fs/gfs2/file.c +0
-2@@ -1120,7 +1120,6 @@ const struct file_operations gfs2_file_fops = { .fsync = gfs2_fsync, .lock = gfs2_lock, .flock = gfs2_flock, - .splice_read = generic_file_splice_read, .splice_write = gfs2_file_splice_write, .setlease = simple_nosetlease, .fallocate = gfs2_fallocate,@@ -1148,7 +1147,6 @@ const struct file_operations gfs2_file_fops_nolock = { .open = gfs2_open, .release = gfs2_release, .fsync = gfs2_fsync, - .splice_read = generic_file_splice_read, .splice_write = gfs2_file_splice_write, .setlease = generic_setlease, .fallocate = gfs2_fallocate,fs/hfs/inode.c +0
-1@@ -680,7 +680,6 @@ static const struct file_operations hfs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, - .splice_read = generic_file_splice_read, .fsync = hfs_file_fsync, .open = hfs_file_open, .release = hfs_file_release,fs/hfsplus/inode.c +0
-1@@ -346,7 +346,6 @@ static const struct file_operations hfsplus_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, - .splice_read = generic_file_splice_read, .fsync = hfsplus_file_fsync, .open = hfsplus_file_open, .release = hfsplus_file_release,fs/hostfs/hostfs_kern.c +0
-1@@ -387,7 +387,6 @@ static int hostfs_fsync(struct file *file, loff_t start, loff_t end,static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, - .splice_read = generic_file_splice_read, .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap,fs/hpfs/file.c +0
-1@@ -212,7 +212,6 @@ const struct file_operations hpfs_file_ops = .mmap = generic_file_mmap, .release = hpfs_file_release, .fsync = hpfs_file_fsync, - .splice_read = generic_file_splice_read, .unlocked_ioctl = hpfs_ioctl, };fs/jffs2/file.c +0
-1@@ -56,7 +56,6 @@ const struct file_operations jffs2_file_operations = .unlocked_ioctl=jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, - .splice_read = generic_file_splice_read, };/* jffs2_file_inode_operations */ fs/jfs/file.c +0
-2@@ -154,8 +154,6 @@ const struct file_operations jfs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fsync = jfs_fsync, .release = jfs_release, .unlocked_ioctl = jfs_ioctl,fs/minix/file.c +0
-1@@ -18,7 +18,6 @@ const struct file_operations minix_file_operations = { .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, };static int minix_setattr (struct dentry *dentry,struct iattr *attr)fs/nfs/file.c +0
-2@@ -852,8 +852,6 @@ const struct file_operations nfs_file_operations = { .fsync = nfs_file_fsync, .lock = nfs_lock, .flock = nfs_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .check_flags = nfs_check_flags, .setlease = simple_nosetlease, };fs/nfs/nfs4file.c +0
-2@@ -248,8 +248,6 @@ const struct file_operations nfs4_file_operations = { .fsync = nfs_file_fsync, .lock = nfs_lock, .flock = nfs_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .check_flags = nfs_check_flags, .setlease = simple_nosetlease,#ifdef CONFIG_NFS_V4_2 fs/nfsd/nfs4xdr.c +1
-1@@ -3579,7 +3579,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,if (read->rd_tmp_file) ra =nfsd_init_raparms (file); -if (file->f_op->splice_read && +if ((file->f_op->read_iter || file->f_op->splice_read) &&test_bit (RQ_SPLICE_OK , &resp->rqstp->rq_flags)) nfserr =nfsd4_encode_splice_read (resp, read, file, maxcount);else fs/nfsd/vfs.c +2
-1@@ -1032,7 +1032,8 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,trace_read_opened (rqstp, fhp, offset, vlen); -if (file->f_op->splice_read &&test_bit (RQ_SPLICE_OK , &rqstp->rq_flags)) +if ((file->f_op->read_iter || file->f_op->splice_read) && +test_bit (RQ_SPLICE_OK , &rqstp->rq_flags)) err =nfsd_splice_read (rqstp, file, offset, count);else err =nfsd_readv (file, offset, vec, vlen, count);fs/nilfs2/file.c +0
-1@@ -149,7 +149,6 @@ const struct file_operations nilfs_file_operations = { .open = generic_file_open, /* .release = nilfs_release_file, */ .fsync = nilfs_sync_file, - .splice_read = generic_file_splice_read, };const struct inode_operations nilfs_file_inode_operations = {fs/ntfs/file.c +0
-1@@ -2026,7 +2026,6 @@ const struct file_operations ntfs_file_ops = {#endif /* NTFS_RW */ .mmap = generic_file_mmap, .open = ntfs_file_open, - .splice_read = generic_file_splice_read, };const struct inode_operations ntfs_file_inode_ops = {fs/ocfs2/file.c +0
-4@@ -2531,8 +2531,6 @@ const struct file_operations ocfs2_fops = {#endif .lock = ocfs2_lock, .flock = ocfs2_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fallocate = ocfs2_fallocate, .clone_file_range = ocfs2_file_clone_range, .dedupe_file_range = ocfs2_file_dedupe_range,@@ -2578,8 +2576,6 @@ const struct file_operations ocfs2_fops_no_plocks = { .compat_ioctl = ocfs2_compat_ioctl, #endif .flock = ocfs2_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .fallocate = ocfs2_fallocate, .clone_file_range = ocfs2_file_clone_range, .dedupe_file_range = ocfs2_file_dedupe_range,fs/omfs/file.c +0
-1@@ -341,7 +341,6 @@ const struct file_operations omfs_file_operations = { .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, };static int omfs_setattr (struct dentry *dentry,struct iattr *attr)fs/ramfs/file-mmu.c +0
-2@@ -43,8 +43,6 @@ const struct file_operations ramfs_file_operations = { .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = noop_fsync, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .llseek = generic_file_llseek, .get_unmapped_area = ramfs_mmu_get_unmapped_area, };fs/ramfs/file-nommu.c +0
-2@@ -47,8 +47,6 @@ const struct file_operations ramfs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .fsync = noop_fsync, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .llseek = generic_file_llseek, };fs/read_write.c +0
-1@@ -28,7 +28,6 @@ const struct file_operations generic_ro_fops = { .llseek = generic_file_llseek, .read_iter = generic_file_read_iter, .mmap = generic_file_readonly_mmap, - .splice_read = generic_file_splice_read, };EXPORT_SYMBOL (generic_ro_fops);fs/reiserfs/file.c +0
-2@@ -253,8 +253,6 @@ const struct file_operations reiserfs_file_operations = { .fsync = reiserfs_sync_file, .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .llseek = generic_file_llseek, };fs/romfs/mmap-nommu.c +0
-1@@ -82,7 +82,6 @@ static unsigned romfs_mmap_capabilities(struct file *file)const struct file_operations romfs_ro_fops = { .llseek = generic_file_llseek, .read_iter = generic_file_read_iter, - .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, .mmap_capabilities = romfs_mmap_capabilities,fs/splice.c +6
-3@@ -280,7 +280,7 @@ void splice_shrink_spd(struct splice_pipe_desc *spd) }/** -* generic_file_splice_read - splice data from file to a pipe +* iter_file_splice_read - splice data from file to a pipe * @in: file to splice from * @ppos: position in @in * @pipe: pipe to splice to @@ -292,7 +292,7 @@ void splice_shrink_spd(struct splice_pipe_desc *spd)* used as long as it has more or less sane ->read_iter(). * */ -ssize_t generic_file_splice_read (struct file *in,loff_t *ppos, +static ssize_t iter_file_splice_read (struct file *in,loff_t *ppos,struct pipe_inode_info *pipe,size_t len,unsigned int flags) {@@ -322,7 +322,6 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,return ret; } -EXPORT_SYMBOL (generic_file_splice_read);const struct pipe_buf_operations default_pipe_buf_ops = { .can_merge =0 ,@@ -861,6 +860,8 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,if (out->f_op->splice_write) splice_write = out->f_op->splice_write; +else if (out->f_op->write_iter) + splice_write = iter_file_splice_write;else splice_write = default_file_splice_write;@@ -890,6 +891,8 @@ static long do_splice_to(struct file *in, loff_t *ppos,if (in->f_op->splice_read) splice_read = in->f_op->splice_read; +else if (in->f_op->read_iter) + splice_read = iter_file_splice_read;else splice_read = default_file_splice_read;fs/sysv/file.c +0
-1@@ -25,7 +25,6 @@ const struct file_operations sysv_file_operations = { .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, };static int sysv_setattr (struct dentry *dentry,struct iattr *attr)fs/ubifs/file.c +0
-2@@ -1748,8 +1748,6 @@ const struct file_operations ubifs_file_operations = { .mmap = ubifs_file_mmap, .fsync = ubifs_fsync, .unlocked_ioctl = ubifs_ioctl, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .open = ubifs_file_open, #ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,fs/udf/file.c +0
-1@@ -244,7 +244,6 @@ const struct file_operations udf_file_operations = { .write_iter = udf_file_write_iter, .release = udf_release_file, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, .llseek = generic_file_llseek, };fs/ufs/file.c +0
-1@@ -40,5 +40,4 @@ const struct file_operations ufs_file_operations = { .mmap = generic_file_mmap, .open = generic_file_open, .fsync = generic_file_fsync, - .splice_read = generic_file_splice_read, };fs/xfs/xfs_file.c +0
-2@@ -1520,8 +1520,6 @@ const struct file_operations xfs_file_operations = { .llseek = xfs_file_llseek, .read_iter = xfs_file_read_iter, .write_iter = xfs_file_write_iter, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, .unlocked_ioctl = xfs_file_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = xfs_file_compat_ioctl,include/linux/fs.h +0
-2@@ -2802,8 +2802,6 @@ extern int blkdev_fsync(struct file *filp, loff_t start, loff_t end,extern void block_sync_page (struct page *page);/* fs/splice.c */ -extern ssize_t generic_file_splice_read (struct file *,loff_t *, -struct pipe_inode_info *,size_t ,unsigned int );extern ssize_t iter_file_splice_write (struct pipe_inode_info *,struct file *,loff_t *,size_t ,unsigned int ); extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,mm/shmem.c +0
-0
mm/shmem.c static const struct file_operations shmem_file_operations = { · line 3848
Quoted 8 lines
mm/shmem.c +0
-2@@ -3843,8 +3843,6 @@ 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_write = iter_file_splice_write, .fallocate = shmem_fallocate,#endif };
Al Viro
maintainerRe: [PATCH 1/3] splice: default to iter based versions implicitly
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
If a
file_operationsinstance has the read or write iter methods we should use the iter based splice code by default. We still allow to overide it with explicit ->read_iter and ->write_iter methods, but few of them are left, and there is a non-zero chance that we could get rid of them in the future.
->read_iter() side: you are changing behaviour for the following bunch:
arch/s390/hypfs/inode.c:437: .read_iter = hypfs_read_iter,
drivers/char/mem.c:798: .read_iter = read_iter_null, drivers/char/mem.c:813: .read_iter = read_iter_zero, drivers/char/mem.c:824: .read_iter = read_iter_zero, drivers/char/raw.c:286: .read_iter = blkdev_read_iter, drivers/net/tap.c:1134: .read_iter = tap_read_iter,
drivers/net/tun.c:2423: .read_iter = tun_chr_read_iter,drivers/usb/gadget/function/f_fs.c:1254: .read_iter = ffs_epfile_read_iter,drivers/usb/gadget/legacy/inode.c:704: .read_iter = ep_read_iter,drivers/vhost/net.c:1249: .read_iter = vhost_net_chr_read_iter,
fs/9p/vfs_file.c:641: .read_iter = generic_file_read_iter, fs/9p/vfs_file.c:652: .read_iter = generic_file_read_iter, fs/9p/vfs_file.c:664: .read_iter = v9fs_file_read_iter, fs/9p/vfs_file.c:675: .read_iter = v9fs_file_read_iter, fs/9p/vfs_file.c:687: .read_iter = v9fs_mmap_file_read_iter, fs/9p/vfs_file.c:698: .read_iter = v9fs_mmap_file_read_iter, fs/fuse/cuse.c:180: .read_iter = cuse_read_iter, fs/fuse/file.c:3027: .read_iter = fuse_direct_read_iter, fs/hugetlbfs/inode.c:980: .read_iter = hugetlbfs_read_iter, fs/ncpfs/file.c:248: .read_iter = ncp_file_read_iter, fs/orangefs/file.c:743: .read_iter = orangefs_file_read_iter, sound/core/pcm_native.c:3696: .read_iter = snd_pcm_readv,
All of them get generic_file_splice_read() for ->splice_read() (OK, modulo your renaming). For some of them it's clearly the right thing to do; however, that depends upon their ->read_iter() not doing anything that wouldn't work on ITER_PIPE ones. Which deserves an explanation in commit message, if nothing else.
ncpfs: OK
hugetlbfs: probably, but I would suggest testing that.
orangefs: OK
9p: can get nasty. It depends upon p9_client_read() being OK with ITER_PIPE. It probably shouldn't be too hard to get working, but at the moment I won't bet that it handles full pipe correctly, for example. At the very least, it needs testing; the interesting setup is virtio with non-caching 9p over it. fuse direct/cuse: *probably* should work (unless we already have bugs there, which is not impossible). Needs testing.drivers/char/mem: OKdrivers/char/raw: OK
hypfs: OK
vhost: dubious, but then so's read() there
gadget: might be OK, needs testing.
tun/tap: 100% *NOT* OK. ITER_PIPE won't work for those - not with skipping holes in the buffer. This is hopelessly broken; leaving a chunk of userland buffer unmodified is one thing, but doing that to page we are putting into pipe? No go. At the very least, it would need to turn that into iov_iter_zero(), followed by serious testing.
sound: fuck, no.
Al Viro
maintainerRe: [PATCH 1/3] splice: default to iter based versions implicitly
Quoted 8 lines · Al Viro
Quoted 5 lines · Christoph Hellwig
If a
file_operationsinstance has the read or write iter methods we should use the iter based splice code by default. We still allow to overide it with explicit ->read_iter and ->write_iter methods, but few of them are left, and there is a non-zero chance that we could get rid of them in the future.->read_iter() side: you are changing behaviour for the following bunch:
->write_iter(): a whole lot more changed ones; OTOH, ITER_BDEV is less painful that ITER_PIPE.
arch/s390/hypfs/inode.c:438: .write_iter = hypfs_write_iter,
drivers/bluetooth/hci_vhci.c:368: .write_iter = vhci_write, drivers/char/mem.c:814: .write_iter = write_iter_zero, drivers/char/raw.c:287: .write_iter = blkdev_write_iter,
drivers/infiniband/hw/hfi1/file_ops.c:110: .write_iter = hfi1_write_iter,drivers/infiniband/hw/qib/qib_file_ops.c:72: .write_iter = qib_write_iter,drivers/net/tap.c:1135: .write_iter = tap_write_iter,drivers/net/tun.c:2424: .write_iter = tun_chr_write_iter,
drivers/staging/lustre/lustre/llite/file.c:3119: .write_iter = ll_file_write_iter, drivers/staging/lustre/lustre/llite/file.c:3132: .write_iter = ll_file_write_iter, drivers/staging/lustre/lustre/llite/file.c:3148: .write_iter = ll_file_write_iter, drivers/usb/gadget/function/f_fs.c:1253: .write_iter = ffs_epfile_write_iter, drivers/usb/gadget/legacy/inode.c:705: .write_iter = ep_write_iter, drivers/vhost/net.c:1250: .write_iter = vhost_net_chr_write_iter, fs/9p/vfs_file.c:642: .write_iter = generic_file_write_iter, fs/9p/vfs_file.c:653: .write_iter = generic_file_write_iter, fs/9p/vfs_file.c:665: .write_iter = v9fs_file_write_iter, fs/9p/vfs_file.c:676: .write_iter = v9fs_file_write_iter, fs/9p/vfs_file.c:688: .write_iter = v9fs_mmap_file_write_iter, fs/9p/vfs_file.c:699: .write_iter = v9fs_mmap_file_write_iter, fs/adfs/file.c:29: .write_iter = generic_file_write_iter, fs/affs/file.c:972: .write_iter = generic_file_write_iter, fs/afs/file.c:37: .write_iter = afs_file_write, fs/bfs/file.c:27: .write_iter = generic_file_write_iter, fs/btrfs/file.c:3078: .write_iter = btrfs_file_write_iter, fs/cifs/cifsfs.c:1064: .write_iter = cifs_file_write_iter, fs/cifs/cifsfs.c:1082: .write_iter = cifs_strict_writev, fs/cifs/cifsfs.c:1101: .write_iter = cifs_user_writev, fs/cifs/cifsfs.c:1119: .write_iter = cifs_file_write_iter, fs/cifs/cifsfs.c:1136: .write_iter = cifs_strict_writev, fs/cifs/cifsfs.c:1154: .write_iter = cifs_user_writev, fs/coda/file.c:202: .write_iter = coda_file_write_iter, fs/ecryptfs/file.c:414: .write_iter = generic_file_write_iter, fs/fat/file.c:175: .write_iter = generic_file_write_iter, fs/fuse/cuse.c:181: .write_iter = cuse_write_iter, fs/fuse/file.c:3010: .write_iter = fuse_file_write_iter, fs/fuse/file.c:3028: .write_iter = fuse_direct_write_iter, fs/hfs/inode.c:681: .write_iter = generic_file_write_iter, fs/hfsplus/inode.c:347: .write_iter = generic_file_write_iter, fs/hostfs/hostfs_kern.c:392: .write_iter = generic_file_write_iter, fs/hpfs/file.c:211: .write_iter = generic_file_write_iter, fs/jffs2/file.c:55: .write_iter = generic_file_write_iter, fs/minix/file.c:18: .write_iter = generic_file_write_iter, fs/ncpfs/file.c:249: .write_iter = ncp_file_write_iter, fs/nilfs2/file.c:143: .write_iter = generic_file_write_iter, fs/ntfs/file.c:2024: .write_iter = ntfs_file_write_iter, fs/omfs/file.c:341: .write_iter = generic_file_write_iter, fs/orangefs/devorangefs-req.c:834: .write_iter = orangefs_devreq_write_iter, fs/orangefs/file.c:744: .write_iter = orangefs_file_write_iter, fs/sysv/file.c:25: .write_iter = generic_file_write_iter,
fs/udf/file.c:244: .write_iter = udf_file_write_iter,fs/ufs/file.c:39: .write_iter = generic_file_write_iter,kernel/printk/printk.c:999: .write_iter = devkmsg_write,sound/core/pcm_native.c:3682: .write_iter = snd_pcm_writev,
adfs, affs, afs, bfs, btrfs, coda, fat, ecryptfs, hfs, hfsplus, hostfs, hpfs, jffs2, minix, ncpfs, nilfs2, omfs, orangefs, sysv, udf, ufs: should be OK
ntfs: probably OK
9p: depends upon p9_client_write() safety, very likely to be OK.
cifs: probably OK
fuse/cuse: might be OK, needs testing
lustre: probably OKdrivers/char/mem: ought to use splice_write_null(), actually. drivers/char/raw: should be OK
gadgetfs: needs testing, might be OK
bluetooth, orangefs devreq, devkmsg, tun/tap, vhost: will break. These are datagram-oriented and currently pipe buffers serve as datagram boundaries. With this change the would get concatenated, with bogus results. hypfs, infinibarf, sound: fuck, no
PATCH 2/3 splice: remove the old default splice_read/splice_write implementations
In reply to Christoph HellwigEverything sensible now either has explicit splice_read/write methods or implements ->read_iter/->write_iter. Remove the old default implementations and just return -EINVAL in that case.
--- fs/splice.c | 112 ++---------------------------------------------------------- 1 file changed, 2 insertions(+), 110 deletions(-)
fs/splice.c +2 -110
@@ -347,22 +347,6 @@ const struct pipe_buf_operations nosteal_pipe_buf_ops = { };EXPORT_SYMBOL (nosteal_pipe_buf_ops); -static ssize_t kernel_readv (struct file *file,const struct kvec *vec, -unsigned long vlen,loff_t offset) -{ -mm_segment_t old_fs; -loff_t pos = offset; -ssize_t res; - - old_fs =get_fs (); -set_fs (get_ds ()); -/* The cast to a user pointer is valid due to the set_fs() */ - res =vfs_readv (file, (const struct iovec __user *)vec, vlen, &pos,0 ); -set_fs (old_fs); - -return res; -} -ssize_t kernel_write (struct file *file,const char *buf,size_t count,loff_t pos) {
@@ -379,71 +363,6 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count, }EXPORT_SYMBOL (kernel_write); -static ssize_t default_file_splice_read (struct file *in,loff_t *ppos, -struct pipe_inode_info *pipe,size_t len, -unsigned int flags) -{ -struct kvec *vec, __vec[PIPE_DEF_BUFFERS ]; -struct iov_iter to; -struct page **pages; -unsigned int nr_pages; -size_t offset, base, copied =0 ; -ssize_t res; -int i; - -if (pipe->nrbufs == pipe->buffers) -return -EAGAIN ; - -/* -* Try to keep page boundaries matching to source pagecache ones - -* it probably won't be much help, but... -*/ - offset = *ppos & ~PAGE_MASK ; - -iov_iter_pipe (&to,ITER_PIPE |READ , pipe, len + offset); - - res =iov_iter_get_pages_alloc (&to, &pages, len + offset, &base); -if (res <=0 ) -return -ENOMEM ; - - nr_pages =DIV_ROUND_UP (res + base,PAGE_SIZE ); - - vec = __vec; -if (nr_pages >PIPE_DEF_BUFFERS ) { - vec =kmalloc (nr_pages *sizeof (struct kvec ),GFP_KERNEL ); -if (unlikely (!vec)) { - res = -ENOMEM ; - goto out; - } - } - - pipe->bufs[to.idx].offset = offset; - pipe->bufs[to.idx].len -= offset; - -for (i =0 ; i < nr_pages; i++) { -size_t this_len =min_t (size_t, len,PAGE_SIZE - offset); - vec[i].iov_base =page_address (pages[i]) + offset; - vec[i].iov_len = this_len; - len -= this_len; - offset =0 ; - } - - res =kernel_readv (in, vec, nr_pages, *ppos); -if (res >0 ) { - copied = res; - *ppos += res; - } - -if (vec != __vec) -kfree (vec); -out: -for (i =0 ; i < nr_pages; i++) -put_page (pages[i]); -kvfree (pages); -iov_iter_advance (&to, copied);/* truncates and discards */ -return res; -} -/* * Send 'sd->len' bytes to socket from 'sd->file' at position 'sd->pos' * using sendpage(). Return the number of bytes sent.
@@ -801,33 +720,6 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,EXPORT_SYMBOL (iter_file_splice_write); -static int write_pipe_buf (struct pipe_inode_info *pipe,struct pipe_buffer *buf, -struct splice_desc *sd) -{ -int ret; -void *data; -loff_t tmp = sd->pos; - - data =kmap (buf->page); - ret =__kernel_write (sd->u.file, data + buf->offset, sd->len, &tmp); -kunmap (buf->page); - -return ret; -} - -static ssize_t default_file_splice_write (struct pipe_inode_info *pipe, -struct file *out,loff_t *ppos, -size_t len,unsigned int flags) -{ -ssize_t ret; - - ret =splice_from_pipe (pipe, out, ppos, len, flags, write_pipe_buf); -if (ret >0 ) - *ppos += ret; - -return ret; -} -/** * generic_splice_sendpage - splice data from a pipe to a socket * @pipe: pipe to splice from
@@ -863,7 +755,7 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,else if (out->f_op->write_iter) splice_write = iter_file_splice_write;else - splice_write = default_file_splice_write; +return -EINVAL ;return splice_write (pipe, out, ppos, len, flags); }
@@ -894,7 +786,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,else if (in->f_op->read_iter) splice_read = iter_file_splice_read;else - splice_read = default_file_splice_read; +return -EINVAL ;return splice_read (in, ppos, pipe, len, flags); }
Signature · 1 line
2.11.0
PATCH 3/3 fs: mark vfs_readv and vfs_writev static
In reply to Christoph HellwigUsers other than the syscalls should be using vfs_iter_read/write.
--- fs/read_write.c | 6 ++---- include/linux/fs.h | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-)
fs/read_write.c +2 -4
@@ -950,7 +950,7 @@ ssize_t vfs_iter_write(struct file *file, struct iov_iter *iter, loff_t *ppos, }EXPORT_SYMBOL (vfs_iter_write); -ssize_t vfs_readv (struct file *file,const struct iovec __user *vec, +static ssize_t vfs_readv (struct file *file,const struct iovec __user *vec,unsigned long vlen,loff_t *pos,int flags) {struct iovec iovstack[UIO_FASTIOV ];
@@ -966,9 +966,8 @@ ssize_t vfs_readv(struct file *file, const struct iovec __user *vec,return ret; } -EXPORT_SYMBOL (vfs_readv); -ssize_t vfs_writev (struct file *file,const struct iovec __user *vec, +static ssize_t vfs_writev (struct file *file,const struct iovec __user *vec,unsigned long vlen,loff_t *pos,int flags) {struct iovec iovstack[UIO_FASTIOV ];
@@ -983,7 +982,6 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec, }return ret; } -EXPORT_SYMBOL (vfs_writev);static ssize_t do_readv (unsigned long fd,const struct iovec __user *vec,unsigned long vlen,int flags)
include/linux/fs.h +0 -4
@@ -1754,10 +1754,6 @@ extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);extern ssize_t __vfs_write (struct file *,const char __user *,size_t ,loff_t *);extern ssize_t vfs_read (struct file *,char __user *,size_t ,loff_t *);extern ssize_t vfs_write (struct file *,const char __user *,size_t ,loff_t *); -extern ssize_t vfs_readv (struct file *,const struct iovec __user *, -unsigned long ,loff_t *,int ); -extern ssize_t vfs_writev (struct file *,const struct iovec __user *, -unsigned long ,loff_t *,int );extern ssize_t vfs_copy_file_range (struct file *,loff_t ,struct file *,loff_t ,size_t ,unsigned int ); extern int vfs_clone_file_prep_inodes(struct inode *inode_in, loff_t pos_in,
Signature · 1 line
2.11.0