[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/25] QIOChannelSocket: Introduce assert and reduce ifdefs to imp
From: |
Juan Quintela |
Subject: |
[PULL 02/25] QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability |
Date: |
Wed, 22 Jun 2022 02:25:24 +0200 |
From: Leonardo Bras <leobras@redhat.com>
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.
Signed-off-by: Leonardo Bras <leobras@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
io/channel-socket.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/io/channel-socket.c b/io/channel-socket.c
index dc9c165de1..dac9e60c20 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -578,11 +578,17 @@ 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
+ /*
+ * We expect QIOChannel class entry point to have
+ * blocked this code path already
+ */
+ g_assert_unreachable();
#endif
+ }
retry:
ret = sendmsg(sioc->fd, &msg, sflags);
@@ -592,15 +598,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,
--
2.35.3
- [PULL 00/25] Migration 20220621 patches, Juan Quintela, 2022/06/21
- [PULL 01/25] migration: Remove RDMA_UNREGISTRATION_EXAMPLE, Juan Quintela, 2022/06/21
- [PULL 02/25] QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability,
Juan Quintela <=
- [PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works, Juan Quintela, 2022/06/21
- [PULL 04/25] migration: Change zero_copy_send from migration parameter to migration capability, Juan Quintela, 2022/06/21
- [PULL 05/25] io: add a QIOChannelNull equivalent to /dev/null, Juan Quintela, 2022/06/21
- [PULL 08/25] migration: rename rate limiting fields in QEMUFile, Juan Quintela, 2022/06/21
- [PULL 06/25] migration: switch to use QIOChannelNull for dummy channel, Juan Quintela, 2022/06/21
- [PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_processed', Juan Quintela, 2022/06/21
- [PULL 07/25] migration: remove unreachble RDMA code in save_hook impl, Juan Quintela, 2022/06/21
- [PULL 12/25] migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit, Juan Quintela, 2022/06/21
- [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred, Juan Quintela, 2022/06/21
- [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer, Juan Quintela, 2022/06/21