[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/23] migration/multifd: Move total_normal_pages accounting
From: |
peterx |
Subject: |
[PATCH v2 10/23] migration/multifd: Move total_normal_pages accounting |
Date: |
Fri, 2 Feb 2024 18:28:44 +0800 |
From: Peter Xu <peterx@redhat.com>
Just like the previous patch, move the accounting for total_normal_pages on
both src/dst sides into the packet fill/unfill procedures.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/multifd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index eca76e2c18..94a0124934 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -290,6 +290,7 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)
}
p->packets_sent++;
+ p->total_normal_pages += pages->num;
}
static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
@@ -338,6 +339,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p,
Error **errp)
p->next_packet_size = be32_to_cpu(packet->next_packet_size);
p->packet_num = be64_to_cpu(packet->packet_num);
p->packets_recved++;
+ p->total_normal_pages += p->normal_num;
if (p->normal_num == 0) {
return 0;
@@ -720,7 +722,6 @@ static void *multifd_send_thread(void *opaque)
}
multifd_send_fill_packet(p);
- p->total_normal_pages += pages->num;
trace_multifd_send(p->id, packet_num, pages->num, p->flags,
p->next_packet_size);
@@ -1124,7 +1125,6 @@ static void *multifd_recv_thread(void *opaque)
p->flags &= ~MULTIFD_FLAG_SYNC;
trace_multifd_recv(p->id, p->packet_num, p->normal_num, flags,
p->next_packet_size);
- p->total_normal_pages += p->normal_num;
qemu_mutex_unlock(&p->mutex);
if (p->normal_num) {
--
2.43.0
- Re: [External] [PATCH v2 05/23] migration/multifd: Drop MultiFDSendParams.normal[] array, (continued)
[PATCH v2 06/23] migration/multifd: Separate SYNC request with normal jobs, peterx, 2024/02/02
[PATCH v2 07/23] migration/multifd: Simplify locking in sender thread, peterx, 2024/02/02
[PATCH v2 08/23] migration/multifd: Drop pages->num check in sender thread, peterx, 2024/02/02
[PATCH v2 09/23] migration/multifd: Rename p->num_packets and clean it up, peterx, 2024/02/02
[PATCH v2 10/23] migration/multifd: Move total_normal_pages accounting,
peterx <=
[PATCH v2 11/23] migration/multifd: Move trace_multifd_send|recv(), peterx, 2024/02/02
[PATCH v2 13/23] migration/multifd: Move header prepare/fill into send_prepare(), peterx, 2024/02/02
[PATCH v2 12/23] migration/multifd: multifd_send_prepare_header(), peterx, 2024/02/02
[PATCH v2 14/23] migration/multifd: Forbid spurious wakeups, peterx, 2024/02/02
[PATCH v2 15/23] migration/multifd: Split multifd_send_terminate_threads(), peterx, 2024/02/02
[PATCH v2 17/23] migration/multifd: Change retval of multifd_send_pages(), peterx, 2024/02/02
[PATCH v2 16/23] migration/multifd: Change retval of multifd_queue_page(), peterx, 2024/02/02