io_uring: don't submit sqes when ctx->refs is dying
PATCH v2 1/1 io_uring: don't submit sqes when ctx->refs is dying
When IORING_SETUP_SQPOLL is enabled, io_ring_ctx_wait_and_kill() will wait for sq thread to idle by busy loop:
while (ctx->sqo_thread && !wq_has_sleeper(&ctx->sqo_wait))
cond_resched();Above codes are not friendly, indeed I think this busy loop will introduce a cpu burst in current cpu, though it maybe short.
In this patch, if ctx->refs is dying, we forbids sq_thread from submitting sqes anymore, just discard leftover sqes.
--- fs/io_uring.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
fs/io_uring.c +2 -11
@@ -6040,7 +6040,8 @@ static int io_sq_thread(void *data) }mutex_lock (&ctx->uring_lock); - ret =io_submit_sqes (ctx, to_submit,NULL ,-1 , true); +if (likely (!percpu_ref_is_dying (&ctx->refs))) + ret =io_submit_sqes (ctx, to_submit,NULL ,-1 , true);mutex_unlock (&ctx->uring_lock); timeout = jiffies + ctx->sq_thread_idle; }
@@ -7311,16 +7312,6 @@ static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)percpu_ref_kill (&ctx->refs);mutex_unlock (&ctx->uring_lock); -/* -* Wait for sq thread to idle, if we have one. It won't spin on new -* work after we've killed the ctx ref above. This is important to do -* before we cancel existing commands, as the thread could otherwise -* be queueing new work post that. If that's work we need to cancel, -* it could cause shutdown to hang. -*/ -while (ctx->sqo_thread && !wq_has_sleeper (&ctx->sqo_wait)) -cond_resched (); -io_kill_timeouts (ctx);io_poll_remove_all (ctx);
Signature · 1 line
2.17.2
Jens Axboe
maintainerQuoted 9 lines · Xiaoguang Wang
When
IORING_SETUP_SQPOLLis enabled,io_ring_ctx_wait_and_kill()will wait for sq thread to idle by busy loop:while (ctx->sqo_thread && !wq_has_sleeper(&ctx->sqo_wait)) cond_resched();Above codes are not friendly, indeed I think this busy loop will introduce a cpu burst in current cpu, though it maybe short.
In this patch, if
ctx->refsis dying, we forbidssq_threadfrom submitting sqes anymore, just discard leftover sqes.
Applied for 5.8, thanks.
Signature · 1 line
Jens Axboe