OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a778f9
)
io_uring: Fix race condition when sqp thread goes to sleep
author
Olivier Langlois
<olivier@trillion01.com>
Wed, 23 Jun 2021 18:50:11 +0000
(11:50 -0700)
committer
Jens Axboe
<axboe@kernel.dk>
Thu, 24 Jun 2021 02:38:21 +0000
(20:38 -0600)
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>
fs/io_uring.c
patch
|
blob
|
history
diff --git
a/fs/io_uring.c
b/fs/io_uring.c
index
fc8637f
..
7c545fa
100644
(file)
--- 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);