[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC 09/12] migration/rdma: Wait for all multiRDMA to complete reg
From: |
Zhimin Feng |
Subject: |
[PATCH RFC 09/12] migration/rdma: Wait for all multiRDMA to complete registration |
Date: |
Thu, 9 Jan 2020 12:59:19 +0800 |
From: fengzhimin <address@hidden>
Signed-off-by: fengzhimin <address@hidden>
---
migration/rdma.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/migration/rdma.c b/migration/rdma.c
index 6ecc870844..425dfa709d 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -439,6 +439,10 @@ struct {
MultiRDMASendParams *params;
/* number of created threads */
int count;
+ /* this mutex protects the following parameters */
+ QemuMutex mutex_sync;
+ /* number of registered multiRDMA channels */
+ unsigned int reg_mr_channels;
/* syncs main thread and channels */
QemuSemaphore sem_sync;
} *multiRDMA_send_state;
@@ -3998,6 +4002,11 @@ static int qemu_rdma_registration_stop(QEMUFile *f, void
*opaque,
rdma->dest_blocks[i].remote_host_addr;
local->block[i].remote_rkey = rdma->dest_blocks[i].remote_rkey;
}
+
+ /* Wait for all multiRDMA channels to complete registration */
+ if (migrate_use_multiRDMA()) {
+ qemu_sem_wait(&multiRDMA_send_state->sem_sync);
+ }
}
trace_qemu_rdma_registration_stop(flags);
@@ -4562,6 +4571,17 @@ static void *multiRDMA_send_thread(void *opaque)
}
}
+ /*
+ * Inform the main RDMA thread to run when multiRDMA
+ * threads have completed registration.
+ */
+ qemu_mutex_lock(&multiRDMA_send_state->mutex_sync);
+ if (++multiRDMA_send_state->reg_mr_channels ==
+ migrate_multiRDMA_channels()) {
+ qemu_sem_post(&multiRDMA_send_state->sem_sync);
+ }
+ qemu_mutex_unlock(&multiRDMA_send_state->mutex_sync);
+
while (true) {
qemu_sem_wait(&p->sem);
@@ -4616,6 +4636,8 @@ static int multiRDMA_save_setup(const char *host_port,
Error **errp)
multiRDMA_send_state->params = g_new0(MultiRDMASendParams,
thread_count);
atomic_set(&multiRDMA_send_state->count, 0);
+ atomic_set(&multiRDMA_send_state->reg_mr_channels, 0);
+ qemu_mutex_init(&multiRDMA_send_state->mutex_sync);
qemu_sem_init(&multiRDMA_send_state->sem_sync, 0);
for (i = 0; i < thread_count; i++) {
@@ -4714,6 +4736,7 @@ int multiRDMA_save_cleanup(void)
g_free(multiRDMA_send_state->params[i].rdma);
}
+ qemu_mutex_destroy(&multiRDMA_send_state->mutex_sync);
qemu_sem_destroy(&multiRDMA_send_state->sem_sync);
g_free(multiRDMA_send_state);
multiRDMA_send_state = NULL;
--
2.19.1
- [PATCH RFC 00/12] *** mulitple RDMA channels for migration ***, Zhimin Feng, 2020/01/09
- [PATCH RFC 08/12] migration/rdma: register memory for multiRDMA channels, Zhimin Feng, 2020/01/09
- [PATCH RFC 03/12] migration: Create the multi-rdma-channels parameter, Zhimin Feng, 2020/01/09
- [PATCH RFC 09/12] migration/rdma: Wait for all multiRDMA to complete registration,
Zhimin Feng <=
- [PATCH RFC 04/12] migration/rdma: Create multiRDMA migration threads, Zhimin Feng, 2020/01/09
- [PATCH RFC 06/12] migration/rdma: Transmit initial package, Zhimin Feng, 2020/01/09
- [PATCH RFC 11/12] migration/rdma: use multiRDMA to send RAM block for NOT rdma-pin-all mode, Zhimin Feng, 2020/01/09
- [PATCH RFC 01/12] migration: Add multiRDMA capability support, Zhimin Feng, 2020/01/09