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 3/3] fuse: Handle AIO read and write in passthrough Date: Fri, 11 Sep 2020 17:34:03 +0100 [thread overview] Message-ID: <20200911163403.79505-4-balsini@android.com> (raw) In-Reply-To: <20200911163403.79505-1-balsini@android.com> Extend the passthrough feature by handling asynchronous IO both for read and write operations. When an AIO request is received, targeting a FUSE file with passthrough functionality enabled, a new identical AIO request is created, the file pointer of which is updated with the file pointer of the lower file system, and the completion handler is set with a special AIO passthrough handler. The lower file system AIO request is allocated in dynamic kernel memory and, when it completes, the allocated memory is freed and the completion signal is propagated to the FUSE AIO request by triggering its completion callback as well. Signed-off-by: Alessio Balsini <balsini@android.com> --- fs/fuse/passthrough.c | 66 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c index 44a78e02f45d..87b57b26fd8a 100644 --- a/fs/fuse/passthrough.c +++ b/fs/fuse/passthrough.c @@ -2,10 +2,16 @@ #include "fuse_i.h" +#include <linux/aio.h> #include <linux/fs_stack.h> #include <linux/fsnotify.h> #include <linux/uio.h> +struct fuse_aio_req { + struct kiocb iocb; + struct kiocb *iocb_fuse; +}; + static void fuse_copyattr(struct file *dst_file, struct file *src_file, bool write) { @@ -20,6 +26,32 @@ static void fuse_copyattr(struct file *dst_file, struct file *src_file, } } +static void fuse_aio_cleanup_handler(struct fuse_aio_req *aio_req) +{ + struct kiocb *iocb = &aio_req->iocb; + struct kiocb *iocb_fuse = aio_req->iocb_fuse; + bool write = !!(iocb->ki_flags & IOCB_WRITE); + + if (write) { + __sb_writers_acquired(file_inode(iocb->ki_filp)->i_sb, + SB_FREEZE_WRITE); + file_end_write(iocb->ki_filp); + } + + fuse_copyattr(iocb_fuse->ki_filp, iocb->ki_filp, write); + iocb_fuse->ki_pos = iocb->ki_pos; + kfree(aio_req); +} + +static void fuse_aio_rw_complete(struct kiocb *iocb, long res, long res2) +{ + struct fuse_aio_req *aio_req = + container_of(iocb, struct fuse_aio_req, iocb); + struct kiocb *iocb_fuse = aio_req->iocb_fuse; + + fuse_aio_cleanup_handler(aio_req); + iocb_fuse->ki_complete(iocb_fuse, res, res2); +} ssize_t fuse_passthrough_read_iter(struct kiocb *iocb_fuse, struct iov_iter *iter) @@ -42,7 +74,18 @@ ssize_t fuse_passthrough_read_iter(struct kiocb *iocb_fuse, fuse_copyattr(fuse_filp, passthrough_filp, false); } else { - ret = -EIO; + struct fuse_aio_req *aio_req; + + aio_req = kmalloc(sizeof(struct fuse_aio_req), GFP_KERNEL); + if (!aio_req) + return -ENOMEM; + + aio_req->iocb_fuse = iocb_fuse; + kiocb_clone(&aio_req->iocb, iocb_fuse, passthrough_filp); + aio_req->iocb.ki_complete = fuse_aio_rw_complete; + ret = call_read_iter(passthrough_filp, &aio_req->iocb, iter); + if (ret != -EIOCBQUEUED) + fuse_aio_cleanup_handler(aio_req); } return ret; @@ -56,6 +99,7 @@ ssize_t fuse_passthrough_write_iter(struct kiocb *iocb_fuse, struct fuse_file *ff = fuse_filp->private_data; struct inode *fuse_inode = file_inode(fuse_filp); struct file *passthrough_filp = ff->passthrough_filp; + struct inode *passthrough_inode = file_inode(passthrough_filp); if (!iov_iter_count(iter)) return 0; @@ -75,9 +119,25 @@ ssize_t fuse_passthrough_write_iter(struct kiocb *iocb_fuse, if (ret > 0) fuse_copyattr(fuse_filp, passthrough_filp, true); } else { - ret = -EIO; - } + struct fuse_aio_req *aio_req; + aio_req = kmalloc(sizeof(struct fuse_aio_req), GFP_KERNEL); + if (!aio_req) { + ret = -ENOMEM; + goto out; + } + + file_start_write(passthrough_filp); + __sb_writers_release(passthrough_inode->i_sb, SB_FREEZE_WRITE); + + aio_req->iocb_fuse = iocb_fuse; + kiocb_clone(&aio_req->iocb, iocb_fuse, passthrough_filp); + aio_req->iocb.ki_complete = fuse_aio_rw_complete; + ret = call_write_iter(passthrough_filp, &aio_req->iocb, iter); + if (ret != -EIOCBQUEUED) + fuse_aio_cleanup_handler(aio_req); + } +out: inode_unlock(fuse_inode); return 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 ` [PATCH V8 2/3] fuse: Introduce synchronous read and write " Alessio Balsini 2020-09-12 9:55 ` Amir Goldstein 2020-09-21 11:01 ` Alessio Balsini 2020-09-21 13:07 ` Amir Goldstein 2020-09-11 16:34 ` Alessio Balsini [this message] 2020-09-11 17:23 ` [PATCH V8 3/3] fuse: Handle AIO read and write in passthrough 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-4-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).