QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability
PATCH v3 1/2 QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability
During implementation of MSG_ZEROCOPY feature, a lot of #ifdefs were introduced, particularly at qio_channel_socket_writev().
Rewrite some of those changes so it's easier to read.
Also, introduce an assert to help detect incorrect zero-copy usage is when it's disabled on build.
--- io/channel-socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
io/channel-socket.c +5 -5
@@ -578,11 +578,13 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,memcpy (CMSG_DATA (cmsg), fds, fdsize); } -#ifdef QEMU_MSG_ZEROCOPY if (flags &QIO_CHANNEL_WRITE_FLAG_ZERO_COPY ) { +#ifdef QEMU_MSG_ZEROCOPY sflags =MSG_ZEROCOPY ; - } +#else +g_assert_unreachable ();#endif + } retry: ret =sendmsg (sioc->fd, &msg, sflags);
@@ -592,15 +594,13 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,return QIO_CHANNEL_ERR_BLOCK ;case EINTR : goto retry; -#ifdef QEMU_MSG_ZEROCOPY case ENOBUFS : -if (sflags &MSG_ZEROCOPY ) { +if (flags &QIO_CHANNEL_WRITE_FLAG_ZERO_COPY ) {error_setg_errno (errp, errno,"Process can't lock enough memory for using MSG_ZEROCOPY" );return -1 ; }break ; -#endif } error_setg_errno(errp, errno,
Signature · 1 line
2.36.1
PATCH v3 2/2 QIOChannelSocket: Fix zero-copy send so socket flush works
Somewhere between v6 and v7 the of the zero-copy-send patchset a crucial part of the flushing mechanism got missing: incrementing zero_copy_queued.
Without that, the flushing interface becomes a no-op, and there is no guarantee the buffer is really sent.
This can go as bad as causing a corruption in RAM during migration.
--- io/channel-socket.c | 5 +++++ 1 file changed, 5 insertions(+)
io/channel-socket.c +5 -0
@@ -607,6 +607,11 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc, "Unable to write to socket"); return -1; } + +if (flags &QIO_CHANNEL_WRITE_FLAG_ZERO_COPY ) { + sioc->zero_copy_queued++; + } +return ret; }#else /* WIN32 */
Signature · 1 line
2.36.1
Re: [PATCH v3 2/2] QIOChannelSocket: Fix zero-copy send so socket flush works
Quoted 6 lines · Leonardo Bras
Somewhere between v6 and v7 the of the zero-copy-send patchset a crucial part of the flushing mechanism got missing: incrementing
zero_copy_queued.Without that, the flushing interface becomes a no-op, and there is no guarantee the buffer is really sent.
Quoted 8 lines
This can go as bad as causing a corruption in RAM during migration.
Fixes 2bc58ffc2926 ("QIOChannelSocket: Implement io_writev zero copy flag & io_flush for CONFIG_LINUX")Reported-by 徐闯 <[email protected]>Signed-off-by Leonardo Bras <[email protected]>--- io/channel-socket.c | 5 +++++ 1 file changed, 5 insertions(+)
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 18 lines · Leonardo Bras
During implementation of
MSG_ZEROCOPYfeature, a lot of #ifdefs were introduced, particularly atqio_channel_socket_writev().Rewrite some of those changes so it's easier to read.
Also, introduce an assert to help detect incorrect zero-copy usage is when it's disabled on build.
Signed-off-by Leonardo Bras <[email protected]>--- io/channel-socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)io/channel-socket.c +0
-0
io/channel-socket.c static ssize_t qio_channel_socket_writev(QIOChannel *ioc, · line 584
Quoted 9 lines
io/channel-socket.c +2
-2@@ -578,11 +578,13 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,memcpy (CMSG_DATA (cmsg), fds, fdsize); } -#ifdef QEMU_MSG_ZEROCOPY if (flags &QIO_CHANNEL_WRITE_FLAG_ZERO_COPY ) { +#ifdef QEMU_MSG_ZEROCOPY sflags =MSG_ZEROCOPY ; - } +#else
I would just add a comment:
/* We expect QIOChannel class entry point to have
blocked this code path already */
Quoted 13 lines
io/channel-socket.c +2
-2+g_assert_unreachable ();#endif + } retry: ret =sendmsg (sioc->fd, &msg, sflags);@@ -592,15 +594,13 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,return QIO_CHANNEL_ERR_BLOCK ;case EINTR : goto retry; -#ifdef QEMU_MSG_ZEROCOPY case ENOBUFS : -if (sflags &MSG_ZEROCOPY ) {
io/channel-socket.c static ssize_t qio_channel_socket_writev(QIOChannel *ioc, · line 606
Quoted 10 lines
io/channel-socket.c +1
-1+if (flags &QIO_CHANNEL_WRITE_FLAG_ZERO_COPY ) {error_setg_errno (errp, errno,"Process can't lock enough memory for using MSG_ZEROCOPY" );return -1 ; }break ; -#endif } error_setg_errno(errp, errno,
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 :|