io_uring/net: disable partial retries for recvmsg with cmsg
Jens Axboe
maintainerPATCH v2 1/1 io_uring/net: disable partial retries for recvmsg with cmsg
We cannot sanely handle partial retries for recvmsg if we have cmsg attached. If we don't, then we'd just be overwriting the initial cmsg header on retries. Alternatively we could increment and handle this appropriately, but it doesn't seem worth the complication.
Move the MSG_WAITALL check into the non-multishot case while at it, since MSG_WAITALL is explicitly disabled for multishot anyway.
---
v2: correct msg_controllen check and move into non-mshot branch
io_uring/net.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
io_uring/net.c +7 -4
@@ -789,16 +789,19 @@ int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags) flags = sr->msg_flags;if (force_nonblock) flags |=MSG_DONTWAIT ; -if (flags &MSG_WAITALL ) - min_ret =iov_iter_count (&kmsg->msg.msg_iter); kmsg->msg.msg_get_inq =1 ; -if (req->flags &REQ_F_APOLL_MULTISHOT ) +if (req->flags &REQ_F_APOLL_MULTISHOT ) { ret =io_recvmsg_multishot (sock, sr, kmsg, flags, &mshot_finished); -else + }else { +/* disable partial retry for recvmsg with cmsg attached */ +if (flags &MSG_WAITALL && !kmsg->msg.msg_controllen) + min_ret =iov_iter_count (&kmsg->msg.msg_iter); + ret =__sys_recvmsg_sock (sock, &kmsg->msg, sr->umsg, kmsg->uaddr, flags); + }if (ret < min_ret) {if (ret == -EAGAIN && force_nonblock) {
Signature · 4 lines
2.39.2 -- Jens Axboe
Am 20.06.23 um 15:19 schrieb Jens Axboe:
Quoted 5 lines
We cannot sanely handle partial retries for recvmsg if we have cmsg attached. If we don't, then we'd just be overwriting the initial cmsg header on retries. Alternatively we could increment and handle this appropriately, but it doesn't seem worth the complication.
Quoted 7 lines
Move the
MSG_WAITALLcheck into the non-multishot case while at it, sinceMSG_WAITALLis explicitly disabled for multishot anyway.Cc [email protected] # 5.10+Reported-by Stefan Metzmacher <[email protected]>Signed-off-by Jens Axboe <[email protected]>
Also Reviewed-by: Stefan Metzmacher <[email protected]>
Quoted 35 lines
---
v2: correct
msg_controllencheck and move into non-mshot branchio_uring/net.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)io_uring/net.c +7
-4@@ -789,16 +789,19 @@ int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags) flags = sr->msg_flags;if (force_nonblock) flags |=MSG_DONTWAIT ; -if (flags &MSG_WAITALL ) - min_ret =iov_iter_count (&kmsg->msg.msg_iter); kmsg->msg.msg_get_inq =1 ; -if (req->flags &REQ_F_APOLL_MULTISHOT ) +if (req->flags &REQ_F_APOLL_MULTISHOT ) { ret =io_recvmsg_multishot (sock, sr, kmsg, flags, &mshot_finished); -else + }else { +/* disable partial retry for recvmsg with cmsg attached */ +if (flags &MSG_WAITALL && !kmsg->msg.msg_controllen) + min_ret =iov_iter_count (&kmsg->msg.msg_iter); + ret =__sys_recvmsg_sock (sock, &kmsg->msg, sr->umsg, kmsg->uaddr, flags); + }if (ret < min_ret) {if (ret == -EAGAIN && force_nonblock) {