Linux-Fsdevel Archive on lore.kernel.org help / color / mirror / Atom feed
From: Alessio Balsini <balsini@android.com> To: Miklos Szeredi <miklos@szeredi.hu> Cc: Akilesh Kailash <akailash@google.com>, Amir Goldstein <amir73il@gmail.com>, David Anderson <dvander@google.com>, Eric Yan <eric.yan@oneplus.com>, Jann Horn <jannh@google.com>, Jens Axboe <axboe@kernel.dk>, Martijn Coenen <maco@android.com>, Palmer Dabbelt <palmer@dabbelt.com>, Paul Lawrence <paullawrence@google.com>, Stefano Duo <stefanoduo@google.com>, Zimuzo Ezeozue <zezeozue@google.com>, fuse-devel@lists.sourceforge.net, kernel-team@android.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V8 2/3] fuse: Introduce synchronous read and write for passthrough Date: Fri, 11 Sep 2020 17:34:02 +0100 [thread overview] Message-ID: <20200911163403.79505-3-balsini@android.com> (raw) In-Reply-To: <20200911163403.79505-1-balsini@android.com> All the read and write operations performed on fuse_files which have the passthrough feature enabled are forwarded to the associated lower file system file. Sending the request directly to the lower file system avoids the userspace round-trip that, because of possible context switches and additional operations might reduce the overall performance, especially in those cases where caching doesn't help, for example in reads at random offsets. If a fuse_file has a lower file system file associated for passthrough can be verified by checking the validity of its passthrough_filp pointer, which is not null only passthrough has been successfully enabled via the appropriate ioctl(). When a read/write operation is requested for a FUSE file with passthrough enabled, the request is directly forwarded to the corresponding file_operations of the lower file system file. After the read/write operation is completed, the file stats change is notified (and propagated) to the lower file system. This change only implements synchronous requests in passthrough, returning an error in the case of ansynchronous operations, yet covering the majority of the use cases. Signed-off-by: Alessio Balsini <balsini@android.com> --- fs/fuse/file.c | 8 +++-- fs/fuse/fuse_i.h | 2 ++ fs/fuse/passthrough.c | 81 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 6c0ec742ce74..c3289ff0cd33 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1552,7 +1552,9 @@ static ssize_t fuse_file_read_iter(struct kiocb *iocb, struct iov_iter *to) if (is_bad_inode(file_inode(file))) return -EIO; - if (!(ff->open_flags & FOPEN_DIRECT_IO)) + if (ff->passthrough_filp) + return fuse_passthrough_read_iter(iocb, to); + else if (!(ff->open_flags & FOPEN_DIRECT_IO)) return fuse_cache_read_iter(iocb, to); else return fuse_direct_read_iter(iocb, to); @@ -1566,7 +1568,9 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from) if (is_bad_inode(file_inode(file))) return -EIO; - if (!(ff->open_flags & FOPEN_DIRECT_IO)) + if (ff->passthrough_filp) + return fuse_passthrough_write_iter(iocb, from); + else if (!(ff->open_flags & FOPEN_DIRECT_IO)) return fuse_cache_write_iter(iocb, from); else return fuse_direct_write_iter(iocb, from); diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 6c5166447905..21ba30a6a661 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1106,5 +1106,7 @@ void fuse_free_conn(struct fuse_conn *fc); int fuse_passthrough_setup(struct fuse_req *req, unsigned int fd); void fuse_passthrough_release(struct fuse_file *ff); +ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *to); +ssize_t fuse_passthrough_write_iter(struct kiocb *iocb, struct iov_iter *from); #endif /* _FS_FUSE_I_H */ diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c index 86ab4eafa7bf..44a78e02f45d 100644 --- a/fs/fuse/passthrough.c +++ b/fs/fuse/passthrough.c @@ -2,6 +2,87 @@ #include "fuse_i.h" +#include <linux/fs_stack.h> +#include <linux/fsnotify.h> +#include <linux/uio.h> + +static void fuse_copyattr(struct file *dst_file, struct file *src_file, + bool write) +{ + if (write) { + struct inode *dst = file_inode(dst_file); + struct inode *src = file_inode(src_file); + + fsnotify_modify(src_file); + fsstack_copy_inode_size(dst, src); + } else { + fsnotify_access(src_file); + } +} + + +ssize_t fuse_passthrough_read_iter(struct kiocb *iocb_fuse, + struct iov_iter *iter) +{ + ssize_t ret; + struct file *fuse_filp = iocb_fuse->ki_filp; + struct fuse_file *ff = fuse_filp->private_data; + struct file *passthrough_filp = ff->passthrough_filp; + + if (!iov_iter_count(iter)) + return 0; + + if (is_sync_kiocb(iocb_fuse)) { + struct kiocb iocb; + + kiocb_clone(&iocb, iocb_fuse, passthrough_filp); + ret = call_read_iter(passthrough_filp, &iocb, iter); + iocb_fuse->ki_pos = iocb.ki_pos; + if (ret >= 0) + fuse_copyattr(fuse_filp, passthrough_filp, false); + + } else { + ret = -EIO; + } + + return ret; +} + +ssize_t fuse_passthrough_write_iter(struct kiocb *iocb_fuse, + struct iov_iter *iter) +{ + ssize_t ret; + struct file *fuse_filp = iocb_fuse->ki_filp; + struct fuse_file *ff = fuse_filp->private_data; + struct inode *fuse_inode = file_inode(fuse_filp); + struct file *passthrough_filp = ff->passthrough_filp; + + if (!iov_iter_count(iter)) + return 0; + + inode_lock(fuse_inode); + + if (is_sync_kiocb(iocb_fuse)) { + struct kiocb iocb; + + kiocb_clone(&iocb, iocb_fuse, passthrough_filp); + + file_start_write(passthrough_filp); + ret = call_write_iter(passthrough_filp, &iocb, iter); + file_end_write(passthrough_filp); + + iocb_fuse->ki_pos = iocb.ki_pos; + if (ret > 0) + fuse_copyattr(fuse_filp, passthrough_filp, true); + } else { + ret = -EIO; + } + + inode_unlock(fuse_inode); + + return ret; +} + int fuse_passthrough_setup(struct fuse_req *req, unsigned int fd) { int ret; -- 2.28.0.618.gf4bc123cb7-goog
next prev parent reply other threads:[~2020-09-11 16:35 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-11 16:34 [PATCH V8 0/3] fuse: Add support for passthrough read/write Alessio Balsini 2020-09-11 16:34 ` [PATCH V8 1/3] fuse: Definitions and ioctl() for passthrough Alessio Balsini 2020-09-12 11:06 ` Amir Goldstein 2020-09-18 16:33 ` Alessio Balsini 2020-09-18 19:59 ` Amir Goldstein 2020-09-22 12:15 ` Alessio Balsini 2020-09-22 16:08 ` Amir Goldstein 2020-09-29 14:30 ` Alessio Balsini 2020-09-11 16:34 ` Alessio Balsini [this message] 2020-09-12 9:55 ` [PATCH V8 2/3] fuse: Introduce synchronous read and write " Amir Goldstein 2020-09-21 11:01 ` Alessio Balsini 2020-09-21 13:07 ` Amir Goldstein 2020-09-11 16:34 ` [PATCH V8 3/3] fuse: Handle AIO read and write in passthrough Alessio Balsini 2020-09-11 17:23 ` Jens Axboe 2020-09-21 15:28 ` Alessio Balsini 2020-09-11 18:46 ` [fuse-devel] [PATCH V8 0/3] fuse: Add support for passthrough read/write Antonio SJ Musumeci 2020-09-18 16:03 ` Alessio Balsini
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=20200911163403.79505-3-balsini@android.com \ --to=balsini@android.com \ --cc=akailash@google.com \ --cc=amir73il@gmail.com \ --cc=axboe@kernel.dk \ --cc=dvander@google.com \ --cc=eric.yan@oneplus.com \ --cc=fuse-devel@lists.sourceforge.net \ --cc=jannh@google.com \ --cc=kernel-team@android.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maco@android.com \ --cc=miklos@szeredi.hu \ --cc=palmer@dabbelt.com \ --cc=paullawrence@google.com \ --cc=stefanoduo@google.com \ --cc=zezeozue@google.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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).