Skip to content

Commit 9d5c819

Browse files
isilenceaxboe
authored andcommitted
io_uring: fix sleeping under spin in __io_clean_op
[ 27.629441] BUG: sleeping function called from invalid context at fs/file.c:402 [ 27.631317] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 1012, name: io_wqe_worker-0 [ 27.633220] 1 lock held by io_wqe_worker-0/1012: [ 27.634286] #0: ffff888105e26c98 (&ctx->completion_lock) {....}-{2:2}, at: __io_req_complete.part.102+0x30/0x70 [ 27.649249] Call Trace: [ 27.649874] dump_stack+0xac/0xe3 [ 27.650666] ___might_sleep+0x284/0x2c0 [ 27.651566] put_files_struct+0xb8/0x120 [ 27.652481] __io_clean_op+0x10c/0x2a0 [ 27.653362] __io_cqring_fill_event+0x2c1/0x350 [ 27.654399] __io_req_complete.part.102+0x41/0x70 [ 27.655464] io_openat2+0x151/0x300 [ 27.656297] io_issue_sqe+0x6c/0x14e0 [ 27.660991] io_wq_submit_work+0x7f/0x240 [ 27.662890] io_worker_handle_work+0x501/0x8a0 [ 27.664836] io_wqe_worker+0x158/0x520 [ 27.667726] kthread+0x134/0x180 [ 27.669641] ret_from_fork+0x1f/0x30 Instead of cleaning files on overflow, return back overflow cancellation into io_uring_cancel_files(). Previously it was racy to clean REQ_F_OVERFLOW flag, but we got rid of it, and can do it through repetitive attempts targeting all matching requests. Reported-by: Abaci <[email protected]> Reported-by: Joseph Qi <[email protected]> Cc: Xiaoguang Wang <[email protected]> Signed-off-by: Pavel Begunkov <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 9a17334 commit 9d5c819

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/io_uring.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,7 @@ static ssize_t io_import_iovec(int rw, struct io_kiocb *req,
10251025
static int io_setup_async_rw(struct io_kiocb *req, const struct iovec *iovec,
10261026
const struct iovec *fast_iov,
10271027
struct iov_iter *iter, bool force);
1028+
static void io_req_drop_files(struct io_kiocb *req);
10281029

10291030
static struct kmem_cache *req_cachep;
10301031

@@ -1048,8 +1049,7 @@ EXPORT_SYMBOL(io_uring_get_socket);
10481049

10491050
static inline void io_clean_op(struct io_kiocb *req)
10501051
{
1051-
if (req->flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED |
1052-
REQ_F_INFLIGHT))
1052+
if (req->flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED))
10531053
__io_clean_op(req);
10541054
}
10551055

@@ -1394,6 +1394,8 @@ static void io_req_clean_work(struct io_kiocb *req)
13941394
free_fs_struct(fs);
13951395
req->work.flags &= ~IO_WQ_WORK_FS;
13961396
}
1397+
if (req->flags & REQ_F_INFLIGHT)
1398+
io_req_drop_files(req);
13971399

13981400
io_put_identity(req->task->io_uring, req);
13991401
}
@@ -6230,9 +6232,6 @@ static void __io_clean_op(struct io_kiocb *req)
62306232
}
62316233
req->flags &= ~REQ_F_NEED_CLEANUP;
62326234
}
6233-
6234-
if (req->flags & REQ_F_INFLIGHT)
6235-
io_req_drop_files(req);
62366235
}
62376236

62386237
static int io_issue_sqe(struct io_kiocb *req, bool force_nonblock,
@@ -8879,6 +8878,7 @@ static void io_uring_cancel_files(struct io_ring_ctx *ctx,
88798878
io_wq_cancel_cb(ctx->io_wq, io_cancel_task_cb, &cancel, true);
88808879
io_poll_remove_all(ctx, task, files);
88818880
io_kill_timeouts(ctx, task, files);
8881+
io_cqring_overflow_flush(ctx, true, task, files);
88828882
/* cancellations _may_ trigger task work */
88838883
io_run_task_work();
88848884
schedule();

0 commit comments

Comments
 (0)