Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-06 14:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: have cancelation API accept io_uring_task directly

Browse Source 
We just use the io_kiocb passed in to find the io_uring_task, and we
already pass in the ctx via cd->ctx anyway.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2022-06-18 09:23:54 -06:00
parent 024b8fde33
commit 88f52eaad2
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
io_uring/cancel.c
View File

@ -77,15 +77,15 @@ static int io_async_cancel_one(struct io_uring_task *tctx,
return ret; return ret;
} }
int io_try_cancel(struct io_kiocb *req, struct io_cancel_data *cd, int io_try_cancel(struct io_uring_task *tctx, struct io_cancel_data *cd,
unsigned issue_flags) unsigned issue_flags)
{ {
struct io_ring_ctx *ctx = req->ctx; struct io_ring_ctx *ctx = cd->ctx;
int ret; int ret;
WARN_ON_ONCE(!io_wq_current_is_worker() && req->task != current); WARN_ON_ONCE(!io_wq_current_is_worker() && tctx != current->io_uring);
ret = io_async_cancel_one(req->task->io_uring, cd); ret = io_async_cancel_one(tctx, cd);
/* /*
* Fall-through even for -EALREADY, as we may have poll armed * Fall-through even for -EALREADY, as we may have poll armed
* that need unarming. * that need unarming.
@ -104,7 +104,6 @@ int io_try_cancel(struct io_kiocb *req, struct io_cancel_data *cd,
return ret; return ret;
} }
int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{ {
struct io_cancel *cancel = io_kiocb_to_cmd(req); struct io_cancel *cancel = io_kiocb_to_cmd(req);
@ -127,7 +126,8 @@ int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return 0; return 0;
} }
static int __io_async_cancel(struct io_cancel_data *cd, struct io_kiocb *req, static int __io_async_cancel(struct io_cancel_data *cd,
struct io_uring_task *tctx,
unsigned int issue_flags) unsigned int issue_flags)
{ {
bool all = cd->flags & (IORING_ASYNC_CANCEL_ALL|IORING_ASYNC_CANCEL_ANY); bool all = cd->flags & (IORING_ASYNC_CANCEL_ALL|IORING_ASYNC_CANCEL_ANY);
@ -136,7 +136,7 @@ static int __io_async_cancel(struct io_cancel_data *cd, struct io_kiocb *req,
int ret, nr = 0; int ret, nr = 0;
do { do {
ret = io_try_cancel(req, cd, issue_flags); ret = io_try_cancel(tctx, cd, issue_flags);
if (ret == -ENOENT) if (ret == -ENOENT)
break; break;
if (!all) if (!all)
@ -170,6 +170,7 @@ int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags)
.flags = cancel->flags, .flags = cancel->flags,
.seq = atomic_inc_return(&req->ctx->cancel_seq), .seq = atomic_inc_return(&req->ctx->cancel_seq),
}; };
struct io_uring_task *tctx = req->task->io_uring;
int ret; int ret;
if (cd.flags & IORING_ASYNC_CANCEL_FD) { if (cd.flags & IORING_ASYNC_CANCEL_FD) {
@ -185,7 +186,7 @@ int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags)
cd.file = req->file; cd.file = req->file;
} }
ret = __io_async_cancel(&cd, req, issue_flags); ret = __io_async_cancel(&cd, tctx, issue_flags);
done: done:
if (ret < 0) if (ret < 0)
req_set_fail(req); req_set_fail(req);

2
io_uring/cancel.h
View File

@ -16,6 +16,6 @@ struct io_cancel_data {
int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags); int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags);
int io_try_cancel(struct io_kiocb *req, struct io_cancel_data *cd, int io_try_cancel(struct io_uring_task *tctx, struct io_cancel_data *cd,
unsigned int issue_flags); unsigned int issue_flags);
void init_hash_table(struct io_hash_table *table, unsigned size); void init_hash_table(struct io_hash_table *table, unsigned size);

2
io_uring/timeout.c
View File

@ -274,7 +274,7 @@ static void io_req_task_link_timeout(struct io_kiocb *req, bool *locked)
.data = prev->cqe.user_data, .data = prev->cqe.user_data,
}; };
ret = io_try_cancel(req, &cd, issue_flags); ret = io_try_cancel(req->task->io_uring, &cd, issue_flags);
} }
io_req_set_res(req, ret ?: -ETIME, 0); io_req_set_res(req, ret ?: -ETIME, 0);
io_req_complete_post(req); io_req_complete_post(req);