[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/5] migration: Add a semaphore to count PONGs
From: |
Peter Xu |
Subject: |
[PATCH 4/5] migration: Add a semaphore to count PONGs |
Date: |
Tue, 13 Dec 2022 16:38:49 -0500 |
This is mostly useless, but useful for us to know whether the main channel
is correctly established without changing the migration protocol.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 3 +++
migration/migration.h | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/migration/migration.c b/migration/migration.c
index 898bc9fe5c..fa59846717 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2981,6 +2981,7 @@ retry:
case MIG_RP_MSG_PONG:
tmp32 = ldl_be_p(buf);
trace_source_return_path_thread_pong(tmp32);
+ qemu_sem_post(&ms->rp_state.rp_pong_acks);
break;
case MIG_RP_MSG_REQ_PAGES:
@@ -4470,6 +4471,7 @@ static void migration_instance_finalize(Object *obj)
qemu_sem_destroy(&ms->postcopy_pause_sem);
qemu_sem_destroy(&ms->postcopy_pause_rp_sem);
qemu_sem_destroy(&ms->rp_state.rp_sem);
+ qemu_sem_destroy(&ms->rp_state.rp_pong_acks);
qemu_sem_destroy(&ms->postcopy_qemufile_src_sem);
error_free(ms->error);
}
@@ -4519,6 +4521,7 @@ static void migration_instance_init(Object *obj)
qemu_sem_init(&ms->postcopy_pause_sem, 0);
qemu_sem_init(&ms->postcopy_pause_rp_sem, 0);
qemu_sem_init(&ms->rp_state.rp_sem, 0);
+ qemu_sem_init(&ms->rp_state.rp_pong_acks, 0);
qemu_sem_init(&ms->rate_limit_sem, 0);
qemu_sem_init(&ms->wait_unplug_sem, 0);
qemu_sem_init(&ms->postcopy_qemufile_src_sem, 0);
diff --git a/migration/migration.h b/migration/migration.h
index ea8d083a51..61dc2c81df 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -275,6 +275,12 @@ struct MigrationState {
*/
bool rp_thread_created;
QemuSemaphore rp_sem;
+ /*
+ * We post to this when we got one PONG from dest. So far it's an
+ * easy way to know the main channel has successfully established
+ * on dest QEMU.
+ */
+ QemuSemaphore rp_pong_acks;
} rp_state;
double mbps;
--
2.37.3
- [PATCH 0/5] migration: Fix disorder of channel creations, Peter Xu, 2022/12/13
- [PATCH 1/5] io: Add support for MSG_PEEK for socket channel, Peter Xu, 2022/12/13
- Re: [PATCH 1/5] io: Add support for MSG_PEEK for socket channel, Daniel P . Berrangé, 2022/12/14
- Re: [PATCH 1/5] io: Add support for MSG_PEEK for socket channel, Peter Xu, 2022/12/14
- Re: [PATCH 1/5] io: Add support for MSG_PEEK for socket channel, Daniel P . Berrangé, 2022/12/15
- Re: [PATCH 1/5] io: Add support for MSG_PEEK for socket channel, Peter Xu, 2022/12/15
- Re: [PATCH 1/5] io: Add support for MSG_PEEK for socket channel, manish.mishra, 2022/12/16
- Re: [PATCH 1/5] io: Add support for MSG_PEEK for socket channel, Peter Xu, 2022/12/16
[PATCH 2/5] migration: check magic value for deciding the mapping of channels, Peter Xu, 2022/12/13
[PATCH 4/5] migration: Add a semaphore to count PONGs,
Peter Xu <=
[PATCH 5/5] migration: Postpone postcopy preempt channel to be after main, Peter Xu, 2022/12/13
[PATCH 3/5] migration: Rework multi-channel checks on URI, Peter Xu, 2022/12/13