Skip to content

Commit 3e4cb6e

Browse files
metze-sambaaxboe
authored andcommitted
io_uring/net: fix fast_iov assignment in io_setup_async_msg()
I hit a very bad problem during my tests of SENDMSG_ZC. BUG(); in first_iovec_segment() triggered very easily. The problem was io_setup_async_msg() in the partial retry case, which seems to happen more often with _ZC. iov_iter_iovec_advance() may change i->iov in order to have i->iov_offset being only relative to the first element. Which means kmsg->msg.msg_iter.iov is no longer the same as kmsg->fast_iov. But this would rewind the copy to be the start of async_msg->fast_iov, which means the internal state of sync_msg->msg.msg_iter is inconsitent. I tested with 5 vectors with length like this 4, 0, 64, 20, 8388608 and got a short writes with: - ret=2675244 min_ret=8388692 => remaining 5713448 sr->done_io=2675244 - ret=-EAGAIN => io_uring_poll_arm - ret=4911225 min_ret=5713448 => remaining 802223 sr->done_io=7586469 - ret=-EAGAIN => io_uring_poll_arm - ret=802223 min_ret=802223 => res=8388692 While this was easily triggered with SENDMSG_ZC (queued for 6.1), it was a potential problem starting with 7ba89d2 in 5.18 for IORING_OP_RECVMSG. And also with 4c3c094 in 5.19 for IORING_OP_SENDMSG. However 257e84a introduced the critical code into io_setup_async_msg() in 5.11. Fixes: 7ba89d2 ("io_uring: ensure recv and recvmsg handle MSG_WAITALL correctly") Fixes: 257e84a ("io_uring: refactor sendmsg/recvmsg iov managing") Cc: [email protected] Signed-off-by: Stefan Metzmacher <[email protected]> Reviewed-by: Pavel Begunkov <[email protected]> Link: https://lore.kernel.org/r/b2e7be246e2fb173520862b0c7098e55767567a2.1664436949.git.metze@samba.org Signed-off-by: Jens Axboe <[email protected]>
1 parent 04360d3 commit 3e4cb6e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

io_uring/net.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,10 @@ static int io_setup_async_msg(struct io_kiocb *req,
166166
memcpy(async_msg, kmsg, sizeof(*kmsg));
167167
async_msg->msg.msg_name = &async_msg->addr;
168168
/* if were using fast_iov, set it to the new one */
169-
if (!async_msg->free_iov)
170-
async_msg->msg.msg_iter.iov = async_msg->fast_iov;
169+
if (!kmsg->free_iov) {
170+
size_t fast_idx = kmsg->msg.msg_iter.iov - kmsg->fast_iov;
171+
async_msg->msg.msg_iter.iov = &async_msg->fast_iov[fast_idx];
172+
}
171173

172174
return -EAGAIN;
173175
}

0 commit comments

Comments
 (0)