Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-28 16:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: always reissue from task_work context

Browse Source 
As a safeguard, if we're going to queue async work, do it from task_work
from the original task. This ensures that we can always sanely create
threads, regards of what the reissue context may be.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2021-07-27 10:25:55 -06:00
parent 110aa25c3c
commit 773af69121
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/io_uring.c
View File

@ -2060,6 +2060,12 @@ static void io_req_task_queue(struct io_kiocb *req)
io_req_task_work_add(req); io_req_task_work_add(req);
} }
static void io_req_task_queue_reissue(struct io_kiocb *req)
{
req->io_task_work.func = io_queue_async_work;
io_req_task_work_add(req);
}
static inline void io_queue_next(struct io_kiocb *req) static inline void io_queue_next(struct io_kiocb *req)
{ {
struct io_kiocb *nxt = io_req_find_next(req); struct io_kiocb *nxt = io_req_find_next(req);
@ -2248,7 +2254,7 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events,
!(req->flags & REQ_F_DONT_REISSUE)) { !(req->flags & REQ_F_DONT_REISSUE)) {
req->iopoll_completed = 0; req->iopoll_completed = 0;
req_ref_get(req); req_ref_get(req);
io_queue_async_work(req); io_req_task_queue_reissue(req);
continue; continue;
} }
@ -2771,7 +2777,7 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret,
req->flags &= ~REQ_F_REISSUE; req->flags &= ~REQ_F_REISSUE;
if (io_resubmit_prep(req)) { if (io_resubmit_prep(req)) {
req_ref_get(req); req_ref_get(req);
io_queue_async_work(req); io_req_task_queue_reissue(req);
} else { } else {
int cflags = 0; int cflags = 0;