|
 |
4841a6 |
From 4051de396e02ea2c1911c842426318bcd97f93c7 Mon Sep 17 00:00:00 2001
|
|
|
719b13 |
From: Juan Quintela <quintela@redhat.com>
|
|
|
719b13 |
Date: Wed, 18 May 2022 02:52:24 -0300
|
|
|
4841a6 |
Subject: [PATCH 15/37] multifd: Use a single writev on the send side
|
|
|
719b13 |
MIME-Version: 1.0
|
|
|
719b13 |
Content-Type: text/plain; charset=UTF-8
|
|
|
719b13 |
Content-Transfer-Encoding: 8bit
|
|
|
719b13 |
|
|
|
719b13 |
RH-Author: Leonardo Brás <leobras@redhat.com>
|
|
|
4841a6 |
RH-MergeRequest: 191: MSG_ZEROCOPY + Multifd @ rhel8.7
|
|
|
4841a6 |
RH-Commit: [15/26] c37063c813fc0ba695072117f272360e5c413803
|
|
|
4841a6 |
RH-Bugzilla: 2072049
|
|
|
719b13 |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
4841a6 |
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
4841a6 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
719b13 |
|
|
|
719b13 |
Until now, we wrote the packet header with write(), and the rest of the
|
|
|
719b13 |
pages with writev(). Just increase the size of the iovec and do a
|
|
|
719b13 |
single writev().
|
|
|
719b13 |
|
|
|
719b13 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
719b13 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
719b13 |
(cherry picked from commit d48c3a044537689866fe44e65d24c7d39a68868a)
|
|
|
719b13 |
Signed-off-by: Leonardo Bras <leobras@redhat.com>
|
|
|
719b13 |
---
|
|
|
719b13 |
migration/multifd.c | 20 ++++++++------------
|
|
|
719b13 |
1 file changed, 8 insertions(+), 12 deletions(-)
|
|
|
719b13 |
|
|
|
719b13 |
diff --git a/migration/multifd.c b/migration/multifd.c
|
|
|
719b13 |
index 1e1551d78b..d0f86542b1 100644
|
|
|
719b13 |
--- a/migration/multifd.c
|
|
|
719b13 |
+++ b/migration/multifd.c
|
|
|
719b13 |
@@ -643,7 +643,7 @@ static void *multifd_send_thread(void *opaque)
|
|
|
719b13 |
uint32_t used = p->pages->num;
|
|
|
719b13 |
uint64_t packet_num = p->packet_num;
|
|
|
719b13 |
uint32_t flags = p->flags;
|
|
|
719b13 |
- p->iovs_num = 0;
|
|
|
719b13 |
+ p->iovs_num = 1;
|
|
|
719b13 |
|
|
|
719b13 |
if (used) {
|
|
|
719b13 |
ret = multifd_send_state->ops->send_prepare(p, &local_err);
|
|
|
719b13 |
@@ -663,20 +663,15 @@ static void *multifd_send_thread(void *opaque)
|
|
|
719b13 |
trace_multifd_send(p->id, packet_num, used, flags,
|
|
|
719b13 |
p->next_packet_size);
|
|
|
719b13 |
|
|
|
719b13 |
- ret = qio_channel_write_all(p->c, (void *)p->packet,
|
|
|
719b13 |
- p->packet_len, &local_err);
|
|
|
719b13 |
+ p->iov[0].iov_len = p->packet_len;
|
|
|
719b13 |
+ p->iov[0].iov_base = p->packet;
|
|
|
719b13 |
+
|
|
|
719b13 |
+ ret = qio_channel_writev_all(p->c, p->iov, p->iovs_num,
|
|
|
719b13 |
+ &local_err);
|
|
|
719b13 |
if (ret != 0) {
|
|
|
719b13 |
break;
|
|
|
719b13 |
}
|
|
|
719b13 |
|
|
|
719b13 |
- if (used) {
|
|
|
719b13 |
- ret = qio_channel_writev_all(p->c, p->iov, p->iovs_num,
|
|
|
719b13 |
- &local_err);
|
|
|
719b13 |
- if (ret != 0) {
|
|
|
719b13 |
- break;
|
|
|
719b13 |
- }
|
|
|
719b13 |
- }
|
|
|
719b13 |
-
|
|
|
719b13 |
qemu_mutex_lock(&p->mutex);
|
|
|
719b13 |
p->pending_job--;
|
|
|
719b13 |
qemu_mutex_unlock(&p->mutex);
|
|
|
719b13 |
@@ -913,7 +908,8 @@ int multifd_save_setup(Error **errp)
|
|
|
719b13 |
p->packet->version = cpu_to_be32(MULTIFD_VERSION);
|
|
|
719b13 |
p->name = g_strdup_printf("multifdsend_%d", i);
|
|
|
719b13 |
p->tls_hostname = g_strdup(s->hostname);
|
|
|
719b13 |
- p->iov = g_new0(struct iovec, page_count);
|
|
|
719b13 |
+ /* We need one extra place for the packet header */
|
|
|
719b13 |
+ p->iov = g_new0(struct iovec, page_count + 1);
|
|
|
719b13 |
socket_send_channel_create(multifd_new_send_channel_async, p);
|
|
|
719b13 |
}
|
|
|
719b13 |
|
|
|
719b13 |
--
|
|
|
719b13 |
2.35.3
|
|
|
719b13 |
|