Skip to content

Commit

Permalink
io_uring: hold 'ctx' reference around task_work queue + execute
Browse files Browse the repository at this point in the history
We're holding the request reference, but we need to go one higher
to ensure that the ctx remains valid after the request has finished.
If the ring is closed with pending task_work inflight, and the
given io_kiocb finishes sync during issue, then we need a reference
to the ring itself around the task_work execution cycle.

Cc: [email protected] # v5.7+
Reported-by: [email protected]
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
axboe committed Aug 11, 2020
1 parent efa8480 commit 6d816e0
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions fs/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -1821,15 +1821,18 @@ static void __io_req_task_submit(struct io_kiocb *req)
static void io_req_task_submit(struct callback_head *cb)
{
struct io_kiocb *req = container_of(cb, struct io_kiocb, task_work);
struct io_ring_ctx *ctx = req->ctx;

__io_req_task_submit(req);
percpu_ref_put(&ctx->refs);
}

static void io_req_task_queue(struct io_kiocb *req)
{
int ret;

init_task_work(&req->task_work, io_req_task_submit);
percpu_ref_get(&req->ctx->refs);

ret = io_req_task_work_add(req, &req->task_work);
if (unlikely(ret)) {
Expand Down Expand Up @@ -2318,6 +2321,8 @@ static void io_rw_resubmit(struct callback_head *cb)
refcount_inc(&req->refs);
io_queue_async_work(req);
}

percpu_ref_put(&ctx->refs);
}
#endif

Expand All @@ -2330,6 +2335,8 @@ static bool io_rw_reissue(struct io_kiocb *req, long res)
return false;

init_task_work(&req->task_work, io_rw_resubmit);
percpu_ref_get(&req->ctx->refs);

ret = io_req_task_work_add(req, &req->task_work);
if (!ret)
return true;
Expand Down Expand Up @@ -3033,6 +3040,8 @@ static int io_async_buf_func(struct wait_queue_entry *wait, unsigned mode,
list_del_init(&wait->entry);

init_task_work(&req->task_work, io_req_task_submit);
percpu_ref_get(&req->ctx->refs);

/* submit ref gets dropped, acquire a new one */
refcount_inc(&req->refs);
ret = io_req_task_work_add(req, &req->task_work);
Expand Down Expand Up @@ -4565,6 +4574,8 @@ static int __io_async_wake(struct io_kiocb *req, struct io_poll_iocb *poll,

req->result = mask;
init_task_work(&req->task_work, func);
percpu_ref_get(&req->ctx->refs);

/*
* If this fails, then the task is exiting. When a task exits, the
* work gets canceled, so just cancel this request as well instead
Expand Down Expand Up @@ -4652,11 +4663,13 @@ static void io_poll_task_handler(struct io_kiocb *req, struct io_kiocb **nxt)
static void io_poll_task_func(struct callback_head *cb)
{
struct io_kiocb *req = container_of(cb, struct io_kiocb, task_work);
struct io_ring_ctx *ctx = req->ctx;
struct io_kiocb *nxt = NULL;

io_poll_task_handler(req, &nxt);
if (nxt)
__io_req_task_submit(nxt);
percpu_ref_put(&ctx->refs);
}

static int io_poll_double_wake(struct wait_queue_entry *wait, unsigned mode,
Expand Down Expand Up @@ -4752,6 +4765,7 @@ static void io_async_task_func(struct callback_head *cb)

if (io_poll_rewait(req, &apoll->poll)) {
spin_unlock_irq(&ctx->completion_lock);
percpu_ref_put(&ctx->refs);
return;
}

Expand All @@ -4767,6 +4781,7 @@ static void io_async_task_func(struct callback_head *cb)
else
__io_req_task_cancel(req, -ECANCELED);

percpu_ref_put(&ctx->refs);
kfree(apoll->double_poll);
kfree(apoll);
}
Expand Down

0 comments on commit 6d816e0

Please sign in to comment.