From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCHSET REBASE 10/10] io_uring: keep timeout in io_wait_queue
Date: Thu, 5 Jan 2023 11:22:29 +0000 [thread overview]
Message-ID: <e4b48a9e26a3b1cf97c80121e62d4b5ab873d28d.1672916894.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Move waiting timeout into io_wait_queue
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/io_uring.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 420b022f6c31..a44b3b5813df 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2411,6 +2411,7 @@ struct io_wait_queue {
struct io_ring_ctx *ctx;
unsigned cq_tail;
unsigned nr_timeouts;
+ ktime_t timeout;
};
static inline bool io_has_work(struct io_ring_ctx *ctx)
@@ -2463,8 +2464,7 @@ int io_run_task_work_sig(struct io_ring_ctx *ctx)
/* when returns >0, the caller should retry */
static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx,
- struct io_wait_queue *iowq,
- ktime_t *timeout)
+ struct io_wait_queue *iowq)
{
if (unlikely(READ_ONCE(ctx->check_cq)))
return 1;
@@ -2476,9 +2476,9 @@ static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx,
return -EINTR;
if (unlikely(io_should_wake(iowq)))
return 0;
- if (*timeout == KTIME_MAX)
+ if (iowq->timeout == KTIME_MAX)
schedule();
- else if (!schedule_hrtimeout(timeout, HRTIMER_MODE_ABS))
+ else if (!schedule_hrtimeout(&iowq->timeout, HRTIMER_MODE_ABS))
return -ETIME;
return 0;
}
@@ -2493,7 +2493,6 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
{
struct io_wait_queue iowq;
struct io_rings *rings = ctx->rings;
- ktime_t timeout = KTIME_MAX;
int ret;
if (!io_allowed_run_tw(ctx))
@@ -2519,20 +2518,21 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
return ret;
}
- if (uts) {
- struct timespec64 ts;
-
- if (get_timespec64(&ts, uts))
- return -EFAULT;
- timeout = ktime_add_ns(timespec64_to_ktime(ts), ktime_get_ns());
- }
-
init_waitqueue_func_entry(&iowq.wq, io_wake_function);
iowq.wq.private = current;
INIT_LIST_HEAD(&iowq.wq.entry);
iowq.ctx = ctx;
iowq.nr_timeouts = atomic_read(&ctx->cq_timeouts);
iowq.cq_tail = READ_ONCE(ctx->rings->cq.head) + min_events;
+ iowq.timeout = KTIME_MAX;
+
+ if (uts) {
+ struct timespec64 ts;
+
+ if (get_timespec64(&ts, uts))
+ return -EFAULT;
+ iowq.timeout = ktime_add_ns(timespec64_to_ktime(ts), ktime_get_ns());
+ }
trace_io_uring_cqring_wait(ctx, min_events);
do {
@@ -2540,7 +2540,7 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
prepare_to_wait_exclusive(&ctx->cq_wait, &iowq.wq,
TASK_INTERRUPTIBLE);
- ret = io_cqring_wait_schedule(ctx, &iowq, &timeout);
+ ret = io_cqring_wait_schedule(ctx, &iowq);
if (ret < 0)
break;
__set_current_state(TASK_RUNNING);
--
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 ` [PATCHSET REBASE 05/10] io_uring: parse check_cq out of wq waiting Pavel Begunkov
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 ` Pavel Begunkov [this message]
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=e4b48a9e26a3b1cf97c80121e62d4b5ab873d28d.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