From nobody Tue Feb 10 06:43:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1612338814; cv=none; d=zohomail.com; s=zohoarc; b=i4DAw9bY3eUee+OAM3o0AezPRYEl4a1lwH1c2QUJkSV55rs6iCUah10yVJLL8Vfx9AIcl2MTStR3b/Od9/up9s4e/ThXgvitRVYkNhnsVgH8cg3aAN77EcbnPE/5mJH8Cp1diuwrTudGSFiHen3v80fu1n+91TdA3op4K7nV/UA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612338814; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0y/lfSYdVGd57ws8ite+RAW81Fmo3YN5nlOByoZbINQ=; b=VwzoSlGpRSjFAxnkm1+z1WdVw2/jCfBxb+5A+8xfIx1BJMWvi3x8S+Djr8xW82VypPw3HnI5hntfXzfqL9/lk6u24/hQT00G5NbNvgWifJSA+2OYJxqgSTJgmM2nyanrHsP192srcn09Qpd7Fdqx98BCzktjEXgji1BPHMjiSws= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612338814193194.09559904653133; Tue, 2 Feb 2021 23:53:34 -0800 (PST) Received: from localhost ([::1]:55612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7Cyi-0006ue-US for importer@patchew.org; Wed, 03 Feb 2021 02:53:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7Cpf-0002yJ-D1 for qemu-devel@nongnu.org; Wed, 03 Feb 2021 02:44:11 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7CpW-0008J4-DN for qemu-devel@nongnu.org; Wed, 03 Feb 2021 02:44:11 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DVtv06DphzjJgh; Wed, 3 Feb 2021 15:42:36 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.498.0; Wed, 3 Feb 2021 15:43:44 +0800 From: Chuan Zheng To: , , Subject: [PATCH v4 14/18] migration/rdma: register memory for multifd RDMA channels Date: Wed, 3 Feb 2021 16:01:47 +0800 Message-ID: <1612339311-114805-15-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1612339311-114805-1-git-send-email-zhengchuan@huawei.com> References: <1612339311-114805-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=zhengchuan@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, wanghao232@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Zhimin Feng Signed-off-by: Chuan Zheng --- migration/multifd.c | 3 ++ migration/rdma.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++= ++-- 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index 919a414..1186246 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -537,6 +537,9 @@ void multifd_send_terminate_threads(Error *err) qemu_mutex_lock(&p->mutex); p->quit =3D true; qemu_sem_post(&p->sem); + if (migrate_use_rdma()) { + qemu_sem_post(&p->sem_sync); + } qemu_mutex_unlock(&p->mutex); } } diff --git a/migration/rdma.c b/migration/rdma.c index 1095a8f..c906cc7 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -3838,6 +3838,19 @@ static int rdma_load_hook(QEMUFile *f, void *opaque,= uint64_t flags, void *data) return rdma_block_notification_handle(opaque, data); =20 case RAM_CONTROL_HOOK: + if (migrate_use_multifd()) { + int i; + MultiFDRecvParams *multifd_recv_param =3D NULL; + int thread_count =3D migrate_multifd_channels(); + /* Inform dest recv_thread to poll */ + for (i =3D 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); =20 default: @@ -3910,6 +3923,24 @@ static int qemu_rdma_registration_stop(QEMUFile *f, = void *opaque, head.type =3D RDMA_CONTROL_RAM_BLOCKS_REQUEST; trace_qemu_rdma_registration_stop_ram(); =20 + if (migrate_use_multifd()) { + /* + * Inform the multifd channels to register memory + */ + int i; + int thread_count =3D migrate_multifd_channels(); + MultiFDSendParams *multifd_send_param =3D NULL; + for (i =3D 0; i < thread_count; i++) { + ret =3D get_multifd_send_param(i, &multifd_send_param); + if (ret) { + error_report("rdma: error getting multifd(%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 @@ -3968,6 +3999,21 @@ static int qemu_rdma_registration_stop(QEMUFile *f, = void *opaque, rdma->dest_blocks[i].remote_host_addr; local->block[i].remote_rkey =3D rdma->dest_blocks[i].remote_rk= ey; } + /* Wait for all multifd channels to complete registration */ + if (migrate_use_multifd()) { + int i; + int thread_count =3D migrate_multifd_channels(); + MultiFDSendParams *multifd_send_param =3D NULL; + for (i =3D 0; i < thread_count; i++) { + ret =3D get_multifd_send_param(i, &multifd_send_param); + if (ret) { + error_report("rdma: error getting multifd(%d)", i); + return ret; + } + + qemu_sem_wait(&multifd_send_param->sem); + } + } } =20 trace_qemu_rdma_registration_stop(flags); @@ -3979,6 +4025,24 @@ static int qemu_rdma_registration_stop(QEMUFile *f, = void *opaque, goto err; } =20 + if (migrate_use_multifd()) { + /* + * Inform src send_thread to send FINISHED signal. + * Wait for multifd RDMA send threads to poll the CQE. + */ + int i; + int thread_count =3D migrate_multifd_channels(); + MultiFDSendParams *multifd_send_param =3D NULL; + for (i =3D 0; i < thread_count; i++) { + ret =3D get_multifd_send_param(i, &multifd_send_param); + if (ret < 0) { + goto err; + } + + qemu_sem_post(&multifd_send_param->sem_sync); + } + } + return 0; err: rdma->error_state =3D ret; @@ -4355,19 +4419,37 @@ static void *multifd_rdma_send_thread(void *opaque) { MultiFDSendParams *p =3D opaque; Error *local_err =3D NULL; + int ret =3D 0; + RDMAControlHeader head =3D { .len =3D 0, .repeat =3D 1 }; =20 trace_multifd_send_thread_start(p->id); if (multifd_send_initial_packet(p, &local_err) < 0) { goto out; } =20 + /* wait for semaphore notification to register memory */ + qemu_sem_wait(&p->sem_sync); + if (qemu_rdma_registration(p->rdma) < 0) { + goto out; + } + /* + * Inform the main RDMA thread to run when multifd + * RDMA thread have completed registration. + */ + qemu_sem_post(&p->sem); while (true) { + qemu_sem_wait(&p->sem_sync); WITH_QEMU_LOCK_GUARD(&p->mutex) { if (p->quit) { break; } } - qemu_sem_wait(&p->sem); + /* Send FINISHED to the destination */ + head.type =3D RDMA_CONTROL_REGISTER_FINISHED; + ret =3D qemu_rdma_exchange_send(p->rdma, &head, NULL, NULL, NULL, = NULL); + if (ret < 0) { + return NULL; + } } =20 out: @@ -4406,14 +4488,20 @@ static void multifd_rdma_send_channel_setup(MultiFD= SendParams *p) static void *multifd_rdma_recv_thread(void *opaque) { MultiFDRecvParams *p =3D opaque; + int ret =3D 0; =20 while (true) { + qemu_sem_wait(&p->sem_sync); WITH_QEMU_LOCK_GUARD(&p->mutex) { if (p->quit) { break; } } - qemu_sem_wait(&p->sem_sync); + ret =3D qemu_rdma_registration_handle(p->file, p->c); + if (ret < 0) { + qemu_file_set_error(p->file, ret); + break; + } } =20 WITH_QEMU_LOCK_GUARD(&p->mutex) { --=20 1.8.3.1