From: Hao Xu <[email protected]>
To: Pavel Begunkov <[email protected]>, [email protected]
Cc: Jens Axboe <[email protected]>
Subject: Re: [PATCH 2/8] io_uring: clean io_wq_submit_work()'s main loop
Date: Mon, 25 Oct 2021 16:53:26 +0800 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <ed12ce0c64e051f9a6b8a37a24f8ea554d299c29.1634987320.git.asml.silence@gmail.com>
在 2021/10/23 下午7:13, Pavel Begunkov 写道:
> Do a bit of cleaning for the main loop of io_wq_submit_work(). Get rid
> of switch, just replace it with a single if as we're retrying in both
> other cases. Kill issue_sqe label, Get rid of needs_poll nesting and
> disambiguate a bit the comment.
>
> Signed-off-by: Pavel Begunkov <[email protected]>
> ---
Reviewed-by: Hao Xu <[email protected]>
> fs/io_uring.c | 40 ++++++++++++----------------------------
> 1 file changed, 12 insertions(+), 28 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 736d456e7913..7f92523c1282 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -6749,40 +6749,24 @@ static void io_wq_submit_work(struct io_wq_work *work)
> }
>
> do {
> -issue_sqe:
> ret = io_issue_sqe(req, issue_flags);
> + if (ret != -EAGAIN)
> + break;
> /*
> - * We can get EAGAIN for polled IO even though we're
> + * 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 (ret != -EAGAIN)
> - break;
> - if (needs_poll) {
> - bool armed = false;
> -
> - ret = 0;
> - needs_poll = false;
> - issue_flags &= ~IO_URING_F_NONBLOCK;
> -
> - switch (io_arm_poll_handler(req)) {
> - case IO_APOLL_READY:
> - goto issue_sqe;
> - case IO_APOLL_ABORTED:
> - /*
> - * somehow we failed to arm the poll infra,
> - * fallback it to a normal async worker try.
> - */
> - break;
> - case IO_APOLL_OK:
> - armed = true;
> - break;
> - }
> -
> - if (armed)
> - break;
> + if (!needs_poll) {
> + cond_resched();
> + continue;
> }
> - cond_resched();
> +
> + 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);
> }
>
>
next prev parent reply other threads:[~2021-10-25 8:53 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 [this message]
2021-10-23 11:13 ` [PATCH 3/8] io_uring: clean iowq submit work cancellation Pavel Begunkov
2021-10-25 8:57 ` Hao Xu
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=4b0b81ce-0b39-c8b9-5dbe-130b14b0baab@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