[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 12/18] migration/rdma: Create the multifd send channels for RD
From: |
Chuan Zheng |
Subject: |
[PATCH v3 12/18] migration/rdma: Create the multifd send channels for RDMA |
Date: |
Sat, 17 Oct 2020 12:25:42 +0800 |
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
---
migration/multifd.c | 4 ++--
migration/multifd.h | 2 ++
migration/rdma.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 03f3a1e..9439b3c 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -173,7 +173,7 @@ void multifd_register_ops(int method, MultiFDMethods *ops)
multifd_ops[method] = ops;
}
-static int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp)
+int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp)
{
MultiFDInit_t msg = {};
int ret;
@@ -500,7 +500,7 @@ int multifd_queue_page(QEMUFile *f, RAMBlock *block,
ram_addr_t offset)
return 1;
}
-static void multifd_send_terminate_threads(Error *err)
+void multifd_send_terminate_threads(Error *err)
{
int i;
diff --git a/migration/multifd.h b/migration/multifd.h
index ff80bd5..ec9e897 100644
--- a/migration/multifd.h
+++ b/migration/multifd.h
@@ -184,6 +184,8 @@ typedef struct {
#ifdef CONFIG_RDMA
MultiFDSetup *multifd_rdma_setup(void);
#endif
+void multifd_send_terminate_threads(Error *err);
+int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp);
int get_multifd_send_param(int id, MultiFDSendParams **param);
int get_multifd_recv_param(int id, MultiFDRecvParams **param);
MultiFDSetup *multifd_setup_ops_init(void);
diff --git a/migration/rdma.c b/migration/rdma.c
index dd9f705..1af81f5 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4261,9 +4261,54 @@ err:
g_free(rdma_return_path);
}
+static int multifd_channel_rdma_connect(void *opaque)
+{
+ MultiFDSendParams *p = opaque;
+ Error *local_err = NULL;
+ int ret = 0;
+ MigrationState *s = migrate_get_current();
+
+ p->rdma = qemu_rdma_data_init(s->host_port, &local_err);
+ if (p->rdma == NULL) {
+ goto out;
+ }
+
+ ret = qemu_rdma_source_init(p->rdma,
+ migrate_use_rdma_pin_all(),
+ &local_err);
+ if (ret) {
+ goto out;
+ }
+
+ ret = qemu_rdma_connect(p->rdma, &local_err);
+ if (ret) {
+ goto out;
+ }
+
+ p->file = qemu_fopen_rdma(p->rdma, "wb");
+ if (p->file == NULL) {
+ goto out;
+ }
+
+ p->c = QIO_CHANNEL(getQIOChannel(p->file));
+
+out:
+ if (local_err) {
+ trace_multifd_send_error(p->id);
+ }
+
+ return ret;
+}
+
static void *multifd_rdma_send_thread(void *opaque)
{
MultiFDSendParams *p = opaque;
+ Error *local_err = NULL;
+
+ trace_multifd_send_thread_start(p->id);
+ if (multifd_send_initial_packet(p, &local_err) < 0) {
+ goto out;
+ }
while (true) {
qemu_mutex_lock(&p->mutex);
@@ -4275,6 +4320,11 @@ static void *multifd_rdma_send_thread(void *opaque)
qemu_sem_wait(&p->sem);
}
+out:
+ if (local_err) {
+ trace_multifd_send_error(p->id);
+ multifd_send_terminate_threads(local_err);
+ }
qemu_mutex_lock(&p->mutex);
p->running = false;
qemu_mutex_unlock(&p->mutex);
@@ -4286,6 +4336,12 @@ static void
multifd_rdma_send_channel_setup(MultiFDSendParams *p)
{
Error *local_err = NULL;
+ if (multifd_channel_rdma_connect(p)) {
+ error_setg(&local_err, "multifd: rdma channel %d not established",
+ p->id);
+ return ;
+ }
+
if (p->quit) {
error_setg(&local_err, "multifd: send id %d already quit", p->id);
return ;
--
1.8.3.1
- [PATCH v3 08/18] migration/rdma: export getQIOChannel to get QIOchannel in rdma, (continued)
- [PATCH v3 08/18] migration/rdma: export getQIOChannel to get QIOchannel in rdma, Chuan Zheng, 2020/10/17
- [PATCH v3 07/18] migration/rdma: add rdma field into multifd send/recv param, Chuan Zheng, 2020/10/17
- [PATCH v3 09/18] migration/rdma: add multifd_rdma_load_setup() to setup multifd rdma, Chuan Zheng, 2020/10/17
- [PATCH v3 03/18] migration/rdma: create multifd_setup_ops for Tx/Rx thread, Chuan Zheng, 2020/10/17
- [PATCH v3 05/18] migration/rdma: do not need sync main for rdma, Chuan Zheng, 2020/10/17
- [PATCH v3 06/18] migration/rdma: export MultiFDSendParams/MultiFDRecvParams, Chuan Zheng, 2020/10/17
- [PATCH v3 17/18] migration/rdma: send data for both rdma-pin-all and NOT rdma-pin-all mode, Chuan Zheng, 2020/10/17
- [PATCH v3 18/18] migration/rdma: RDMA cleanup for multifd migration, Chuan Zheng, 2020/10/17
- [PATCH v3 14/18] migration/rdma: register memory for multifd RDMA channels, Chuan Zheng, 2020/10/17
- [PATCH v3 13/18] migration/rdma: Add the function for dynamic page registration, Chuan Zheng, 2020/10/17
- [PATCH v3 12/18] migration/rdma: Create the multifd send channels for RDMA,
Chuan Zheng <=
- [PATCH v3 16/18] migration/rdma: add rdma_channel into Migrationstate field, Chuan Zheng, 2020/10/17
- [PATCH v3 11/18] migration/rdma: record host_port for multifd RDMA, Chuan Zheng, 2020/10/17
- [PATCH v3 15/18] migration/rdma: only register the memory for multifd channels, Chuan Zheng, 2020/10/17
- [PATCH v3 10/18] migration/rdma: Create the multifd recv channels for RDMA, Chuan Zheng, 2020/10/17
- RE: [PATCH v3 00/18] Support Multifd for RDMA migration, Zhanghailiang, 2020/10/21