From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCHSET REBASE 05/10] io_uring: parse check_cq out of wq waiting
Date: Thu, 5 Jan 2023 11:22:24 +0000 [thread overview]
Message-ID: <9dfcec3121013f98208dbf79368d636d74e1231a.1672916894.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
We already avoid flushing overflows in io_cqring_wait_schedule() but
only return an error for the outer loop to handle it. Minimise it even
further by moving all ->check_cq parsing there.
Signed-off-by: Pavel Begunkov <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
io_uring/io_uring.c | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 3bb3e9889717..067e3577ac9b 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2468,21 +2468,13 @@ static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx,
ktime_t *timeout)
{
int ret;
- unsigned long check_cq;
+ if (unlikely(READ_ONCE(ctx->check_cq)))
+ return 1;
/* make sure we run task_work before checking for signals */
ret = io_run_task_work_sig(ctx);
if (ret || io_should_wake(iowq))
return ret;
-
- check_cq = READ_ONCE(ctx->check_cq);
- if (unlikely(check_cq)) {
- /* let the caller flush overflows, retry */
- if (check_cq & BIT(IO_CHECK_CQ_OVERFLOW_BIT))
- return 1;
- if (check_cq & BIT(IO_CHECK_CQ_DROPPED_BIT))
- return -EBADR;
- }
if (!schedule_hrtimeout(timeout, HRTIMER_MODE_ABS))
return -ETIME;
@@ -2548,13 +2540,25 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
trace_io_uring_cqring_wait(ctx, min_events);
do {
- if (test_bit(IO_CHECK_CQ_OVERFLOW_BIT, &ctx->check_cq)) {
- finish_wait(&ctx->cq_wait, &iowq.wq);
- io_cqring_do_overflow_flush(ctx);
- }
+ unsigned long check_cq;
+
prepare_to_wait_exclusive(&ctx->cq_wait, &iowq.wq,
TASK_INTERRUPTIBLE);
ret = io_cqring_wait_schedule(ctx, &iowq, &timeout);
+
+ check_cq = READ_ONCE(ctx->check_cq);
+ if (unlikely(check_cq)) {
+ /* let the caller flush overflows, retry */
+ if (check_cq & BIT(IO_CHECK_CQ_OVERFLOW_BIT)) {
+ finish_wait(&ctx->cq_wait, &iowq.wq);
+ io_cqring_do_overflow_flush(ctx);
+ }
+ if (check_cq & BIT(IO_CHECK_CQ_DROPPED_BIT)) {
+ ret = -EBADR;
+ break;
+ }
+ }
+
if (__io_cqring_events_user(ctx) >= min_events)
break;
cond_resched();
--
2.38.1
next prev parent reply other threads:[~2023-01-05 11:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-05 11:22 [PATCHSET REBASE 00/10] cq wait refactoring rebase Pavel Begunkov
2023-01-05 11:22 ` [PATCHSET REBASE 01/10] io_uring: rearrange defer list checks Pavel Begunkov
2023-01-05 11:22 ` [PATCHSET REBASE 02/10] io_uring: don't iterate cq wait fast path Pavel Begunkov
2023-01-05 11:22 ` [PATCHSET REBASE 03/10] io_uring: kill io_run_task_work_ctx Pavel Begunkov
2023-01-05 11:22 ` [PATCHSET REBASE 04/10] io_uring: move defer tw task checks Pavel Begunkov
2023-01-05 11:22 ` Pavel Begunkov [this message]
2023-01-05 11:22 ` [PATCHSET REBASE 06/10] io_uring: mimimise io_cqring_wait_schedule Pavel Begunkov
2023-01-05 11:22 ` [PATCHSET REBASE 07/10] io_uring: simplify io_has_work Pavel Begunkov
2023-01-05 11:22 ` [PATCHSET REBASE 08/10] io_uring: set TASK_RUNNING right after schedule Pavel Begunkov
2023-01-05 11:22 ` [PATCHSET REBASE 09/10] io_uring: optimise non-timeout waiting Pavel Begunkov
2023-01-05 11:22 ` [PATCHSET REBASE 10/10] io_uring: keep timeout in io_wait_queue Pavel Begunkov
2023-01-05 15:28 ` [PATCHSET REBASE 00/10] cq wait refactoring rebase 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=9dfcec3121013f98208dbf79368d636d74e1231a.1672916894.git.asml.silence@gmail.com \
[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