diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-11-03 18:23:38 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-11-06 21:55:38 +0100 |
| commit | b6f58a3f4aa8dba424356c7a69388a81f4459300 (patch) | |
| tree | 762afa454110f88f4ef7d5e0b7530486710ad8fa /io_uring/poll.c | |
| parent | io_uring: remove task ref helpers (diff) | |
| download | linux-b6f58a3f4aa8dba424356c7a69388a81f4459300.tar.xz linux-b6f58a3f4aa8dba424356c7a69388a81f4459300.zip | |
io_uring: move struct io_kiocb from task_struct to io_uring_task
Rather than store the task_struct itself in struct io_kiocb, store
the io_uring specific task_struct. The life times are the same in terms
of io_uring, and this avoids doing some dereferences through the
task_struct. For the hot path of putting local task references, we can
deref req->tctx instead, which we'll need anyway in that function
regardless of whether it's local or remote references.
This is mostly straight forward, except the original task PF_EXITING
check needs a bit of tweaking. task_work is _always_ run from the
originating task, except in the fallback case, where it's run from a
kernel thread. Replace the potentially racy (in case of fallback work)
checks for req->task->flags with current->flags. It's either the still
the original task, in which case PF_EXITING will be sane, or it has
PF_KTHREAD set, in which case it's fallback work. Both cases should
prevent moving forward with the given request.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/poll.c')
| -rw-r--r-- | io_uring/poll.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/io_uring/poll.c b/io_uring/poll.c index 7db3010b5733..bced9edd5233 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -224,8 +224,7 @@ static int io_poll_check_events(struct io_kiocb *req, struct io_tw_state *ts) { int v; - /* req->task == current here, checking PF_EXITING is safe */ - if (unlikely(req->task->flags & PF_EXITING)) + if (unlikely(io_should_terminate_tw())) return -ECANCELED; do { |