register memory for multifd RDMA channels and transmit the destination the keys to source to use including the virtual addresses.
Signed-off-by: Zhimin Feng <fengzhim...@huawei.com> --- migration/multifd.c | 34 +++++++++++++++++++++++++++++--- migration/rdma.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index a57d7a2eab..4ae25fc88f 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -388,7 +388,11 @@ static void multifd_send_terminate_threads(Error *err) qemu_mutex_lock(&p->mutex); p->quit = true; - qemu_sem_post(&p->sem); + if (migrate_use_rdma()) { + qemu_sem_post(&p->sem_sync); + } else { + qemu_sem_post(&p->sem); + } qemu_mutex_unlock(&p->mutex); } } @@ -484,6 +488,8 @@ static void *multifd_rdma_send_thread(void *opaque) { MultiFDSendParams *p = opaque; Error *local_err = NULL; + int ret = 0; + RDMAControlHeader head = { .len = 0, .repeat = 1 }; trace_multifd_send_thread_start(p->id); @@ -491,14 +497,28 @@ static void *multifd_rdma_send_thread(void *opaque) goto out; } + /* wait for semaphore notification to register memory */ + qemu_sem_wait(&p->sem_sync); + if (qemu_rdma_registration(p->rdma) < 0) { + goto out; + } + while (true) { + qemu_sem_wait(&p->sem_sync); + qemu_mutex_lock(&p->mutex); if (p->quit) { qemu_mutex_unlock(&p->mutex); break; } qemu_mutex_unlock(&p->mutex); - qemu_sem_wait(&p->sem); + + /* Send FINISHED to the destination */ + head.type = RDMA_CONTROL_REGISTER_FINISHED; + ret = qemu_rdma_exchange_send(p->rdma, &head, NULL, NULL, NULL, NULL); + if (ret < 0) { + return NULL; + } } out: @@ -836,15 +856,23 @@ void multifd_recv_sync_main(void) static void *multifd_rdma_recv_thread(void *opaque) { MultiFDRecvParams *p = opaque; + int ret = 0; while (true) { + qemu_sem_wait(&p->sem_sync); + qemu_mutex_lock(&p->mutex); if (p->quit) { qemu_mutex_unlock(&p->mutex); break; } qemu_mutex_unlock(&p->mutex); - qemu_sem_wait(&p->sem_sync); + + ret = qemu_rdma_registration_handle(p->file, p->c); + if (ret < 0) { + qemu_file_set_error(p->file, ret); + break; + } } qemu_mutex_lock(&p->mutex); diff --git a/migration/rdma.c b/migration/rdma.c index 19a238be30..5de3a29712 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -3570,6 +3570,19 @@ static int rdma_load_hook(QEMUFile *f, void *opaque, uint64_t flags, void *data) return rdma_block_notification_handle(opaque, data); case RAM_CONTROL_HOOK: + if (migrate_use_multifd()) { + int i; + MultiFDRecvParams *multifd_recv_param = NULL; + int thread_count = migrate_multifd_channels(); + /* Inform dest recv_thread to poll */ + for (i = 0; i < thread_count; i++) { + if (get_multifd_recv_param(i, &multifd_recv_param)) { + return -1; + } + qemu_sem_post(&multifd_recv_param->sem_sync); + } + } + return qemu_rdma_registration_handle(f, opaque); default: @@ -3643,6 +3656,25 @@ static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque, head.type = RDMA_CONTROL_RAM_BLOCKS_REQUEST; trace_qemu_rdma_registration_stop_ram(); + if (migrate_use_multifd()) { + /* + * Inform the multifd channels to register memory + */ + int i; + int thread_count = migrate_multifd_channels(); + MultiFDSendParams *multifd_send_param = NULL; + for (i = 0; i < thread_count; i++) { + ret = get_multifd_send_param(i, &multifd_send_param); + if (ret) { + ERROR(errp, "rdma: error getting" + "multifd_send_param(%d)", i); + return ret; + } + + qemu_sem_post(&multifd_send_param->sem_sync); + } + } + /* * Make sure that we parallelize the pinning on both sides. * For very large guests, doing this serially takes a really @@ -3708,6 +3740,22 @@ static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque, head.type = RDMA_CONTROL_REGISTER_FINISHED; ret = qemu_rdma_exchange_send(rdma, &head, NULL, NULL, NULL, NULL); + if (migrate_use_multifd()) { + /* Inform src send_thread to send FINISHED signal */ + int i; + int thread_count = migrate_multifd_channels(); + MultiFDSendParams *multifd_send_param = NULL; + for (i = 0; i < thread_count; i++) { + ret = get_multifd_send_param(i, &multifd_send_param); + if (ret) { + ERROR(errp, "rdma: error getting multifd_send_param(%d)", i); + return ret; + } + + qemu_sem_post(&multifd_send_param->sem_sync); + } + } + if (ret < 0) { goto err; } -- 2.19.1