io_uring/cmd: kill one issue_flags to tw conversion

io_uring cmd converts struct io_tw_state to issue_flags and later back
to io_tw_state, it's awfully ill-fated, not to mention that intermediate
issue_flags state is not correct.

Get rid of the last conversion, drag through tw everything that came
with IO_URING_F_UNLOCKED, and replace io_req_complete_defer() with a
direct call to io_req_complete_defer(), at least for the time being.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Tested-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/c53fa3df749752bd058cf6f824a90704822d6bcc.1710799188.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index 1551848a9394f491a4352d62d72cc3836a1f3654..7c1c58c5837eeba1d11b4921d9f97c6b47c9673e 100644 (file)
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -130,11 +130,11 @@ void io_uring_cmd_done(struct io_uring_cmd *ioucmd, ssize_t ret, ssize_t res2,
        if (req->ctx->flags & IORING_SETUP_IOPOLL) {
                /* order with io_iopoll_req_issued() checking ->iopoll_complete */
                smp_store_release(&req->iopoll_completed, 1);
+       } else if (!(issue_flags & IO_URING_F_UNLOCKED)) {
+               io_req_complete_defer(req);
        } else {
-               struct io_tw_state ts = {
-                       .locked = !(issue_flags & IO_URING_F_UNLOCKED),
-               };
-               io_req_task_complete(req, &ts);
+               req->io_task_work.func = io_req_task_complete;
+               io_req_task_work_add(req);
        }
 }
 EXPORT_SYMBOL_GPL(io_uring_cmd_done);