Commit b5bb3a24 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: warn when ring exit takes too long

We use system_unbound_wq to run io_ring_exit_work(), so it's hard to
monitor whether removal hang or not. Add WARN_ONCE to catch hangs.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent baf186c4
...@@ -8560,6 +8560,7 @@ static void io_tctx_exit_cb(struct callback_head *cb) ...@@ -8560,6 +8560,7 @@ static void io_tctx_exit_cb(struct callback_head *cb)
static void io_ring_exit_work(struct work_struct *work) static void io_ring_exit_work(struct work_struct *work)
{ {
struct io_ring_ctx *ctx = container_of(work, struct io_ring_ctx, exit_work); struct io_ring_ctx *ctx = container_of(work, struct io_ring_ctx, exit_work);
unsigned long timeout = jiffies + HZ * 60 * 5;
struct io_tctx_exit exit; struct io_tctx_exit exit;
struct io_tctx_node *node; struct io_tctx_node *node;
int ret; int ret;
...@@ -8572,10 +8573,14 @@ static void io_ring_exit_work(struct work_struct *work) ...@@ -8572,10 +8573,14 @@ static void io_ring_exit_work(struct work_struct *work)
*/ */
do { do {
io_uring_try_cancel_requests(ctx, NULL, NULL); io_uring_try_cancel_requests(ctx, NULL, NULL);
WARN_ON_ONCE(time_after(jiffies, timeout));
} while (!wait_for_completion_timeout(&ctx->ref_comp, HZ/20)); } while (!wait_for_completion_timeout(&ctx->ref_comp, HZ/20));
mutex_lock(&ctx->uring_lock); mutex_lock(&ctx->uring_lock);
while (!list_empty(&ctx->tctx_list)) { while (!list_empty(&ctx->tctx_list)) {
WARN_ON_ONCE(time_after(jiffies, timeout));
node = list_first_entry(&ctx->tctx_list, struct io_tctx_node, node = list_first_entry(&ctx->tctx_list, struct io_tctx_node,
ctx_node); ctx_node);
exit.ctx = ctx; exit.ctx = ctx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment