Commit 6889ae1b authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

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: stable@vger.kernel.org
Fixes: a05d1f62 ("io_uring/net: support bundles for send")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/8b611dbb54d1cd47a88681f5d38c84d0c02bc563.1743067183.git.asml.silence@gmail.com


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

include/linux/io_uring_types.h

+3 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ enum { 
	REQ_F_SKIP_LINK_CQES_BIT,

	REQ_F_SINGLE_POLL_BIT,

	REQ_F_DOUBLE_POLL_BIT,

	REQ_F_MULTISHOT_BIT,

	REQ_F_APOLL_MULTISHOT_BIT,

	REQ_F_CLEAR_POLLIN_BIT,

	/* keep async read/write and isreg together and in order */
@@ -567,6 +568,8 @@ enum { 
	REQ_F_SINGLE_POLL	= IO_REQ_FLAG(REQ_F_SINGLE_POLL_BIT),

	/* double poll may active */

	REQ_F_DOUBLE_POLL	= IO_REQ_FLAG(REQ_F_DOUBLE_POLL_BIT),

	/* request posts multiple completions, should be set at prep time */

	REQ_F_MULTISHOT		= IO_REQ_FLAG(REQ_F_MULTISHOT_BIT),

	/* fast poll multishot mode */

	REQ_F_APOLL_MULTISHOT	= IO_REQ_FLAG(REQ_F_APOLL_MULTISHOT_BIT),

	/* recvmsg special flag, clear EPOLLIN */

io_uring/io_uring.c

+2 −2
Original line number Diff line number Diff line
@@ -1840,7 +1840,7 @@ void io_wq_submit_work(struct io_wq_work *work) 
	 * Don't allow any multishot execution from io-wq. It's more restrictive

	 * than necessary and also cleaner.

	 */

	if (req->flags & REQ_F_APOLL_MULTISHOT) {

	if (req->flags & (REQ_F_MULTISHOT|REQ_F_APOLL_MULTISHOT)) {

		err = -EBADFD;

		if (!io_file_can_poll(req))

			goto fail;
@@ -1851,7 +1851,7 @@ void io_wq_submit_work(struct io_wq_work *work) 
				goto fail;

			return;

		} else {

			req->flags &= ~REQ_F_APOLL_MULTISHOT;

			req->flags &= ~(REQ_F_APOLL_MULTISHOT|REQ_F_MULTISHOT);

		}

	}

io_uring/net.c

+1 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
		sr->msg_flags |= MSG_WAITALL;

		sr->buf_group = req->buf_index;

		req->buf_list = NULL;

		req->flags |= REQ_F_MULTISHOT;

	}



	if (io_is_compat(req->ctx))