From: Hao Xu <[email protected]>
To: Pavel Begunkov <[email protected]>, [email protected]
Cc: Jens Axboe <[email protected]>
Subject: Re: [PATCH 3/8] io_uring: clean iowq submit work cancellation
Date: Mon, 25 Oct 2021 16:57:54 +0800 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <ff4a09cf41f7a22bbb294b6f1faea721e21fe615.1634987320.git.asml.silence@gmail.com>
在 2021/10/23 下午7:13, Pavel Begunkov 写道:
> If we've got IO_WQ_WORK_CANCEL in io_wq_submit_work(), handle the error
> on the same lines as the check instead of having a weird code flow. The
> main loop doesn't change but goes one indention left.
>
> Signed-off-by: Pavel Begunkov <[email protected]>
> ---
Reviewed-by: Hao Xu <[email protected]>
> fs/io_uring.c | 59 +++++++++++++++++++++++++--------------------------
> 1 file changed, 29 insertions(+), 30 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 7f92523c1282..58cb3a14d58e 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -6721,6 +6721,8 @@ static struct io_wq_work *io_wq_free_work(struct io_wq_work *work)
> static void io_wq_submit_work(struct io_wq_work *work)
> {
> struct io_kiocb *req = container_of(work, struct io_kiocb, work);
> + unsigned int issue_flags = IO_URING_F_UNLOCKED;
> + bool needs_poll = false;
> struct io_kiocb *timeout;
> int ret = 0;
>
> @@ -6735,40 +6737,37 @@ static void io_wq_submit_work(struct io_wq_work *work)
> io_queue_linked_timeout(timeout);
>
> /* either cancelled or io-wq is dying, so don't touch tctx->iowq */
> - if (work->flags & IO_WQ_WORK_CANCEL)
> - ret = -ECANCELED;
> + if (work->flags & IO_WQ_WORK_CANCEL) {
> + io_req_task_queue_fail(req, -ECANCELED);
> + return;
> + }
>
> - if (!ret) {
> - bool needs_poll = false;
> - unsigned int issue_flags = IO_URING_F_UNLOCKED;
> + if (req->flags & REQ_F_FORCE_ASYNC) {
> + needs_poll = req->file && file_can_poll(req->file);
> + if (needs_poll)
> + issue_flags |= IO_URING_F_NONBLOCK;
> + }
>
> - if (req->flags & REQ_F_FORCE_ASYNC) {
> - needs_poll = req->file && file_can_poll(req->file);
> - if (needs_poll)
> - issue_flags |= IO_URING_F_NONBLOCK;
> + do {
> + ret = io_issue_sqe(req, issue_flags);
> + if (ret != -EAGAIN)
> + break;
> + /*
> + * We can get EAGAIN for iopolled IO even though we're
> + * forcing a sync submission from here, since we can't
> + * wait for request slots on the block side.
> + */
> + if (!needs_poll) {
> + cond_resched();
> + continue;
> }
>
> - do {
> - ret = io_issue_sqe(req, issue_flags);
> - if (ret != -EAGAIN)
> - break;
> - /*
> - * We can get EAGAIN for iopolled IO even though we're
> - * forcing a sync submission from here, since we can't
> - * wait for request slots on the block side.
> - */
> - if (!needs_poll) {
> - cond_resched();
> - continue;
> - }
> -
> - if (io_arm_poll_handler(req) == IO_APOLL_OK)
> - return;
> - /* aborted or ready, in either case retry blocking */
> - needs_poll = false;
> - issue_flags &= ~IO_URING_F_NONBLOCK;
> - } while (1);
> - }
> + if (io_arm_poll_handler(req) == IO_APOLL_OK)
> + return;
> + /* aborted or ready, in either case retry blocking */
> + needs_poll = false;
> + issue_flags &= ~IO_URING_F_NONBLOCK;
> + } while (1);
>
> /* avoid locking problems by failing it from a clean context */
> if (ret)
>
next prev parent reply other threads:[~2021-10-25 8:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-23 11:13 [PATCH 0/8] for-next cleanups Pavel Begunkov
2021-10-23 11:13 ` [PATCH 1/8] io-wq: use helper for worker refcounting Pavel Begunkov
2021-10-23 11:13 ` [PATCH 2/8] io_uring: clean io_wq_submit_work()'s main loop Pavel Begunkov
2021-10-25 8:53 ` Hao Xu
2021-10-23 11:13 ` [PATCH 3/8] io_uring: clean iowq submit work cancellation Pavel Begunkov
2021-10-25 8:57 ` Hao Xu [this message]
2021-10-23 11:13 ` [PATCH 4/8] io_uring: check if opcode needs poll first on arming Pavel Begunkov
2021-10-25 8:58 ` Hao Xu
2021-10-23 11:13 ` [PATCH 5/8] io_uring: don't try io-wq polling if not supported Pavel Begunkov
2021-10-25 8:58 ` Hao Xu
2021-10-23 11:14 ` [PATCH 6/8] io_uring: clean up timeout async_data allocation Pavel Begunkov
2021-10-23 11:14 ` [PATCH 7/8] io_uring: kill unused param from io_file_supports_nowait Pavel Begunkov
2021-10-23 11:14 ` [PATCH 8/8] io_uring: clusterise ki_flags access in rw_prep Pavel Begunkov
2021-10-23 14:09 ` [PATCH 0/8] for-next cleanups Jens Axboe
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=24c6fc94-f7a9-5a53-d29f-99e245672fb3@linux.alibaba.com \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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