Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'io_uring-5.12-2021-04-16' of git://git.kernel.dk/linux-block
Pull io_uring fix from Jens Axboe:
"Fix for a potential hang at exit with SQPOLL from Pavel"
* tag 'io_uring-5.12-2021-04-16' of git://git.kernel.dk/linux-block:
io_uring: fix early sqd_list removal sqpoll hangs
+5
-2
+5
-2
fs/io_uring.c
+5
-2
fs/io_uring.c
···
6754
6754
current->flags |= PF_NO_SETAFFINITY;
6755
6755
6756
6756
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
+
6757
6760
while (!test_bit(IO_SQ_THREAD_SHOULD_STOP, &sqd->state)) {
6758
6761
int ret;
6759
6762
bool cap_entries, sqt_spin, needs_sched;
···
6773
6770
}
6774
6771
cond_resched();
6775
6772
mutex_lock(&sqd->lock);
6776
-
if (did_sig)
6777
-
break;
6778
6773
io_run_task_work();
6779
6774
io_run_task_work_head(&sqd->park_task_work);
6775
+
if (did_sig)
6776
+
break;
6780
6777
timeout = jiffies + sqd->sq_thread_idle;
6781
6778
continue;
6782
6779
}