| Message ID | 20200924131318.2654747-5-balsini@android.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fuse: Add support for passthrough read/write | expand |
On Thu, Sep 24, 2020 at 3:13 PM Alessio Balsini <balsini@android.com> wrote: > > Extend the passthrough feature by handling asynchronous IO both for read > and write operations. > > When an AIO request is received, if the request targets a FUSE file with > the passthrough functionality enabled, a new identical AIO request is > created. The new request targets the lower file system file, and gets > assigned a special FUSE passthrough AIO completion callback. > When the lower file system AIO request is completed, the FUSE passthrough > AIO completion callback is executed and propagates the completion signal to > the FUSE AIO request by triggering its completion callback as well. This ends up with almost identical code in fuse and overlayfs, right? Maybe it's worth looking into moving these into common helpers. Thanks, Miklos > > Signed-off-by: Alessio Balsini <balsini@android.com> > --- > fs/fuse/passthrough.c | 64 +++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 62 insertions(+), 2 deletions(-) > > diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c > index f70c0ef6945b..b7d1a5517ffd 100644 > --- a/fs/fuse/passthrough.c > +++ b/fs/fuse/passthrough.c > @@ -4,6 +4,11 @@ > > #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) > { > struct inode *dst = file_inode(dst_file); > @@ -39,6 +44,32 @@ fuse_passthrough_override_creds(const struct file *fuse_filp) > return override_creds(fc->creator_cred); > } > > +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; > + > + if (iocb->ki_flags & IOCB_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); > + } > + > + 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) > { > @@ -56,7 +87,18 @@ ssize_t fuse_passthrough_read_iter(struct kiocb *iocb_fuse, > ret = vfs_iter_read(passthrough_filp, iter, &iocb_fuse->ki_pos, > iocbflags_to_rwf(iocb_fuse->ki_flags)); > } 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); > } > revert_creds(old_cred); > > @@ -72,6 +114,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; > @@ -87,8 +130,25 @@ ssize_t fuse_passthrough_write_iter(struct kiocb *iocb_fuse, > if (ret > 0) > fuse_copyattr(fuse_filp, passthrough_filp); > } 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: > revert_creds(old_cred); > inode_unlock(fuse_inode); > > -- > 2.28.0.681.g6f77f65b4e-goog >
On Wed, Sep 30, 2020 at 08:54:03PM +0200, Miklos Szeredi wrote: > On Thu, Sep 24, 2020 at 3:13 PM Alessio Balsini <balsini@android.com> wrote: > > > > Extend the passthrough feature by handling asynchronous IO both for read > > and write operations. > > > > When an AIO request is received, if the request targets a FUSE file with > > the passthrough functionality enabled, a new identical AIO request is > > created. The new request targets the lower file system file, and gets > > assigned a special FUSE passthrough AIO completion callback. > > When the lower file system AIO request is completed, the FUSE passthrough > > AIO completion callback is executed and propagates the completion signal to > > the FUSE AIO request by triggering its completion callback as well. > > This ends up with almost identical code in fuse and overlayfs, right? > Maybe it's worth looking into moving these into common helpers. > > Thanks, > Miklos > There are still a few differences between overlayfs and passthrough read/write_iter(), so that merge wouldn't be straightforward. And I would love to see this series merged before increasing its complexity, hopefully in the next version if everything is all right. I will anyway work on the cleanup patch you suggested right after FUSE passthrough gets in, so that I have a solid code base to work on. Would this work for you? That cleanup patch would be handy also for the upcoming plan of having something similar to FUSE passthrough extended to directories, as it was mentioned in a previous discussion on this series with Amir. Thanks! Alessio
diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c index f70c0ef6945b..b7d1a5517ffd 100644 --- a/fs/fuse/passthrough.c +++ b/fs/fuse/passthrough.c @@ -4,6 +4,11 @@ #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) { struct inode *dst = file_inode(dst_file); @@ -39,6 +44,32 @@ fuse_passthrough_override_creds(const struct file *fuse_filp) return override_creds(fc->creator_cred); } +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; + + if (iocb->ki_flags & IOCB_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); + } + + 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) { @@ -56,7 +87,18 @@ ssize_t fuse_passthrough_read_iter(struct kiocb *iocb_fuse, ret = vfs_iter_read(passthrough_filp, iter, &iocb_fuse->ki_pos, iocbflags_to_rwf(iocb_fuse->ki_flags)); } 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); } revert_creds(old_cred); @@ -72,6 +114,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; @@ -87,8 +130,25 @@ ssize_t fuse_passthrough_write_iter(struct kiocb *iocb_fuse, if (ret > 0) fuse_copyattr(fuse_filp, passthrough_filp); } 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: revert_creds(old_cred); inode_unlock(fuse_inode);
Extend the passthrough feature by handling asynchronous IO both for read and write operations. When an AIO request is received, if the request targets a FUSE file with the passthrough functionality enabled, a new identical AIO request is created. The new request targets the lower file system file, and gets assigned a special FUSE passthrough AIO completion callback. When the lower file system AIO request is completed, the FUSE passthrough AIO completion callback is executed and propagates the completion signal to the FUSE AIO request by triggering its completion callback as well. Signed-off-by: Alessio Balsini <balsini@android.com> --- fs/fuse/passthrough.c | 64 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-)