Skip to content

Commit 6889ae1

Browse files
isilenceaxboe
authored andcommitted
io_uring/net: fix io_req_post_cqe abuse by send bundle
[ 114.987980][ T5313] WARNING: CPU: 6 PID: 5313 at io_uring/io_uring.c:872 io_req_post_cqe+0x12e/0x4f0 [ 114.991597][ T5313] RIP: 0010:io_req_post_cqe+0x12e/0x4f0 [ 115.001880][ T5313] Call Trace: [ 115.002222][ T5313] <TASK> [ 115.007813][ T5313] io_send+0x4fe/0x10f0 [ 115.009317][ T5313] io_issue_sqe+0x1a6/0x1740 [ 115.012094][ T5313] io_wq_submit_work+0x38b/0xed0 [ 115.013223][ T5313] io_worker_handle_work+0x62a/0x1600 [ 115.013876][ T5313] io_wq_worker+0x34f/0xdf0 As the comment states, io_req_post_cqe() should only be used by multishot requests, i.e. REQ_F_APOLL_MULTISHOT, which bundled sends are not. Add a flag signifying whether a request wants to post multiple CQEs. Eventually REQ_F_APOLL_MULTISHOT should imply the new flag, but that's left out for simplicity. Cc: [email protected] Fixes: a05d1f6 ("io_uring/net: support bundles for send") Signed-off-by: Pavel Begunkov <[email protected]> Link: https://lore.kernel.org/r/8b611dbb54d1cd47a88681f5d38c84d0c02bc563.1743067183.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <[email protected]>
1 parent 73b6dac commit 6889ae1

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

include/linux/io_uring_types.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ enum {
490490
REQ_F_SKIP_LINK_CQES_BIT,
491491
REQ_F_SINGLE_POLL_BIT,
492492
REQ_F_DOUBLE_POLL_BIT,
493+
REQ_F_MULTISHOT_BIT,
493494
REQ_F_APOLL_MULTISHOT_BIT,
494495
REQ_F_CLEAR_POLLIN_BIT,
495496
/* keep async read/write and isreg together and in order */
@@ -567,6 +568,8 @@ enum {
567568
REQ_F_SINGLE_POLL = IO_REQ_FLAG(REQ_F_SINGLE_POLL_BIT),
568569
/* double poll may active */
569570
REQ_F_DOUBLE_POLL = IO_REQ_FLAG(REQ_F_DOUBLE_POLL_BIT),
571+
/* request posts multiple completions, should be set at prep time */
572+
REQ_F_MULTISHOT = IO_REQ_FLAG(REQ_F_MULTISHOT_BIT),
570573
/* fast poll multishot mode */
571574
REQ_F_APOLL_MULTISHOT = IO_REQ_FLAG(REQ_F_APOLL_MULTISHOT_BIT),
572575
/* recvmsg special flag, clear EPOLLIN */

io_uring/io_uring.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,7 +1840,7 @@ void io_wq_submit_work(struct io_wq_work *work)
18401840
* Don't allow any multishot execution from io-wq. It's more restrictive
18411841
* than necessary and also cleaner.
18421842
*/
1843-
if (req->flags & REQ_F_APOLL_MULTISHOT) {
1843+
if (req->flags & (REQ_F_MULTISHOT|REQ_F_APOLL_MULTISHOT)) {
18441844
err = -EBADFD;
18451845
if (!io_file_can_poll(req))
18461846
goto fail;
@@ -1851,7 +1851,7 @@ void io_wq_submit_work(struct io_wq_work *work)
18511851
goto fail;
18521852
return;
18531853
} else {
1854-
req->flags &= ~REQ_F_APOLL_MULTISHOT;
1854+
req->flags &= ~(REQ_F_APOLL_MULTISHOT|REQ_F_MULTISHOT);
18551855
}
18561856
}
18571857

io_uring/net.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
448448
sr->msg_flags |= MSG_WAITALL;
449449
sr->buf_group = req->buf_index;
450450
req->buf_list = NULL;
451+
req->flags |= REQ_F_MULTISHOT;
451452
}
452453

453454
if (io_is_compat(req->ctx))

0 commit comments

Comments
 (0)