io_uring/cmd: add cmd lazy tw wake helper

[linux-block.git] / io_uring / uring_cmd.c

diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index 5113c9a48583bfa43a4698a988724d081f5349e7..476c7877ce587037edc5a937dc4173ba0c1f0752 100644 (file)
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -20,16 +20,24 @@ static void io_uring_cmd_work(struct io_kiocb *req, struct io_tw_state *ts)
        ioucmd->task_work_cb(ioucmd, issue_flags);
 }
 
-void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,
-                       void (*task_work_cb)(struct io_uring_cmd *, unsigned))
+void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,
+                       void (*task_work_cb)(struct io_uring_cmd *, unsigned),
+                       unsigned flags)
 {
        struct io_kiocb *req = cmd_to_io_kiocb(ioucmd);
 
        ioucmd->task_work_cb = task_work_cb;
        req->io_task_work.func = io_uring_cmd_work;
-       io_req_task_work_add(req);
+       __io_req_task_work_add(req, flags);
 }
-EXPORT_SYMBOL_GPL(io_uring_cmd_complete_in_task);
+EXPORT_SYMBOL_GPL(__io_uring_cmd_do_in_task);
+
+void io_uring_cmd_do_in_task_lazy(struct io_uring_cmd *ioucmd,
+                       void (*task_work_cb)(struct io_uring_cmd *, unsigned))
+{
+       __io_uring_cmd_do_in_task(ioucmd, task_work_cb, IOU_F_TWQ_LAZY_WAKE);
+}
+EXPORT_SYMBOL_GPL(io_uring_cmd_do_in_task_lazy);
 
 static inline void io_req_set_cqe32_extra(struct io_kiocb *req,
                                          u64 extra1, u64 extra2)
@@ -69,15 +77,9 @@ EXPORT_SYMBOL_GPL(io_uring_cmd_done);
 int io_uring_cmd_prep_async(struct io_kiocb *req)
 {
        struct io_uring_cmd *ioucmd = io_kiocb_to_cmd(req, struct io_uring_cmd);
-       size_t cmd_size;
-
-       BUILD_BUG_ON(uring_cmd_pdu_size(0) != 16);
-       BUILD_BUG_ON(uring_cmd_pdu_size(1) != 80);
-
-       cmd_size = uring_cmd_pdu_size(req->ctx->flags & IORING_SETUP_SQE128);
 
-       memcpy(req->async_data, ioucmd->cmd, cmd_size);
-       ioucmd->cmd = req->async_data;
+       memcpy(req->async_data, ioucmd->sqe, uring_sqe_size(req->ctx));
+       ioucmd->sqe = req->async_data;
        return 0;
 }
 
@@ -103,7 +105,7 @@ int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
                req->imu = ctx->user_bufs[index];
                io_req_set_rsrc_node(req, ctx, 0);
        }
-       ioucmd->cmd = sqe->cmd;
+       ioucmd->sqe = sqe;
        ioucmd->cmd_op = READ_ONCE(sqe->cmd_op);
        return 0;
 }