From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Leonardo Bras <leobras@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Peter Xu <peterx@redhat.com>, Juan Quintela <quintela@redhat.com>
Subject: [PATCH 10/23] multifd: Make zlib compression method not use iovs
Date: Tue, 23 Nov 2021 18:51:00 +0100 [thread overview]
Message-ID: <20211123175113.35569-11-quintela@redhat.com> (raw)
In-Reply-To: <20211123175113.35569-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/multifd-zlib.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
index e85ef8824d..da6201704c 100644
--- a/migration/multifd-zlib.c
+++ b/migration/multifd-zlib.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include <zlib.h>
#include "qemu/rcu.h"
+#include "exec/ramblock.h"
#include "exec/target_page.h"
#include "qapi/error.h"
#include "migration.h"
@@ -98,8 +99,8 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Error **errp)
*/
static int zlib_send_prepare(MultiFDSendParams *p, Error **errp)
{
- struct iovec *iov = p->pages->iov;
struct zlib_data *z = p->data;
+ size_t page_size = qemu_target_page_size();
z_stream *zs = &z->zs;
uint32_t out_size = 0;
int ret;
@@ -113,8 +114,8 @@ static int zlib_send_prepare(MultiFDSendParams *p, Error **errp)
flush = Z_SYNC_FLUSH;
}
- zs->avail_in = iov[i].iov_len;
- zs->next_in = iov[i].iov_base;
+ zs->avail_in = page_size;
+ zs->next_in = p->pages->block->host + p->pages->offset[i];
zs->avail_out = available;
zs->next_out = z->zbuff + out_size;
@@ -235,6 +236,7 @@ static void zlib_recv_cleanup(MultiFDRecvParams *p)
static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp)
{
struct zlib_data *z = p->data;
+ size_t page_size = qemu_target_page_size();
z_stream *zs = &z->zs;
uint32_t in_size = p->next_packet_size;
/* we measure the change of total_out */
@@ -259,7 +261,6 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp)
zs->next_in = z->zbuff;
for (i = 0; i < p->pages->num; i++) {
- struct iovec *iov = &p->pages->iov[i];
int flush = Z_NO_FLUSH;
unsigned long start = zs->total_out;
@@ -267,8 +268,8 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp)
flush = Z_SYNC_FLUSH;
}
- zs->avail_out = iov->iov_len;
- zs->next_out = iov->iov_base;
+ zs->avail_out = page_size;
+ zs->next_out = p->pages->block->host + p->pages->offset[i];
/*
* Welcome to inflate semantics
@@ -281,8 +282,8 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp)
do {
ret = inflate(zs, flush);
} while (ret == Z_OK && zs->avail_in
- && (zs->total_out - start) < iov->iov_len);
- if (ret == Z_OK && (zs->total_out - start) < iov->iov_len) {
+ && (zs->total_out - start) < page_size);
+ if (ret == Z_OK && (zs->total_out - start) < page_size) {
error_setg(errp, "multifd %d: inflate generated too few output",
p->id);
return -1;
--
2.33.1
next prev parent reply other threads:[~2021-11-23 18:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-23 17:50 [PATCH 00/23] Migration: Transmit and detect zero pages in the multifd threads Juan Quintela
2021-11-23 17:50 ` [PATCH 01/23] multifd: Delete useless operation Juan Quintela
2021-11-23 17:50 ` [PATCH 02/23] migration: Never call twice qemu_target_page_size() Juan Quintela
2021-11-23 17:50 ` [PATCH 03/23] multifd: Rename used field to num Juan Quintela
2021-11-23 17:50 ` [PATCH 04/23] multifd: Add missing documention Juan Quintela
2021-11-23 17:50 ` [PATCH 05/23] multifd: The variable is only used inside the loop Juan Quintela
2021-11-23 17:50 ` [PATCH 06/23] multifd: remove used parameter from send_prepare() method Juan Quintela
2021-11-23 17:50 ` [PATCH 07/23] multifd: remove used parameter from send_recv_pages() method Juan Quintela
2021-11-23 17:50 ` [PATCH 08/23] multifd: Fill offset and block for reception Juan Quintela
2021-11-23 17:50 ` [PATCH 09/23] multifd: Make zstd compression method not use iovs Juan Quintela
2021-11-23 17:51 ` Juan Quintela [this message]
2021-11-23 17:51 ` [PATCH 11/23] multifd: Move iov from pages to params Juan Quintela
2021-11-23 17:51 ` [PATCH 12/23] multifd: Make zlib use iov's Juan Quintela
2021-11-23 17:51 ` [PATCH 13/23] multifd: Make zstd " Juan Quintela
2021-11-23 17:51 ` [PATCH 14/23] multifd: Remove send_write() method Juan Quintela
2021-11-23 17:51 ` [PATCH 15/23] multifd: Use a single writev on the send side Juan Quintela
2021-11-23 17:51 ` [PATCH 16/23] multifd: Unfold "used" variable by its value Juan Quintela
2021-11-23 17:51 ` [PATCH 17/23] multifd: Use normal pages array on the send side Juan Quintela
2021-11-24 9:59 ` [PATCH 00/23] Migration: Transmit and detect zero pages in the multifd threads Juan Quintela
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211123175113.35569-11-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=dgilbert@redhat.com \
--cc=leobras@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).