io_uring: have cancelation API accept io_uring_task directly

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>

diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index d1e7f5a..500ee5f 100644 (file)
--- a/io_uring/cancel.c
+++ b/io_uring/cancel.c
@@ -77,15 +77,15 @@ static int io_async_cancel_one(struct io_uring_task *tctx,
        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)
 {
-       struct io_ring_ctx *ctx = req->ctx;
+       struct io_ring_ctx *ctx = cd->ctx;
        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
         * that need unarming.
@@ -104,7 +104,6 @@ int io_try_cancel(struct io_kiocb *req, struct io_cancel_data *cd,
        return ret;
 }
 
-
 int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 {
        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;
 }
 
-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)
 {
        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;
 
        do {
-               ret = io_try_cancel(req, cd, issue_flags);
+               ret = io_try_cancel(tctx, cd, issue_flags);
                if (ret == -ENOENT)
                        break;
                if (!all)
@@ -170,6 +170,7 @@ int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags)
                .flags  = cancel->flags,
                .seq    = atomic_inc_return(&req->ctx->cancel_seq),
        };
+       struct io_uring_task *tctx = req->task->io_uring;
        int ret;
 
        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;
        }
 
-       ret = __io_async_cancel(&cd, req, issue_flags);
+       ret = __io_async_cancel(&cd, tctx, issue_flags);
 done:
        if (ret < 0)
                req_set_fail(req);

diff --git a/io_uring/cancel.h b/io_uring/cancel.h
index 2338012..1bc7e91 100644 (file)
--- a/io_uring/cancel.h
+++ b/io_uring/cancel.h
@@ -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(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);
 void init_hash_table(struct io_hash_table *table, unsigned size);

diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index 7e2c341..4af074b 100644 (file)
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -274,7 +274,7 @@ static void io_req_task_link_timeout(struct io_kiocb *req, bool *locked)
                                .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_complete_post(req);