The zero page feature is not supported by the compression methods. It is exclusive to the socket migration. Add a 'send' hook so we can move that complexity into a multifd_socket_send() function.
Signed-off-by: Fabiano Rosas <faro...@suse.de> --- migration/multifd-zlib.c | 10 ++++++++++ migration/multifd-zstd.c | 10 ++++++++++ migration/multifd.c | 18 ++---------------- migration/multifd.h | 1 + migration/socket.c | 22 ++++++++++++++++++++++ 5 files changed, 45 insertions(+), 16 deletions(-) diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index d89163e975..0859efa60f 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -174,6 +174,15 @@ static int zlib_send_prepare(MultiFDSendParams *p, Error **errp) return 0; } +static int zlib_send(MultiFDSendParams *p, Error **errp) +{ + p->iov[0].iov_len = p->packet_len; + p->iov[0].iov_base = p->packet; + + return qio_channel_writev_full_all(p->c, p->iov, p->iovs_num, NULL, + 0, p->write_flags, errp); +} + /** * zlib_recv_setup: setup receive side * @@ -312,6 +321,7 @@ static MultiFDMethods multifd_zlib_ops = { .send_setup = zlib_send_setup, .send_cleanup = zlib_send_cleanup, .send_prepare = zlib_send_prepare, + .send = zlib_send, .recv_setup = zlib_recv_setup, .recv_cleanup = zlib_recv_cleanup, .recv_pages = zlib_recv_pages diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index a90788540e..ca0fc79fdd 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -163,6 +163,15 @@ static int zstd_send_prepare(MultiFDSendParams *p, Error **errp) return 0; } +static int zstd_send(MultiFDSendParams *p, Error **errp) +{ + p->iov[0].iov_len = p->packet_len; + p->iov[0].iov_base = p->packet; + + return qio_channel_writev_full_all(p->c, p->iov, p->iovs_num, NULL, + 0, p->write_flags, errp); +} + /** * zstd_recv_setup: setup receive side * @@ -303,6 +312,7 @@ static MultiFDMethods multifd_zstd_ops = { .send_setup = zstd_send_setup, .send_cleanup = zstd_send_cleanup, .send_prepare = zstd_send_prepare, + .send = zstd_send, .recv_setup = zstd_recv_setup, .recv_cleanup = zstd_recv_cleanup, .recv_pages = zstd_recv_pages diff --git a/migration/multifd.c b/migration/multifd.c index d82775ade9..9f509699c2 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -604,22 +604,8 @@ static void *multifd_send_thread(void *opaque) trace_multifd_send(p->id, packet_num, p->normal_num, flags, p->next_packet_size); - if (use_zero_copy_send) { - /* Send header first, without zerocopy */ - ret = qio_channel_write_all(p->c, (void *)p->packet, - p->packet_len, &local_err); - if (ret != 0) { - break; - } - } else { - /* Send header using the same writev call */ - p->iov[0].iov_len = p->packet_len; - p->iov[0].iov_base = p->packet; - } - - ret = qio_channel_writev_full_all(p->c, p->iov, p->iovs_num, NULL, - 0, p->write_flags, &local_err); - if (ret != 0) { + ret = multifd_send_state->ops->send(p, &local_err); + if (ret) { break; } diff --git a/migration/multifd.h b/migration/multifd.h index 6261002524..0c4cf2d315 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -196,6 +196,7 @@ typedef struct { void (*send_cleanup)(MultiFDSendParams *p, Error **errp); /* Prepare the send packet */ int (*send_prepare)(MultiFDSendParams *p, Error **errp); + int (*send)(MultiFDSendParams *p, Error **errp); /* Setup for receiving side */ int (*recv_setup)(MultiFDRecvParams *p, Error **errp); /* Cleanup for receiving side */ diff --git a/migration/socket.c b/migration/socket.c index 7e1371e598..608f30975e 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -228,6 +228,27 @@ static int multifd_socket_send_prepare(MultiFDSendParams *p, Error **errp) return 0; } +static int multifd_socket_send(MultiFDSendParams *p, Error **errp) +{ + int ret; + + if (migrate_zero_copy_send()) { + /* Send header first, without zerocopy */ + ret = qio_channel_write_all(p->c, (void *)p->packet, p->packet_len, + errp); + if (ret) { + return ret; + } + } else { + /* Send header using the same writev call */ + p->iov[0].iov_len = p->packet_len; + p->iov[0].iov_base = p->packet; + } + + return qio_channel_writev_full_all(p->c, p->iov, p->iovs_num, NULL, + 0, p->write_flags, errp); +} + static int multifd_socket_recv_setup(MultiFDRecvParams *p, Error **errp) { return 0; @@ -255,6 +276,7 @@ static int multifd_socket_recv_pages(MultiFDRecvParams *p, Error **errp) MultiFDMethods multifd_socket_ops = { .send_setup = multifd_socket_send_setup, + .send = multifd_socket_send, .send_cleanup = multifd_socket_send_cleanup, .send_prepare = multifd_socket_send_prepare, .recv_setup = multifd_socket_recv_setup, -- 2.35.3