2020-05-30 12:00:05

by Pavel Begunkov

Subject: [PATCH v3 0/2] CQ-seq only based timeouts

The old series that makes timeouts to trigger exactly after N
non-timeout CQEs, but not (#inflight + req->off).

v2: variables renaming
v3: fix ordering with REQ_F_TIMEOUT_NOSEQ reqs
squash 2 commits (core + ingnoring timeouts completions)
extract a prep patch (makes diffs easier to follow)

Pavel Begunkov (2):
io_uring: move timeouts flushing to a helper
io_uring: off timeouts based only on completions

fs/io_uring.c | 97 ++++++++++++++-------------------------------------
1 file changed, 27 insertions(+), 70 deletions(-)

--
2.24.0

2020-05-30 12:00:05

by Pavel Begunkov

Subject: [PATCH v3 1/2] io_uring: move timeouts flushing to a helper

Separate flushing offset timeouts io_commit_cqring() by moving it into a
helper. Just a preparation, makes following patches clearer.

Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 942862c59200..0975cd8ddcb7 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -988,23 +988,6 @@ static inline bool req_need_defer(struct io_kiocb *req)
return false;
}

-static struct io_kiocb *io_get_timeout_req(struct io_ring_ctx *ctx)
-{
- struct io_kiocb *req;
-
- req = list_first_entry_or_null(&ctx->timeout_list, struct io_kiocb, list);
- if (req) {
- if (req->flags & REQ_F_TIMEOUT_NOSEQ)
- return NULL;
- if (!__req_need_defer(req)) {
- list_del_init(&req->list);
- return req;
- }
- }
-
- return NULL;
-}
-
static void __io_commit_cqring(struct io_ring_ctx *ctx)
{
struct io_rings *rings = ctx->rings;
@@ -1133,13 +1116,24 @@ static void __io_queue_deferred(struct io_ring_ctx *ctx)
} while (!list_empty(&ctx->defer_list));
}

-static void io_commit_cqring(struct io_ring_ctx *ctx)
+static void io_flush_timeouts(struct io_ring_ctx *ctx)
{
- struct io_kiocb *req;
+ while (!list_empty(&ctx->timeout_list)) {
+ struct io_kiocb *req = list_first_entry(&ctx->timeout_list,
+ struct io_kiocb, list);

- while ((req = io_get_timeout_req(ctx)) != NULL)
+ if (req->flags & REQ_F_TIMEOUT_NOSEQ)
+ break;
+ if (__req_need_defer(req))
+ break;
+ list_del_init(&req->list);
io_kill_timeout(req);
+ }
+}

+static void io_commit_cqring(struct io_ring_ctx *ctx)
+{
+ io_flush_timeouts(ctx);
__io_commit_cqring(ctx);

if (unlikely(!list_empty(&ctx->defer_list)))
--
2.24.0

2020-05-30 13:53:39

by Jens Axboe

Subject: Re: [PATCH v3 0/2] CQ-seq only based timeouts

On 5/30/20 5:54 AM, Pavel Begunkov wrote:
> The old series that makes timeouts to trigger exactly after N
> non-timeout CQEs, but not (#inflight + req->off).
>
> v2: variables renaming
> v3: fix ordering with REQ_F_TIMEOUT_NOSEQ reqs
> squash 2 commits (core + ingnoring timeouts completions)
> extract a prep patch (makes diffs easier to follow)
>
> Pavel Begunkov (2):
> io_uring: move timeouts flushing to a helper
> io_uring: off timeouts based only on completions
>
> fs/io_uring.c | 97 ++++++++++++++-------------------------------------
> 1 file changed, 27 insertions(+), 70 deletions(-)

Applied, thanks.

--
Jens Axboe