From: Masayoshi Mizuma <msys.mizuma@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>, linux-fsdevel@vger.kernel.org
Cc: Masayoshi Mizuma <msys.mizuma@gmail.com>,
Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>,
linux-kernel@vger.kernel.org, virtio-fs@redhat.com
Subject: [PATCH] fuse: Fix the return code of fuse_direct_IO() to deal with the error for aio
Date: Sun, 17 Nov 2019 21:24:10 -0500 [thread overview]
Message-ID: <20191118022410.21023-1-msys.mizuma@gmail.com> (raw)
From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
exit_aio() is sometimes stuck in wait_for_completion() after aio is issued
with direct IO and the task receives a signal.
That is because kioctx in mm->ioctx_table is in use by aio_kiocb.
aio_kiocb->ki_refcnt is 1 at that time. That means iocb_put() isn't
called correctly.
fuse_get_req() returns as -EINTR when it's blocked and receives a signal.
fuse_direct_IO() deals with the -EINTER as -EIOCBQUEUED and returns as
-EIOCBQUEUED even though the aio isn't queued.
As the result, aio_rw_done() doesn't handle the error, so iocb_put() isn't
called via aio_complete_rw(), which is the callback.
The flow is something like as:
io_submit
aio_get_req
refcount_set(&req->ki_refcnt, 2)
__io_submit_one
aio_read
...
fuse_direct_IO # return as -EIOCBQUEUED
__fuse_direct_read
...
fuse_get_req # return as -EINTR
aio_rw_done
# Nothing to do because ret is -EIOCBQUEUED...
iocb_put
refcount_dec_and_test(&iocb->ki_refcnt) # 2->1
Return as the error code of fuse_direct_io() or __fuse_direct_read() in
fuse_direct_IO() so that aio_rw_done() can handle the error and call
iocb_put().
This issue is trucked as a virtio-fs issue:
https://gitlab.com/virtio-fs/qemu/issues/14
Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
---
fs/fuse/file.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index db48a5cf8620..87b151aec8f2 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -3115,8 +3115,12 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
fuse_aio_complete(io, ret < 0 ? ret : 0, -1);
/* we have a non-extending, async request, so return */
- if (!blocking)
- return -EIOCBQUEUED;
+ if (!blocking) {
+ if (ret >= 0)
+ return -EIOCBQUEUED;
+ else
+ return ret;
+ }
wait_for_completion(&wait);
ret = fuse_get_res_by_io(io);
--
2.18.1
next reply other threads:[~2019-11-18 2:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 2:24 Masayoshi Mizuma [this message]
2019-11-21 5:51 ` [PATCH] fuse: Fix the return code of fuse_direct_IO() to deal with the error for aio Cao jin
2019-11-25 12:38 ` Miklos Szeredi
2019-11-25 16:58 ` Masayoshi Mizuma
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=20191118022410.21023-1-msys.mizuma@gmail.com \
--to=msys.mizuma@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.mizuma@jp.fujitsu.com \
--cc=miklos@szeredi.hu \
--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: link
Be 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).