Commit 5027d024 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: unify STOP_MULTISHOT with IOU_OK 



IOU_OK means that the request ownership is now handed back to core
io_uring and it has to complete it using the result provided in
req->cqe. Same is true for multishot and IOU_STOP_MULTISHOT.

Rename it into IOU_COMPLETE to avoid confusion and use for both modes.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/e6a5b2edb0eb9558acb1c8f1db38ac45fee95491.1741453534.git.asml.silence@gmail.com


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

io_uring/io_uring.c

+0 −1
Original line number Diff line number Diff line
@@ -1792,7 +1792,6 @@ int io_poll_issue(struct io_kiocb *req, io_tw_token_t tw) 
	ret = __io_issue_sqe(req, issue_flags, &io_issue_defs[req->opcode]);



	WARN_ON_ONCE(ret == IOU_ISSUE_SKIP_COMPLETE);

	WARN_ON_ONCE(ret == IOU_OK);

	return ret;

}

io_uring/io_uring.h

+3 −8
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
#endif



enum {

	IOU_OK			= 0,

	IOU_OK			= 0, /* deprecated, use IOU_COMPLETE */

	IOU_COMPLETE		= 0,



	IOU_ISSUE_SKIP_COMPLETE	= -EIOCBQUEUED,



	/*
@@ -36,13 +38,6 @@ enum { 
	 * valid error code, yet less than -MAX_ERRNO and valid internally.

	 */

	IOU_REQUEUE		= -3072,



	/*

	 * Intended only when both IO_URING_F_MULTISHOT is passed

	 * to indicate to the poll runner that multishot should be

	 * removed and the result is set on req->cqe.res.

	 */

	IOU_STOP_MULTISHOT	= -ECANCELED,

};



struct io_wait_queue {

io_uring/net.c

+4 −15
Original line number Diff line number Diff line
@@ -915,11 +915,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret, 
	/* Finish the request / stop multishot. */

finish:

	io_req_set_res(req, *ret, cflags);



	if (issue_flags & IO_URING_F_MULTISHOT)

		*ret = IOU_STOP_MULTISHOT;

	else

		*ret = IOU_OK;

	*ret = IOU_COMPLETE;

	io_req_msg_cleanup(req, issue_flags);

	return true;

}
@@ -1288,9 +1284,7 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags) 
	if (len && zc->len == 0) {

		io_req_set_res(req, 0, 0);



		if (issue_flags & IO_URING_F_MULTISHOT)

			return IOU_STOP_MULTISHOT;

		return IOU_OK;

		return IOU_COMPLETE;

	}

	if (unlikely(ret <= 0) && ret != -EAGAIN) {

		if (ret == -ERESTARTSYS)
@@ -1300,10 +1294,7 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags) 


		req_set_fail(req);

		io_req_set_res(req, ret, 0);



		if (issue_flags & IO_URING_F_MULTISHOT)

			return IOU_STOP_MULTISHOT;

		return IOU_OK;

		return IOU_COMPLETE;

	}

	return IOU_RETRY;

}
@@ -1709,9 +1700,7 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags) 
	io_req_set_res(req, ret, cflags);

	if (ret < 0)

		req_set_fail(req);

	if (!(issue_flags & IO_URING_F_MULTISHOT))

		return IOU_OK;

	return IOU_STOP_MULTISHOT;

	return IOU_COMPLETE;

}



int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

io_uring/poll.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int io_poll_check_events(struct io_kiocb *req, io_tw_token_t tw) 
		} else {

			int ret = io_poll_issue(req, tw);



			if (ret == IOU_STOP_MULTISHOT)

			if (ret == IOU_COMPLETE)

				return IOU_POLL_REMOVE_POLL_USE_RES;

			else if (ret == IOU_REQUEUE)

				return IOU_POLL_REQUEUE;

io_uring/rw.c

+1 −3
Original line number Diff line number Diff line
@@ -1104,9 +1104,7 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags) 
	 */

	io_req_set_res(req, ret, cflags);

	io_req_rw_cleanup(req, issue_flags);

	if (issue_flags & IO_URING_F_MULTISHOT)

		return IOU_STOP_MULTISHOT;

	return IOU_OK;

	return IOU_COMPLETE;

}



static bool io_kiocb_start_write(struct io_kiocb *req, struct kiocb *kiocb)