From nobody Mon Feb 9 23:39:52 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=1602908350; cv=none; d=zohomail.com; s=zohoarc; b=iH+XV4OJHKqkNiNg+MlmRTaxHY1qzdArnwR1nRgQGS5Ksz+A4wQ1p5XjBX93hnURT9LLvCNPoBrTtWq3t8hKtY5LVDdiXeI91MaW0ukQ0Ag1TrngarWV+R0KGCJLP+0ssskgz02GAeNmllXPuBkpylPw8HlR0pOSCublDTCEtz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602908350; 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=Epf6F46XASwg79+TyKsiIycwkQc7AHl0KWjv9VPXG/o=; b=Xb7g/mb2cN49ZUf1jscUDwslBBQNoQhHK65sQIo3PJjmGH/30qNpO94FLfzSrvxxRGAORLHtnEqzCYYuICitHiG0pfXBGf1c2YTwpVZlFS1RsoSg3NOpqpm7ij4QlTVFI3YSYrwTKwz1NM6dITEeUEsf+VAMRjfWeQv1ajChL8A= 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 1602908350929117.42605782071189; Fri, 16 Oct 2020 21:19:10 -0700 (PDT) Received: from localhost ([::1]:53182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTdgT-00005P-E8 for importer@patchew.org; Sat, 17 Oct 2020 00:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTdXv-0006HD-J5 for qemu-devel@nongnu.org; Sat, 17 Oct 2020 00:10:19 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5245 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTdXr-0007Ij-5e for qemu-devel@nongnu.org; Sat, 17 Oct 2020 00:10:19 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 7F60251D1C4A51D745D8; Sat, 17 Oct 2020 12:09:56 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Sat, 17 Oct 2020 12:09:47 +0800 From: Chuan Zheng To: , Subject: [PATCH v3 12/18] migration/rdma: Create the multifd send channels for RDMA Date: Sat, 17 Oct 2020 12:25:42 +0800 Message-ID: <1602908748-43335-13-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1602908748-43335-1-git-send-email-zhengchuan@huawei.com> References: <1602908748-43335-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=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/17 00:09:47 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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, fengzhimin1@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 | 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 *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; @@ -500,7 +500,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 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); } =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_use_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) { qemu_mutex_lock(&p->mutex); @@ -4275,6 +4320,11 @@ 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); + } qemu_mutex_lock(&p->mutex); p->running =3D false; qemu_mutex_unlock(&p->mutex); @@ -4286,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