[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 19/23] multifd: recv side only needs the RAMBlock host address
From: |
Juan Quintela |
Subject: |
[PATCH v3 19/23] multifd: recv side only needs the RAMBlock host address |
Date: |
Wed, 24 Nov 2021 11:06:13 +0100 |
So we can remove the MultiFDPages.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/multifd.h | 4 ++--
migration/multifd-zlib.c | 2 +-
migration/multifd-zstd.c | 2 +-
migration/multifd.c | 7 ++-----
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/migration/multifd.h b/migration/multifd.h
index 9fbcb7bb9a..ab32baebd7 100644
--- a/migration/multifd.h
+++ b/migration/multifd.h
@@ -136,8 +136,8 @@ typedef struct {
bool running;
/* should this thread finish */
bool quit;
- /* array of pages to receive */
- MultiFDPages_t *pages;
+ /* ramblock host address */
+ uint8_t *host;
/* packet allocated len */
uint32_t packet_len;
/* pointer to the packet */
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
index cc143b829d..bf4d87fa16 100644
--- a/migration/multifd-zlib.c
+++ b/migration/multifd-zlib.c
@@ -253,7 +253,7 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error
**errp)
}
zs->avail_out = page_size;
- zs->next_out = p->pages->block->host + p->normal[i];
+ zs->next_out = p->host + p->normal[i];
/*
* Welcome to inflate semantics
diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
index 93d504ce0f..dd64ac3227 100644
--- a/migration/multifd-zstd.c
+++ b/migration/multifd-zstd.c
@@ -264,7 +264,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error
**errp)
z->in.pos = 0;
for (i = 0; i < p->normal_num; i++) {
- z->out.dst = p->pages->block->host + p->normal[i];
+ z->out.dst = p->host + p->normal[i];
z->out.size = page_size;
z->out.pos = 0;
diff --git a/migration/multifd.c b/migration/multifd.c
index 3ffb1aba64..dc76322137 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -147,7 +147,7 @@ static int nocomp_recv_pages(MultiFDRecvParams *p, Error
**errp)
return -1;
}
for (int i = 0; i < p->normal_num; i++) {
- p->iov[i].iov_base = p->pages->block->host + p->normal[i];
+ p->iov[i].iov_base = p->host + p->normal[i];
p->iov[i].iov_len = page_size;
}
return qio_channel_readv_all(p->c, p->iov, p->normal_num, errp);
@@ -340,7 +340,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p,
Error **errp)
return -1;
}
- p->pages->block = block;
+ p->host = block->host;
for (i = 0; i < p->normal_num; i++) {
uint64_t offset = be64_to_cpu(packet->offset[i]);
@@ -1004,8 +1004,6 @@ int multifd_load_cleanup(Error **errp)
qemu_sem_destroy(&p->sem_sync);
g_free(p->name);
p->name = NULL;
- multifd_pages_clear(p->pages);
- p->pages = NULL;
p->packet_len = 0;
g_free(p->packet);
p->packet = NULL;
@@ -1146,7 +1144,6 @@ int multifd_load_setup(Error **errp)
qemu_sem_init(&p->sem_sync, 0);
p->quit = false;
p->id = i;
- p->pages = multifd_pages_init(page_count);
p->packet_len = sizeof(MultiFDPacket_t)
+ sizeof(uint64_t) * page_count;
p->packet = g_malloc0(p->packet_len);
--
2.33.1
- [PATCH v3 09/23] multifd: Make zstd compression method not use iovs, (continued)
- [PATCH v3 09/23] multifd: Make zstd compression method not use iovs, Juan Quintela, 2021/11/24
- [PATCH v3 11/23] multifd: Move iov from pages to params, Juan Quintela, 2021/11/24
- [PATCH v3 12/23] multifd: Make zlib use iov's, Juan Quintela, 2021/11/24
- [PATCH v3 06/23] multifd: remove used parameter from send_prepare() method, Juan Quintela, 2021/11/24
- [PATCH v3 13/23] multifd: Make zstd use iov's, Juan Quintela, 2021/11/24
- [PATCH v3 15/23] multifd: Use a single writev on the send side, Juan Quintela, 2021/11/24
- [PATCH v3 16/23] multifd: Unfold "used" variable by its value, Juan Quintela, 2021/11/24
- [PATCH v3 17/23] multifd: Use normal pages array on the send side, Juan Quintela, 2021/11/24
- [PATCH v3 14/23] multifd: Remove send_write() method, Juan Quintela, 2021/11/24
- [PATCH v3 18/23] multifd: Use normal pages array on the recv side, Juan Quintela, 2021/11/24
- [PATCH v3 19/23] multifd: recv side only needs the RAMBlock host address,
Juan Quintela <=
- [PATCH v3 20/23] multifd: Rename pages_used to normal_pages, Juan Quintela, 2021/11/24
- [PATCH v3 21/23] multifd: Support for zero pages transmission, Juan Quintela, 2021/11/24
- [PATCH v3 22/23] multifd: Zero pages transmission, Juan Quintela, 2021/11/24
- [PATCH v3 23/23] migration: Use multifd before we check for the zero page, Juan Quintela, 2021/11/24
- Re: [PATCH v3 00/23] Migration: Transmit and detect zero pages in the multifd threads, Peter Xu, 2021/11/24