superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/e6a5b2edb0eb9558acb1c8f1db38ac45fee95491.1741453534.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1188/head
Pavel Begunkov 2025-03-08 17:19:33 +00:00 committed by Jens Axboe
parent 7a9dcb05f5
commit 5027d02452
5 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
io_uring/io_uring.c
View File

@ -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]); 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_ISSUE_SKIP_COMPLETE);
WARN_ON_ONCE(ret == IOU_OK);
return ret; return ret;
} }

11
io_uring/io_uring.h
View File

@ -19,7 +19,9 @@
#endif #endif
enum { enum {
IOU_OK = 0, IOU_OK = 0, /* deprecated, use IOU_COMPLETE */
IOU_COMPLETE = 0,
IOU_ISSUE_SKIP_COMPLETE = -EIOCBQUEUED, IOU_ISSUE_SKIP_COMPLETE = -EIOCBQUEUED,
/* /*
@ -36,13 +38,6 @@ enum {
* valid error code, yet less than -MAX_ERRNO and valid internally. * valid error code, yet less than -MAX_ERRNO and valid internally.
*/ */
IOU_REQUEUE = -3072, 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 { struct io_wait_queue {

19
io_uring/net.c
View File

@ -915,11 +915,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret,
/* Finish the request / stop multishot. */ /* Finish the request / stop multishot. */
finish: finish:
io_req_set_res(req, *ret, cflags); io_req_set_res(req, *ret, cflags);
*ret = IOU_COMPLETE;
if (issue_flags & IO_URING_F_MULTISHOT)
*ret = IOU_STOP_MULTISHOT;
else
*ret = IOU_OK;
io_req_msg_cleanup(req, issue_flags); io_req_msg_cleanup(req, issue_flags);
return true; return true;
} }
@ -1288,9 +1284,7 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags)
if (len && zc->len == 0) { if (len && zc->len == 0) {
io_req_set_res(req, 0, 0); io_req_set_res(req, 0, 0);
if (issue_flags & IO_URING_F_MULTISHOT) return IOU_COMPLETE;
return IOU_STOP_MULTISHOT;
return IOU_OK;
} }
if (unlikely(ret <= 0) && ret != -EAGAIN) { if (unlikely(ret <= 0) && ret != -EAGAIN) {
if (ret == -ERESTARTSYS) if (ret == -ERESTARTSYS)
@ -1300,10 +1294,7 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags)
req_set_fail(req); req_set_fail(req);
io_req_set_res(req, ret, 0); io_req_set_res(req, ret, 0);
return IOU_COMPLETE;
if (issue_flags & IO_URING_F_MULTISHOT)
return IOU_STOP_MULTISHOT;
return IOU_OK;
} }
return IOU_RETRY; return IOU_RETRY;
} }
@ -1709,9 +1700,7 @@ retry:
io_req_set_res(req, ret, cflags); io_req_set_res(req, ret, cflags);
if (ret < 0) if (ret < 0)
req_set_fail(req); req_set_fail(req);
if (!(issue_flags & IO_URING_F_MULTISHOT)) return IOU_COMPLETE;
return IOU_OK;
return IOU_STOP_MULTISHOT;
} }
int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

2
io_uring/poll.c
View File

@ -290,7 +290,7 @@ static int io_poll_check_events(struct io_kiocb *req, io_tw_token_t tw)
} else { } else {
int ret = io_poll_issue(req, tw); int ret = io_poll_issue(req, tw);
if (ret == IOU_STOP_MULTISHOT) if (ret == IOU_COMPLETE)
return IOU_POLL_REMOVE_POLL_USE_RES; return IOU_POLL_REMOVE_POLL_USE_RES;
else if (ret == IOU_REQUEUE) else if (ret == IOU_REQUEUE)
return IOU_POLL_REQUEUE; return IOU_POLL_REQUEUE;

4
io_uring/rw.c
View File

@ -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_set_res(req, ret, cflags);
io_req_rw_cleanup(req, issue_flags); io_req_rw_cleanup(req, issue_flags);
if (issue_flags & IO_URING_F_MULTISHOT) return IOU_COMPLETE;
return IOU_STOP_MULTISHOT;
return IOU_OK;
} }
static bool io_kiocb_start_write(struct io_kiocb *req, struct kiocb *kiocb) static bool io_kiocb_start_write(struct io_kiocb *req, struct kiocb *kiocb)