Commit 2b4ae19c authored by Hao Xu's avatar Hao Xu Committed by Jens Axboe

io_uring: update sq_thread_idle after ctx deleted

we shall update sq_thread_idle anytime we do ctx deletion from ctx_list

Fixes:734551df ("io_uring: fix shared sqpoll cancellation hangs")
Signed-off-by: default avatarHao Xu <haoxu@linux.alibaba.com>
Link: https://lore.kernel.org/r/1619256380-236460-1-git-send-email-haoxu@linux.alibaba.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 634d00df
...@@ -9018,6 +9018,7 @@ static void io_sqpoll_cancel_cb(struct callback_head *cb) ...@@ -9018,6 +9018,7 @@ static void io_sqpoll_cancel_cb(struct callback_head *cb)
if (sqd->thread) if (sqd->thread)
io_uring_cancel_sqpoll(sqd); io_uring_cancel_sqpoll(sqd);
list_del_init(&work->ctx->sqd_list); list_del_init(&work->ctx->sqd_list);
io_sqd_update_thread_idle(sqd);
complete(&work->completion); complete(&work->completion);
} }
...@@ -9028,7 +9029,6 @@ static void io_sqpoll_cancel_sync(struct io_ring_ctx *ctx) ...@@ -9028,7 +9029,6 @@ static void io_sqpoll_cancel_sync(struct io_ring_ctx *ctx)
struct task_struct *task; struct task_struct *task;
io_sq_thread_park(sqd); io_sq_thread_park(sqd);
io_sqd_update_thread_idle(sqd);
task = sqd->thread; task = sqd->thread;
if (task) { if (task) {
init_completion(&work.completion); init_completion(&work.completion);
...@@ -9037,6 +9037,7 @@ static void io_sqpoll_cancel_sync(struct io_ring_ctx *ctx) ...@@ -9037,6 +9037,7 @@ static void io_sqpoll_cancel_sync(struct io_ring_ctx *ctx)
wake_up_process(task); wake_up_process(task);
} else { } else {
list_del_init(&ctx->sqd_list); list_del_init(&ctx->sqd_list);
io_sqd_update_thread_idle(sqd);
} }
io_sq_thread_unpark(sqd); io_sq_thread_unpark(sqd);
......
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