Skip to content

Commit c7d9561

Browse files
isilenceaxboe
authored andcommitted
io_uring: fix early sqd_list removal sqpoll hangs
[ 245.463317] INFO: task iou-sqp-1374:1377 blocked for more than 122 seconds. [ 245.463334] task:iou-sqp-1374 state:D flags:0x00004000 [ 245.463345] Call Trace: [ 245.463352] __schedule+0x36b/0x950 [ 245.463376] schedule+0x68/0xe0 [ 245.463385] __io_uring_cancel+0xfb/0x1a0 [ 245.463407] do_exit+0xc0/0xb40 [ 245.463423] io_sq_thread+0x49b/0x710 [ 245.463445] ret_from_fork+0x22/0x30 It happens when sqpoll forgot to run park_task_work and goes to exit, then exiting user may remove ctx from sqd_list, and so corresponding io_sq_thread() -> io_uring_cancel_sqpoll() won't be executed. Hopefully it just stucks in do_exit() in this case. Fixes: dbe1bdb ("io_uring: handle signals for IO threads like a normal thread") Reported-by: Joakim Hassila <joj@mac.com> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent c60eb04 commit c7d9561

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

fs/io_uring.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6754,6 +6754,9 @@ static int io_sq_thread(void *data)
67546754
current->flags |= PF_NO_SETAFFINITY;
67556755

67566756
mutex_lock(&sqd->lock);
6757+
/* a user may had exited before the thread started */
6758+
io_run_task_work_head(&sqd->park_task_work);
6759+
67576760
while (!test_bit(IO_SQ_THREAD_SHOULD_STOP, &sqd->state)) {
67586761
int ret;
67596762
bool cap_entries, sqt_spin, needs_sched;
@@ -6770,10 +6773,10 @@ static int io_sq_thread(void *data)
67706773
}
67716774
cond_resched();
67726775
mutex_lock(&sqd->lock);
6773-
if (did_sig)
6774-
break;
67756776
io_run_task_work();
67766777
io_run_task_work_head(&sqd->park_task_work);
6778+
if (did_sig)
6779+
break;
67776780
timeout = jiffies + sqd->sq_thread_idle;
67786781
continue;
67796782
}

0 commit comments

Comments
 (0)