From nobody Tue Feb 10 09:28:30 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=1612338386; cv=none; d=zohomail.com; s=zohoarc; b=HTAbA7R3OTOpcCfMUX3y32OGWsFQtxCMwUeYMYoJz6RWZq2gwK5fvR1c2sWm9k5wQPMVGv49P53gv7NdHc5SMWGptyZAWJ71F4DZ9VhFTgotQWHaqj0cHZcfDtPWMTfMdqd9r6HnbfyUfhLnHSjUcZfMDa3/U92fWhJJ579zh1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612338386; 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=pozQ0zzTAsh93NwTFl3JJgR8UKcVX7QOy9WebcPal7M=; b=lMmxx9K9AOlr5Zj62OeGTLQkiffZWyTq2Z7ZsN1tkHW98ZeLMIYvjXcUj1/UXxnR9NGwU5kdauqUrIFTMZf30leTorEAI1W3J/n9k0vT5FW27SvDOW78WXyWzGeYdLniMfAmicTIj1fqorhDZbIA//JBKYZUQp5pLTBxtM9M4dk= 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 1612338386436931.8165947338163; Tue, 2 Feb 2021 23:46:26 -0800 (PST) Received: from localhost ([::1]:58494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7Crp-0004kS-DR for importer@patchew.org; Wed, 03 Feb 2021 02:46:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7Cph-00030Y-M2 for qemu-devel@nongnu.org; Wed, 03 Feb 2021 02:44:13 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7CpY-0008J8-4g for qemu-devel@nongnu.org; Wed, 03 Feb 2021 02:44:13 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DVtv05kgfzjJgf; 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:43 +0800 From: Chuan Zheng To: , , Subject: [PATCH v4 12/18] migration/rdma: Create the multifd send channels for RDMA Date: Wed, 3 Feb 2021 16:01:45 +0800 Message-ID: <1612339311-114805-13-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: Chuan Zheng --- migration/multifd.c | 4 ++-- migration/multifd.h | 2 ++ migration/rdma.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index ae0b7f0..919a414 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -176,7 +176,7 @@ void multifd_register_ops(int method, MultiFDMethods *o= ps) multifd_ops[method] =3D ops; } =20 -static int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp) +int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp) { MultiFDInit_t msg =3D {}; int ret; @@ -503,7 +503,7 @@ int multifd_queue_page(QEMUFile *f, RAMBlock *block, ra= m_addr_t offset) return 1; } =20 -static void multifd_send_terminate_threads(Error *err) +void multifd_send_terminate_threads(Error *err) { int i; =20 diff --git a/migration/multifd.h b/migration/multifd.h index b17a2c1..26d4489 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -184,6 +184,8 @@ typedef struct { #ifdef CONFIG_RDMA extern MultiFDSetup multifd_rdma_ops; #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 9654b87..cff9446 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -4261,9 +4261,54 @@ err: g_free(rdma_return_path); } =20 +static int multifd_channel_rdma_connect(void *opaque) +{ + MultiFDSendParams *p =3D opaque; + Error *local_err =3D NULL; + int ret =3D 0; + MigrationState *s =3D migrate_get_current(); + + p->rdma =3D qemu_rdma_data_init(s->host_port, &local_err); + if (p->rdma =3D=3D NULL) { + goto out; + } + + ret =3D qemu_rdma_source_init(p->rdma, + migrate_rdma_pin_all(), + &local_err); + if (ret) { + goto out; + } + + ret =3D qemu_rdma_connect(p->rdma, &local_err); + if (ret) { + goto out; + } + + p->file =3D qemu_fopen_rdma(p->rdma, "wb"); + if (p->file =3D=3D NULL) { + goto out; + } + + p->c =3D 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 =3D opaque; + Error *local_err =3D NULL; + + trace_multifd_send_thread_start(p->id); + if (multifd_send_initial_packet(p, &local_err) < 0) { + goto out; + } =20 while (true) { WITH_QEMU_LOCK_GUARD(&p->mutex) { @@ -4274,6 +4319,12 @@ static void *multifd_rdma_send_thread(void *opaque) qemu_sem_wait(&p->sem); } =20 +out: + if (local_err) { + trace_multifd_send_error(p->id); + multifd_send_terminate_threads(local_err); + } + WITH_QEMU_LOCK_GUARD(&p->mutex) { p->running =3D false; } @@ -4285,6 +4336,12 @@ static void multifd_rdma_send_channel_setup(MultiFDS= endParams *p) { Error *local_err =3D NULL; =20 + 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 ; --=20 1.8.3.1