From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, miklos@szeredi.hu Cc: virtio-fs@redhat.com, vgoyal@redhat.com, stefanha@redhat.com, dgilbert@redhat.com, Miklos Szeredi <mszeredi@redhat.com> Subject: [PATCH 02/13] fuse: Use default_file_splice_read for direct IO Date: Wed, 21 Aug 2019 13:37:31 -0400 [thread overview] Message-ID: <20190821173742.24574-3-vgoyal@redhat.com> (raw) In-Reply-To: <20190821173742.24574-1-vgoyal@redhat.com> From: Miklos Szeredi <mszeredi@redhat.com> --- fs/fuse/file.c | 15 ++++++++++++++- fs/splice.c | 3 ++- include/linux/fs.h | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 5ae2828beb00..c45ffe6f1ecb 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -2172,6 +2172,19 @@ static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma) return 0; } +static ssize_t fuse_file_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) +{ + struct fuse_file *ff = in->private_data; + + if (ff->open_flags & FOPEN_DIRECT_IO) + return default_file_splice_read(in, ppos, pipe, len, flags); + else + return generic_file_splice_read(in, ppos, pipe, len, flags); + +} + static int convert_fuse_file_lock(struct fuse_conn *fc, const struct fuse_file_lock *ffl, struct file_lock *fl) @@ -3228,7 +3241,7 @@ 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, + .splice_read = fuse_file_splice_read, .splice_write = iter_file_splice_write, .unlocked_ioctl = fuse_file_ioctl, .compat_ioctl = fuse_file_compat_ioctl, diff --git a/fs/splice.c b/fs/splice.c index 98412721f056..652f541d953d 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -362,7 +362,7 @@ static ssize_t kernel_readv(struct file *file, const struct kvec *vec, return res; } -static ssize_t default_file_splice_read(struct file *in, loff_t *ppos, +ssize_t default_file_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) { @@ -426,6 +426,7 @@ static ssize_t default_file_splice_read(struct file *in, loff_t *ppos, iov_iter_advance(&to, copied); /* truncates and discards */ return res; } +EXPORT_SYMBOL(default_file_splice_read); /* * Send 'sd->len' bytes to socket from 'sd->file' at position 'sd->pos' diff --git a/include/linux/fs.h b/include/linux/fs.h index 997a530ff4e9..15ae8f5dd24e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3062,6 +3062,8 @@ 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 default_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, -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, miklos@szeredi.hu Cc: virtio-fs@redhat.com, Miklos Szeredi <mszeredi@redhat.com>, vgoyal@redhat.com Subject: [Virtio-fs] [PATCH 02/13] fuse: Use default_file_splice_read for direct IO Date: Wed, 21 Aug 2019 13:37:31 -0400 [thread overview] Message-ID: <20190821173742.24574-3-vgoyal@redhat.com> (raw) In-Reply-To: <20190821173742.24574-1-vgoyal@redhat.com> From: Miklos Szeredi <mszeredi@redhat.com> --- fs/fuse/file.c | 15 ++++++++++++++- fs/splice.c | 3 ++- include/linux/fs.h | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 5ae2828beb00..c45ffe6f1ecb 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -2172,6 +2172,19 @@ static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma) return 0; } +static ssize_t fuse_file_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) +{ + struct fuse_file *ff = in->private_data; + + if (ff->open_flags & FOPEN_DIRECT_IO) + return default_file_splice_read(in, ppos, pipe, len, flags); + else + return generic_file_splice_read(in, ppos, pipe, len, flags); + +} + static int convert_fuse_file_lock(struct fuse_conn *fc, const struct fuse_file_lock *ffl, struct file_lock *fl) @@ -3228,7 +3241,7 @@ 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, + .splice_read = fuse_file_splice_read, .splice_write = iter_file_splice_write, .unlocked_ioctl = fuse_file_ioctl, .compat_ioctl = fuse_file_compat_ioctl, diff --git a/fs/splice.c b/fs/splice.c index 98412721f056..652f541d953d 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -362,7 +362,7 @@ static ssize_t kernel_readv(struct file *file, const struct kvec *vec, return res; } -static ssize_t default_file_splice_read(struct file *in, loff_t *ppos, +ssize_t default_file_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) { @@ -426,6 +426,7 @@ static ssize_t default_file_splice_read(struct file *in, loff_t *ppos, iov_iter_advance(&to, copied); /* truncates and discards */ return res; } +EXPORT_SYMBOL(default_file_splice_read); /* * Send 'sd->len' bytes to socket from 'sd->file' at position 'sd->pos' diff --git a/include/linux/fs.h b/include/linux/fs.h index 997a530ff4e9..15ae8f5dd24e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3062,6 +3062,8 @@ 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 default_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, -- 2.20.1
next prev parent reply other threads:[~2019-08-21 17:38 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-21 17:37 [PATCH v3 00/13] virtio-fs: shared file system for virtual machines Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 01/13] fuse: delete dentry if timeout is zero Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` Vivek Goyal [this message] 2019-08-21 17:37 ` [Virtio-fs] [PATCH 02/13] fuse: Use default_file_splice_read for direct IO Vivek Goyal 2019-08-28 7:45 ` Miklos Szeredi 2019-08-28 7:45 ` [Virtio-fs] " Miklos Szeredi 2019-08-28 12:27 ` Vivek Goyal 2019-08-28 12:27 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 03/13] fuse: export fuse_end_request() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 04/13] fuse: export fuse_len_args() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 05/13] fuse: Export fuse_send_init_request() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 06/13] fuse: export fuse_get_unique() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 07/13] Export fuse_dequeue_forget() function Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 08/13] fuse: extract fuse_fill_super_common() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 09/13] fuse: add fuse_iqueue_ops callbacks Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 10/13] fuse: Separate fuse device allocation and installation in fuse_conn Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 11/13] virtio_fs: add skeleton virtio_fs.ko module Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 12/13] virtio-fs: Do not provide abort interface in fusectl Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 13/13] init/do_mounts.c: add virtio_fs root fs support Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-29 9:28 ` [PATCH v3 00/13] virtio-fs: shared file system for virtual machines Miklos Szeredi 2019-08-29 9:28 ` [Virtio-fs] " Miklos Szeredi 2019-08-29 11:58 ` Vivek Goyal 2019-08-29 11:58 ` [Virtio-fs] " Vivek Goyal 2019-08-29 12:35 ` Stefan Hajnoczi 2019-08-29 12:35 ` [Virtio-fs] " Stefan Hajnoczi 2019-08-29 13:29 ` Vivek Goyal 2019-08-29 13:29 ` [Virtio-fs] " Vivek Goyal 2019-08-29 13:41 ` Miklos Szeredi 2019-08-29 13:41 ` [Virtio-fs] " Miklos Szeredi 2019-08-29 14:31 ` Vivek Goyal 2019-08-29 14:31 ` [Virtio-fs] " Vivek Goyal 2019-08-29 14:47 ` Miklos Szeredi 2019-08-29 14:47 ` [Virtio-fs] " Miklos Szeredi 2019-08-29 16:01 ` Vivek Goyal 2019-08-29 16:01 ` [Virtio-fs] " Vivek Goyal 2019-08-31 5:46 ` Miklos Szeredi 2019-08-31 5:46 ` [Virtio-fs] " Miklos Szeredi 2019-09-03 8:05 ` Miklos Szeredi 2019-09-03 8:05 ` [Virtio-fs] " Miklos Szeredi 2019-09-03 8:31 ` Michael S. Tsirkin 2019-09-03 8:31 ` Michael S. Tsirkin 2019-09-03 8:31 ` [Virtio-fs] " Michael S. Tsirkin 2019-09-03 9:17 ` Miklos Szeredi 2019-09-03 9:17 ` [Virtio-fs] " Miklos Szeredi 2019-09-04 15:54 ` Stefan Hajnoczi 2019-09-04 15:54 ` [Virtio-fs] " Stefan Hajnoczi 2019-09-04 15:54 ` Stefan Hajnoczi 2019-09-03 14:07 ` Vivek Goyal 2019-09-03 14:07 ` [Virtio-fs] " Vivek Goyal 2019-09-03 14:12 ` Michael S. Tsirkin 2019-09-03 14:12 ` [Virtio-fs] " Michael S. Tsirkin 2019-09-03 14:18 ` Vivek Goyal 2019-09-03 14:18 ` [Virtio-fs] " Vivek Goyal 2019-09-03 17:15 ` Michael S. Tsirkin 2019-09-03 17:15 ` [Virtio-fs] " Michael S. Tsirkin 2019-09-03 17:15 ` Michael S. Tsirkin 2019-09-03 14:18 ` Vivek Goyal 2019-09-03 14:12 ` Michael S. Tsirkin 2019-09-03 14:07 ` Vivek Goyal
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=20190821173742.24574-3-vgoyal@redhat.com \ --to=vgoyal@redhat.com \ --cc=dgilbert@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=mszeredi@redhat.com \ --cc=stefanha@redhat.com \ --cc=virtio-fs@redhat.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.