Commit dd78f492 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: refactor io_flush_cached_reqs()

Emphasize that return value of io_flush_cached_reqs() depends on number
of requests in the cache. It looks nicer and might help tools from
false-negative analyses.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1840038e
...@@ -1627,11 +1627,12 @@ static void io_req_complete_failed(struct io_kiocb *req, long res) ...@@ -1627,11 +1627,12 @@ static void io_req_complete_failed(struct io_kiocb *req, long res)
io_req_complete_post(req, res, 0); io_req_complete_post(req, res, 0);
} }
/* Returns true IFF there are requests in the cache */
static bool io_flush_cached_reqs(struct io_ring_ctx *ctx) static bool io_flush_cached_reqs(struct io_ring_ctx *ctx)
{ {
struct io_submit_state *state = &ctx->submit_state; struct io_submit_state *state = &ctx->submit_state;
struct io_comp_state *cs = &state->comp; struct io_comp_state *cs = &state->comp;
struct io_kiocb *req = NULL; int nr;
/* /*
* If we have more than a batch's worth of requests in our IRQ side * If we have more than a batch's worth of requests in our IRQ side
...@@ -1645,16 +1646,19 @@ static bool io_flush_cached_reqs(struct io_ring_ctx *ctx) ...@@ -1645,16 +1646,19 @@ static bool io_flush_cached_reqs(struct io_ring_ctx *ctx)
spin_unlock_irq(&ctx->completion_lock); spin_unlock_irq(&ctx->completion_lock);
} }
nr = state->free_reqs;
while (!list_empty(&cs->free_list)) { while (!list_empty(&cs->free_list)) {
req = list_first_entry(&cs->free_list, struct io_kiocb, struct io_kiocb *req = list_first_entry(&cs->free_list,
compl.list); struct io_kiocb, compl.list);
list_del(&req->compl.list); list_del(&req->compl.list);
state->reqs[state->free_reqs++] = req; state->reqs[nr++] = req;
if (state->free_reqs == ARRAY_SIZE(state->reqs)) if (nr == ARRAY_SIZE(state->reqs))
break; break;
} }
return req != NULL; state->free_reqs = nr;
return nr != 0;
} }
static struct io_kiocb *io_alloc_req(struct io_ring_ctx *ctx) static struct io_kiocb *io_alloc_req(struct io_ring_ctx *ctx)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment