summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2020-05-20 08:41:51 -0600
committerJens Axboe <axboe@kernel.dk>2020-05-20 08:41:51 -0600
commitdc8a33b2d9404f429d16ab8633c9280ddb059781 (patch)
tree0995738b0fb5c942636b2179d84e3b70f54f792e
parent550a3efd5029ef0372d84d9254f44bd474f6d7ea (diff)
parent6b668c9b7fc6fc0c313cdaee8b75d17f4d954ab5 (diff)
Merge branch 'for-5.8/io_uring' into for-next
* for-5.8/io_uring: io_uring: don't submit sqes when ctx->refs is dying
-rw-r--r--fs/io_uring.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 30c281aa0ec7..3d606304815e 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6174,7 +6174,8 @@ static int io_sq_thread(void *data)
}
mutex_lock(&ctx->uring_lock);
- ret = io_submit_sqes(ctx, to_submit, NULL, -1);
+ if (likely(!percpu_ref_is_dying(&ctx->refs)))
+ ret = io_submit_sqes(ctx, to_submit, NULL, -1);
mutex_unlock(&ctx->uring_lock);
timeout = jiffies + ctx->sq_thread_idle;
}
@@ -7464,16 +7465,6 @@ static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)
percpu_ref_kill(&ctx->refs);
mutex_unlock(&ctx->uring_lock);
- /*
- * Wait for sq thread to idle, if we have one. It won't spin on new
- * work after we've killed the ctx ref above. This is important to do
- * before we cancel existing commands, as the thread could otherwise
- * be queueing new work post that. If that's work we need to cancel,
- * it could cause shutdown to hang.
- */
- while (ctx->sqo_thread && !wq_has_sleeper(&ctx->sqo_wait))
- cond_resched();
-
io_kill_timeouts(ctx);
io_poll_remove_all(ctx);