[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/8] migration/multifd: sync packet_num after all thr
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 7/8] migration/multifd: sync packet_num after all thread are done |
Date: |
Wed, 12 Jun 2019 12:48:07 +0200 |
From: Wei Yang <address@hidden>
Notification from recv thread is not ordered, which means we may be
notified by one MultiFDRecvParams but adjust packet_num for another.
Move the adjustment after we are sure each recv thread are sync-ed.
Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index d3d72b6f4f..96c84f770a 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1291,15 +1291,15 @@ static void multifd_recv_sync_main(void)
trace_multifd_recv_sync_main_wait(p->id);
qemu_sem_wait(&multifd_recv_state->sem_sync);
+ }
+ for (i = 0; i < migrate_multifd_channels(); i++) {
+ MultiFDRecvParams *p = &multifd_recv_state->params[i];
+
qemu_mutex_lock(&p->mutex);
if (multifd_recv_state->packet_num < p->packet_num) {
multifd_recv_state->packet_num = p->packet_num;
}
qemu_mutex_unlock(&p->mutex);
- }
- for (i = 0; i < migrate_multifd_channels(); i++) {
- MultiFDRecvParams *p = &multifd_recv_state->params[i];
-
trace_multifd_recv_sync_main_signal(p->id);
qemu_sem_post(&p->sem_sync);
}
--
2.21.0
- [Qemu-devel] [PULL 0/8] Migration patches, Juan Quintela, 2019/06/12
- [Qemu-devel] [PULL 4/8] migration/multifd: call multifd_send_sync_main when sending RAM_SAVE_FLAG_EOS, Juan Quintela, 2019/06/12
- [Qemu-devel] [PULL 3/8] migration-test: Add migration multifd test, Juan Quintela, 2019/06/12
- [Qemu-devel] [PULL 2/8] migration-test: rename parameter to parameter_int, Juan Quintela, 2019/06/12
- [Qemu-devel] [PULL 1/8] migration: fix multifd_recv event typo, Juan Quintela, 2019/06/12
- [Qemu-devel] [PULL 5/8] migration/xbzrle: update cache and current_data in one place, Juan Quintela, 2019/06/12
- [Qemu-devel] [PULL 6/8] cutils: remove one unnecessary pointer operation, Juan Quintela, 2019/06/12
- [Qemu-devel] [PULL 7/8] migration/multifd: sync packet_num after all thread are done,
Juan Quintela <=
- [Qemu-devel] [PULL 8/8] migratioin/ram.c: reset complete_round when we gets a queued page, Juan Quintela, 2019/06/12
- Re: [Qemu-devel] [PULL 0/8] Migration patches, Peter Maydell, 2019/06/13