diff options
author | Pavel Begunkov <asml.silence@gmail.com> | 2023-08-11 13:53:45 +0100 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2023-08-11 10:42:57 -0600 |
commit | b6b2bb58a75407660f638a68e6e34a07036146d0 (patch) | |
tree | e6c9a49099ab2542577003a22c85af3dee481427 /io_uring/timeout.c | |
parent | 056695bffa4beed5668dd4aa11efb696eacb3ed9 (diff) | |
download | linux-stable-b6b2bb58a75407660f638a68e6e34a07036146d0.tar.gz linux-stable-b6b2bb58a75407660f638a68e6e34a07036146d0.tar.bz2 linux-stable-b6b2bb58a75407660f638a68e6e34a07036146d0.zip |
io_uring: never overflow io_aux_cqe
Now all callers of io_aux_cqe() set allow_overflow to false, remove the
parameter and not allow overflowing auxilary multishot cqes.
When CQ is full the function callers and all multishot requests in
general are expected to complete the request. That prevents indefinite
in-background grows of the overflow list and let's the userspace to
handle the backlog at its own pace.
Resubmitting a request should also be faster than accounting a bunch of
overflows, so it should be better for perf when it happens, but a well
behaving userspace should be trying to avoid overflows in any case.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/bb20d14d708ea174721e58bb53786b0521e4dd6d.1691757663.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/timeout.c')
-rw-r--r-- | io_uring/timeout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/io_uring/timeout.c b/io_uring/timeout.c index 6242130e73c6..7fd7dbb211d6 100644 --- a/io_uring/timeout.c +++ b/io_uring/timeout.c @@ -73,8 +73,8 @@ static void io_timeout_complete(struct io_kiocb *req, struct io_tw_state *ts) if (!io_timeout_finish(timeout, data)) { bool filled; - filled = io_aux_cqe(req, ts->locked, -ETIME, IORING_CQE_F_MORE, - false); + filled = io_fill_cqe_req_aux(req, ts->locked, -ETIME, + IORING_CQE_F_MORE); if (filled) { /* re-arm timer */ spin_lock_irq(&ctx->timeout_lock); |