[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/19] multifd: Create page_count fields into both MultiFD{Recv, S
From: |
Juan Quintela |
Subject: |
[PULL 02/19] multifd: Create page_count fields into both MultiFD{Recv, Send}Params |
Date: |
Thu, 15 Dec 2022 10:38:32 +0100 |
We were recalculating it left and right. We plan to change that
values on next patches.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Leonardo Bras <leobras@redhat.com>
---
migration/multifd.h | 4 ++++
migration/multifd.c | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/migration/multifd.h b/migration/multifd.h
index 86fb9982b3..e2802a9ce2 100644
--- a/migration/multifd.h
+++ b/migration/multifd.h
@@ -82,6 +82,8 @@ typedef struct {
uint32_t packet_len;
/* guest page size */
uint32_t page_size;
+ /* number of pages in a full packet */
+ uint32_t page_count;
/* multifd flags for sending ram */
int write_flags;
@@ -147,6 +149,8 @@ typedef struct {
uint32_t packet_len;
/* guest page size */
uint32_t page_size;
+ /* number of pages in a full packet */
+ uint32_t page_count;
/* syncs main thread and channels */
QemuSemaphore sem_sync;
diff --git a/migration/multifd.c b/migration/multifd.c
index efffa77a76..b8dc559d24 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -279,7 +279,6 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)
static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
{
MultiFDPacket_t *packet = p->packet;
- uint32_t page_count = MULTIFD_PACKET_SIZE / p->page_size;
RAMBlock *block;
int i;
@@ -306,10 +305,10 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams
*p, Error **errp)
* If we received a packet that is 100 times bigger than expected
* just stop migration. It is a magic number.
*/
- if (packet->pages_alloc > page_count) {
+ if (packet->pages_alloc > p->page_count) {
error_setg(errp, "multifd: received packet "
"with size %u and expected a size of %u",
- packet->pages_alloc, page_count) ;
+ packet->pages_alloc, p->page_count) ;
return -1;
}
@@ -944,6 +943,7 @@ int multifd_save_setup(Error **errp)
p->iov = g_new0(struct iovec, page_count + 1);
p->normal = g_new0(ram_addr_t, page_count);
p->page_size = qemu_target_page_size();
+ p->page_count = page_count;
if (migrate_use_zero_copy_send()) {
p->write_flags = QIO_CHANNEL_WRITE_FLAG_ZERO_COPY;
@@ -1191,6 +1191,7 @@ int multifd_load_setup(Error **errp)
p->name = g_strdup_printf("multifdrecv_%d", i);
p->iov = g_new0(struct iovec, page_count);
p->normal = g_new0(ram_addr_t, page_count);
+ p->page_count = page_count;
p->page_size = qemu_target_page_size();
}
--
2.38.1
- [PULL 00/19] Next 8.0 patches, Juan Quintela, 2022/12/15
- [PULL 02/19] multifd: Create page_count fields into both MultiFD{Recv, Send}Params,
Juan Quintela <=
- [PULL 01/19] multifd: Create page_size fields into both MultiFD{Recv, Send}Params, Juan Quintela, 2022/12/15
- [PULL 04/19] migration: Export ram_release_page(), Juan Quintela, 2022/12/15
- [PULL 03/19] migration: Export ram_transferred_ram(), Juan Quintela, 2022/12/15
- [PULL 05/19] migration: Take bitmap mutex when completing ram migration, Juan Quintela, 2022/12/15
- [PULL 06/19] migration: Add postcopy_preempt_active(), Juan Quintela, 2022/12/15
- [PULL 07/19] migration: Cleanup xbzrle zero page cache update logic, Juan Quintela, 2022/12/15
- [PULL 08/19] migration: Trivial cleanup save_page_header() on same block check, Juan Quintela, 2022/12/15
- [PULL 09/19] migration: Remove RAMState.f references in compression code, Juan Quintela, 2022/12/15
- [PULL 11/19] migration: Use atomic ops properly for page accountings, Juan Quintela, 2022/12/15
- [PULL 12/19] migration: Teach PSS about host page, Juan Quintela, 2022/12/15