io_uring: update sq_thread_idle after ctx deleted

we shall update sq_thread_idle anytime we do ctx deletion from ctx_list

Fixes:734551df6f9b ("io_uring: fix shared sqpoll cancellation hangs")

Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
Link: https://lore.kernel.org/r/1619256380-236460-1-git-send-email-haoxu@linux.alibaba.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 0ab09f7a44e7e78062043381dd8ae528543fc5c5..be2be0530798be08953d4429d4c86837f77dfccd 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -9018,6 +9018,7 @@ static void io_sqpoll_cancel_cb(struct callback_head *cb)
        if (sqd->thread)
                io_uring_cancel_sqpoll(sqd);
        list_del_init(&work->ctx->sqd_list);
+       io_sqd_update_thread_idle(sqd);
        complete(&work->completion);
 }
 
@@ -9028,7 +9029,6 @@ static void io_sqpoll_cancel_sync(struct io_ring_ctx *ctx)
        struct task_struct *task;
 
        io_sq_thread_park(sqd);
-       io_sqd_update_thread_idle(sqd);
        task = sqd->thread;
        if (task) {
                init_completion(&work.completion);
@@ -9037,6 +9037,7 @@ static void io_sqpoll_cancel_sync(struct io_ring_ctx *ctx)
                wake_up_process(task);
        } else {
                list_del_init(&ctx->sqd_list);
+               io_sqd_update_thread_idle(sqd);
        }
        io_sq_thread_unpark(sqd);