[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/11] multifd: Make zstd compression method not use iovs
From: |
Juan Quintela |
Subject: |
[PATCH 04/11] multifd: Make zstd compression method not use iovs |
Date: |
Fri, 19 Nov 2021 17:58:56 +0100 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/multifd-zstd.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
index 693bddf8c9..1dccdbd733 100644
--- a/migration/multifd-zstd.c
+++ b/migration/multifd-zstd.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include <zstd.h>
#include "qemu/rcu.h"
+#include "exec/ramblock.h"
#include "exec/target_page.h"
#include "qapi/error.h"
#include "migration.h"
@@ -112,8 +113,8 @@ static void zstd_send_cleanup(MultiFDSendParams *p, Error
**errp)
*/
static int zstd_send_prepare(MultiFDSendParams *p, uint32_t used, Error **errp)
{
- struct iovec *iov = p->pages->iov;
struct zstd_data *z = p->data;
+ size_t page_size = qemu_target_page_size();
int ret;
uint32_t i;
@@ -127,8 +128,8 @@ static int zstd_send_prepare(MultiFDSendParams *p, uint32_t
used, Error **errp)
if (i == used - 1) {
flush = ZSTD_e_flush;
}
- z->in.src = iov[i].iov_base;
- z->in.size = iov[i].iov_len;
+ z->in.src = p->pages->block->host + p->pages->offset[i];
+ z->in.size = page_size;
z->in.pos = 0;
/*
@@ -264,6 +265,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, uint32_t
used, Error **errp)
uint32_t expected_size = used * qemu_target_page_size();
uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK;
struct zstd_data *z = p->data;
+ size_t page_size = qemu_target_page_size();
int ret;
int i;
@@ -283,10 +285,8 @@ static int zstd_recv_pages(MultiFDRecvParams *p, uint32_t
used, Error **errp)
z->in.pos = 0;
for (i = 0; i < used; i++) {
- struct iovec *iov = &p->pages->iov[i];
-
- z->out.dst = iov->iov_base;
- z->out.size = iov->iov_len;
+ z->out.dst = p->pages->block->host + p->pages->offset[i];
+ z->out.size = page_size;
z->out.pos = 0;
/*
@@ -300,8 +300,8 @@ static int zstd_recv_pages(MultiFDRecvParams *p, uint32_t
used, Error **errp)
do {
ret = ZSTD_decompressStream(z->zds, &z->out, &z->in);
} while (ret > 0 && (z->in.size - z->in.pos > 0)
- && (z->out.pos < iov->iov_len));
- if (ret > 0 && (z->out.pos < iov->iov_len)) {
+ && (z->out.pos < page_size));
+ if (ret > 0 && (z->out.pos < page_size)) {
error_setg(errp, "multifd %d: decompressStream buffer too small",
p->id);
return -1;
--
2.33.1
- [PATCH 03/11] multifd: Fill offset and block for reception, (continued)
- [PATCH 03/11] multifd: Fill offset and block for reception, Juan Quintela, 2021/11/19
- [PATCH 01/11] migration: Remove is_zero_range(), Juan Quintela, 2021/11/19
- [PATCH 06/11] migration: Move iov from pages to params, Juan Quintela, 2021/11/19
- [PATCH 05/11] multifd: Make zlib compression method not use iovs, Juan Quintela, 2021/11/19
- [PATCH 07/11] multifd: Make zlib use iov's, Juan Quintela, 2021/11/19
- [PATCH 04/11] multifd: Make zstd compression method not use iovs,
Juan Quintela <=
- [PATCH 08/11] multifd: Make zstd use iov's, Juan Quintela, 2021/11/19
- [PATCH 02/11] dump: Remove is_zero_page(), Juan Quintela, 2021/11/19
- [PATCH 09/11] multifd: Remove send_write() method, Juan Quintela, 2021/11/19