Commit 6edd953b authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

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: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Tested-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/c53fa3df749752bd058cf6f824a90704822d6bcc.1710799188.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent da12d9ab

io_uring/uring_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -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);