[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 03/13] multifd: Create page_count fields into both MultiFD{Rec
From: |
Juan Quintela |
Subject: |
[PATCH v6 03/13] multifd: Create page_count fields into both MultiFD{Recv, Send}Params |
Date: |
Wed, 11 May 2022 00:42:10 +0200 |
We were recalculating it left and right. We plan to change that
values on next patches.
Signed-off-by: Juan Quintela <quintela@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 4de80d9e53..f707e2a8b8 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;
/* sem where to wait for more work */
QemuSemaphore sem;
@@ -145,6 +147,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 f15fed5f1f..893b90072d 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;
}
@@ -895,6 +894,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;
socket_send_channel_create(multifd_new_send_channel_async, p);
}
@@ -1135,6 +1135,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.35.1
- [PATCH v6 00/13] Migration: Transmit and detect zero pages in the multifd threads, Juan Quintela, 2022/05/10
- [PATCH v6 03/13] multifd: Create page_count fields into both MultiFD{Recv, Send}Params,
Juan Quintela <=
- [PATCH v6 01/13] multifd: Document the locking of MultiFD{Send/Recv}Params, Juan Quintela, 2022/05/10
- [PATCH v6 05/13] multifd: Count the number of bytes sent correctly, Juan Quintela, 2022/05/10
- [PATCH v6 04/13] migration: Export ram_transferred_ram(), Juan Quintela, 2022/05/10
- [PATCH v6 08/13] multifd: Prepare to send a packet without the mutex held, Juan Quintela, 2022/05/10
- [PATCH v6 09/13] multifd: Add property to enable/disable zero_page, Juan Quintela, 2022/05/10
- [PATCH v6 10/13] migration: Export ram_release_page(), Juan Quintela, 2022/05/10
- [PATCH v6 06/13] migration: Make ram_save_target_page() a pointer, Juan Quintela, 2022/05/10
- [PATCH v6 11/13] multifd: Support for zero pages transmission, Juan Quintela, 2022/05/10