Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 05:45:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: add helper flushing locked_free_list

Browse Source 
Add a new helper io_flush_cached_locked_reqs() that splices
locked_free_list to free_list, and does it right doing all sync and
invariant reinit.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-03-19 17:22:39 +00:00 committed by Jens Axboe
parent a05432fb49
commit dac7a09864
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/io_uring.c
View File

@ -1628,6 +1628,15 @@ 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);
} }
static void io_flush_cached_locked_reqs(struct io_ring_ctx *ctx,
struct io_comp_state *cs)
{
spin_lock_irq(&ctx->completion_lock);
list_splice_init(&cs->locked_free_list, &cs->free_list);
cs->locked_free_nr = 0;
spin_unlock_irq(&ctx->completion_lock);
}
/* Returns true IFF there are requests in the cache */ /* 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)
{ {
@ -1640,12 +1649,8 @@ static bool io_flush_cached_reqs(struct io_ring_ctx *ctx)
* locked cache, grab the lock and move them over to our submission * locked cache, grab the lock and move them over to our submission
* side cache. * side cache.
*/ */
if (READ_ONCE(cs->locked_free_nr) > IO_COMPL_BATCH) { if (READ_ONCE(cs->locked_free_nr) > IO_COMPL_BATCH)
spin_lock_irq(&ctx->completion_lock); io_flush_cached_locked_reqs(ctx, cs);
list_splice_init(&cs->locked_free_list, &cs->free_list);
cs->locked_free_nr = 0;
spin_unlock_irq(&ctx->completion_lock);
}
nr = state->free_reqs; nr = state->free_reqs;
while (!list_empty(&cs->free_list)) { while (!list_empty(&cs->free_list)) {
@ -8446,13 +8451,8 @@ static void io_req_caches_free(struct io_ring_ctx *ctx)
submit_state->free_reqs = 0; submit_state->free_reqs = 0;
} }
spin_lock_irq(&ctx->completion_lock); io_flush_cached_locked_reqs(ctx, cs);
list_splice_init(&cs->locked_free_list, &cs->free_list);
cs->locked_free_nr = 0;
spin_unlock_irq(&ctx->completion_lock);
io_req_cache_free(&cs->free_list, NULL); io_req_cache_free(&cs->free_list, NULL);
mutex_unlock(&ctx->uring_lock); mutex_unlock(&ctx->uring_lock);
} }