QIOChannelSocket: Add support for MSG_ZEROCOPY + IPV6
PATCH 1/1 QIOChannelSocket: Add support for MSG_ZEROCOPY + IPV6
For using MSG_ZEROCOPY, there are two steps:
1 - io_writev() the packet, which enqueues the packet for sending, and 2 - io_flush(), which gets confirmation that all packets got correctly sent
Currently, if MSG_ZEROCOPY is used to send packets over IPV6, no error will be reported in (1), but it will fail in the first time (2) happens.
This happens because (2) currently checks for cmsg_level & cmsg_type associated with IPV4 only, before reporting any error.
Add checks for cmsg_level & cmsg_type associated with IPV6, and thus enable support for MSG_ZEROCOPY + IPV6
--- io/channel-socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
io/channel-socket.c +2 -2
@@ -815,8 +815,8 @@ static int qio_channel_socket_flush(QIOChannel *ioc, } cm =CMSG_FIRSTHDR (&msg); -if (cm->cmsg_level !=SOL_IP && - cm->cmsg_type !=IP_RECVERR ) { +if (cm->cmsg_level !=SOL_IP && cm->cmsg_type !=IP_RECVERR && + cm->cmsg_level !=SOL_IPV6 && cm->cmsg_type !=IPV6_RECVERR ) {error_setg_errno (errp,EPROTOTYPE ,"Wrong cmsg in errqueue" );return -1 ;
Signature · 1 line
2.37.1
Quoted 4 lines · Leonardo Bras
For using
MSG_ZEROCOPY, there are two steps:
1 -io_writev()the packet, which enqueues the packet for sending, and 2 -io_flush(), which gets confirmation that all packets got correctly sent
Quoted 8 lines
Currently, if
MSG_ZEROCOPYis used to send packets over IPV6, no error will be reported in (1), but it will fail in the first time (2) happens.This happens because (2) currently checks for
cmsg_level&cmsg_typeassociated with IPV4 only, before reporting any error.Add checks for
cmsg_level&cmsg_typeassociated with IPV6, and thus enable support forMSG_ZEROCOPY+ IPV6
Oh, subtle.
Quoted 6 lines
Fixes 2bc58ffc29 ("QIOChannelSocket: Implement io_writev zero copy flag & io_flush for CONFIG_LINUX")Signed-off-by Leonardo Bras <[email protected]>--- io/channel-socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 7 lines · Leonardo Bras
For using
MSG_ZEROCOPY, there are two steps:
1 -io_writev()the packet, which enqueues the packet for sending, and 2 -io_flush(), which gets confirmation that all packets got correctly sentCurrently, if
MSG_ZEROCOPYis used to send packets over IPV6, no error will be reported in (1), but it will fail in the first time (2) happens.
Quoted 8 lines
This happens because (2) currently checks for
cmsg_level&cmsg_typeassociated with IPV4 only, before reporting any error.Add checks for
cmsg_level&cmsg_typeassociated with IPV6, and thus enable support forMSG_ZEROCOPY+ IPV6Fixes 2bc58ffc29 ("QIOChannelSocket: Implement io_writev zero copy flag & io_flush for CONFIG_LINUX")Signed-off-by Leonardo Bras <[email protected]>
Signature · 1 line
Peter Xu