diff options
| author |   Olivier Langlois <olivier@trillion01.com> | 2021-06-23 11:50:11 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-06-23 20:38:21 -0600 |
| commit | 997135017716c33f3405e86cca5da9567b40a08e (patch) | |
| tree | 4b1c07912309b22cfefe2f242dae82543493de26 | |
| parent | io_uring: improve in tctx_task_work() resubmission (diff) | |
| download | wireguard-linux-997135017716c33f3405e86cca5da9567b40a08e.tar.xz wireguard-linux-997135017716c33f3405e86cca5da9567b40a08e.zip | |
io_uring: Fix race condition when sqp thread goes to sleep
If an asynchronous completion happens before the task is preparing
itself to wait and set its state to TASK_INTERRUPTIBLE, the completion
will not wake up the sqp thread.
Cc: stable@vger.kernel.org
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/d1419dc32ec6a97b453bee34dc03fa6a02797142.1624473200.git.olivier@trillion01.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index fc8637f591a6..7c545fa66f31 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6902,7 +6902,7 @@ static int io_sq_thread(void *data) } prepare_to_wait(&sqd->wait, &wait, TASK_INTERRUPTIBLE); - if (!io_sqd_events_pending(sqd)) { + if (!io_sqd_events_pending(sqd) && !io_run_task_work()) { needs_sched = true; list_for_each_entry(ctx, &sqd->ctx_list, sqd_list) { io_ring_set_wakeup_flag(ctx); |