From nobody Thu May 2 09:45:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523089720453453.82143021265176; Sat, 7 Apr 2018 01:28:40 -0700 (PDT) Received: from localhost ([::1]:40865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jD5-0005t4-M8 for importer@patchew.org; Sat, 07 Apr 2018 04:28:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jBU-0004uL-Uj for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4jBT-00026O-GS for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:52 -0400 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:40641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f4jBT-00025q-7g for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:51 -0400 Received: by mail-pl0-x244.google.com with SMTP id x4-v6so2040143pln.7 for ; Sat, 07 Apr 2018 01:26:51 -0700 (PDT) Received: from VM_127_91_centos.localdomain ([119.28.195.137]) by smtp.gmail.com with ESMTPSA id y129sm18478558pgb.64.2018.04.07.01.26.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 01:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rVjG3i76oavtWCT9k3FUekjz0Rn/1ZC27uj69wkNaMo=; b=YFRVind9IBmZMAw4Qa4CA4offp6SMIK0ctdgR+57FjHkgHqcXbOE8KBeG4yx2aTe7Q o7idS8Vm3PyL6M/bTi4FdTUXd4nW0oHt6Vz5UujQEHR4X9Pk5eOubh5NjsjbqT1w+MG1 PitCJfDb44P76/agSeEA0BLKGIXUTvL8Z0TGMxDh+5XOYVjneAQtBRtG6t3U2o1Lg2io 8BWdIk6YV5UOOhbzwR8evt4RqVuMaBuNUEuf2SkE6J2Z4wx3OhfFM0X0r7hQ+UexaX/V f13/z0Q9t1ywQeG4qFvbQRXvRt8kFDlcQEdMilaKXSUh75n/ar+YiVNE7DQ0hCSVvjk7 Qfmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rVjG3i76oavtWCT9k3FUekjz0Rn/1ZC27uj69wkNaMo=; b=sjJevlHf6ydxdqcs0+s6UXnD5wulr4S2GJ0Y+w8YXEw05kdmg3KCJlmkKn8fA5DU/V EvMZaVK7hk3BCojHnmKD5//WJ6gT8j1QhCD4x/WG3fN2ZQPj7QSeqPBiiODka8PAB8i+ lv2MCZ3kichCbIwGs5IBpbYRKmQApR4iIzAEgZC7PYzJHB/dFpDfTsQzEpgY5FbYvKqW tzzZY0h2Bd5LfSZOLMpk/waOdzS00Y4We9pQR/MoDuvdWVeow7jkWTyxxjCgr3TCrVPe /oQ8rafkN/0bPlVnm0yJ/pvgPTIJVwXgicLfqPeNiug4jT0dkXhjwuRGRl9SblOEoAY+ kuyw== X-Gm-Message-State: AElRT7EhM62tuvRrqierVLFoKPMsttF+4bXXDlQsbkHiGcXU1LYFGFXE 7LCBZhgpx5uTCCnBL9cdRbs= X-Google-Smtp-Source: AIpwx4/9mefTHw/CUTpYjrmd8QM1s5emw862BQy99ksdEGwXP3gvjkVV0PqU1cKORessZYh2Gq6VtA== X-Received: by 2002:a17:902:228:: with SMTP id 37-v6mr30592186plc.141.1523089610454; Sat, 07 Apr 2018 01:26:50 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: quintela@redhat.com, dgilbert@redhat.com Date: Sat, 7 Apr 2018 16:26:30 +0800 Message-Id: <1523089594-1422-2-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> References: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::244 Subject: [Qemu-devel] [PATCH 1/5] migration: create a dedicated connection for rdma return path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lidong Chen , adido@mellanox.com, qemu-devel@nongnu.org, licq@mellanox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If start a RDMA migration with postcopy enabled, the source qemu establish a dedicated connection for return path. Signed-off-by: Lidong Chen --- migration/rdma.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++= ++-- 1 file changed, 91 insertions(+), 3 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index da474fc..230bd97 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -387,6 +387,10 @@ typedef struct RDMAContext { uint64_t unregistrations[RDMA_SIGNALED_SEND_MAX]; =20 GHashTable *blockmap; + + /* the RDMAContext for return path */ + struct RDMAContext *return_path; + bool is_return_path; } RDMAContext; =20 #define TYPE_QIO_CHANNEL_RDMA "qio-channel-rdma" @@ -2329,10 +2333,22 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) rdma_destroy_id(rdma->cm_id); rdma->cm_id =3D NULL; } + + /* the destination side, listen_id and channel is shared */ if (rdma->listen_id) { - rdma_destroy_id(rdma->listen_id); + if (!rdma->is_return_path) { + rdma_destroy_id(rdma->listen_id); + } rdma->listen_id =3D NULL; + + if (rdma->channel) { + if (!rdma->is_return_path) { + rdma_destroy_event_channel(rdma->channel); + } + rdma->channel =3D NULL; + } } + if (rdma->channel) { rdma_destroy_event_channel(rdma->channel); rdma->channel =3D NULL; @@ -2561,6 +2577,25 @@ err_dest_init_create_listen_id: =20 } =20 +static void qemu_rdma_return_path_dest_init(RDMAContext *rdma_return_path, + RDMAContext *rdma) +{ + int idx; + + for (idx =3D 0; idx < RDMA_WRID_MAX; idx++) { + rdma_return_path->wr_data[idx].control_len =3D 0; + rdma_return_path->wr_data[idx].control_curr =3D NULL; + } + + /*the CM channel and CM id is shared*/ + rdma_return_path->channel =3D rdma->channel; + rdma_return_path->listen_id =3D rdma->listen_id; + + rdma->return_path =3D rdma_return_path; + rdma_return_path->return_path =3D rdma; + rdma_return_path->is_return_path =3D true; +} + static void *qemu_rdma_data_init(const char *host_port, Error **errp) { RDMAContext *rdma =3D NULL; @@ -3014,6 +3049,8 @@ err: return ret; } =20 +static void rdma_accept_incoming_migration(void *opaque); + static int qemu_rdma_accept(RDMAContext *rdma) { RDMACapabilities cap; @@ -3108,7 +3145,14 @@ static int qemu_rdma_accept(RDMAContext *rdma) } } =20 - qemu_set_fd_handler(rdma->channel->fd, NULL, NULL, NULL); + /* Accept the second connection request for return path */ + if (migrate_postcopy() && !rdma->is_return_path) { + qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migrat= ion, + NULL, + (void *)(intptr_t)rdma->return_path); + } else { + qemu_set_fd_handler(rdma->channel->fd, NULL, NULL, NULL); + } =20 ret =3D rdma_accept(rdma->cm_id, &conn_param); if (ret) { @@ -3681,6 +3725,10 @@ static void rdma_accept_incoming_migration(void *opa= que) =20 trace_qemu_rdma_accept_incoming_migration_accepted(); =20 + if (rdma->is_return_path) { + return; + } + f =3D qemu_fopen_rdma(rdma, "rb"); if (f =3D=3D NULL) { ERROR(errp, "could not qemu_fopen_rdma!"); @@ -3695,7 +3743,7 @@ static void rdma_accept_incoming_migration(void *opaq= ue) void rdma_start_incoming_migration(const char *host_port, Error **errp) { int ret; - RDMAContext *rdma; + RDMAContext *rdma, *rdma_return_path; Error *local_err =3D NULL; =20 trace_rdma_start_incoming_migration(); @@ -3722,12 +3770,24 @@ void rdma_start_incoming_migration(const char *host= _port, Error **errp) =20 trace_rdma_start_incoming_migration_after_rdma_listen(); =20 + /* initialize the RDMAContext for return path */ + if (migrate_postcopy()) { + rdma_return_path =3D qemu_rdma_data_init(host_port, &local_err); + + if (rdma_return_path =3D=3D NULL) { + goto err; + } + + qemu_rdma_return_path_dest_init(rdma_return_path, rdma); + } + qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration, NULL, (void *)(intptr_t)rdma); return; err: error_propagate(errp, local_err); g_free(rdma); + g_free(rdma_return_path); } =20 void rdma_start_outgoing_migration(void *opaque, @@ -3735,6 +3795,7 @@ void rdma_start_outgoing_migration(void *opaque, { MigrationState *s =3D opaque; RDMAContext *rdma =3D qemu_rdma_data_init(host_port, errp); + RDMAContext *rdma_return_path =3D NULL; int ret =3D 0; =20 if (rdma =3D=3D NULL) { @@ -3755,6 +3816,32 @@ void rdma_start_outgoing_migration(void *opaque, goto err; } =20 + /* RDMA postcopy need a seprate queue pair for return path */ + if (migrate_postcopy()) { + rdma_return_path =3D qemu_rdma_data_init(host_port, errp); + + if (rdma_return_path =3D=3D NULL) { + goto err; + } + + ret =3D qemu_rdma_source_init(rdma_return_path, + s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], er= rp); + + if (ret) { + goto err; + } + + ret =3D qemu_rdma_connect(rdma_return_path, errp); + + if (ret) { + goto err; + } + + rdma->return_path =3D rdma_return_path; + rdma_return_path->return_path =3D rdma; + rdma_return_path->is_return_path =3D true; + } + trace_rdma_start_outgoing_migration_after_rdma_connect(); =20 s->to_dst_file =3D qemu_fopen_rdma(rdma, "wb"); @@ -3762,4 +3849,5 @@ void rdma_start_outgoing_migration(void *opaque, return; err: g_free(rdma); + g_free(rdma_return_path); } --=20 1.8.3.1 From nobody Thu May 2 09:45:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523089839079173.3934068840383; Sat, 7 Apr 2018 01:30:39 -0700 (PDT) Received: from localhost ([::1]:40968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jF8-0007pF-4o for importer@patchew.org; Sat, 07 Apr 2018 04:30:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jBW-0004uh-5G for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4jBV-00027L-57 for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:54 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:40640) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f4jBU-00026u-UK for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:53 -0400 Received: by mail-pl0-x242.google.com with SMTP id x4-v6so2040160pln.7 for ; Sat, 07 Apr 2018 01:26:52 -0700 (PDT) Received: from VM_127_91_centos.localdomain ([119.28.195.137]) by smtp.gmail.com with ESMTPSA id y129sm18478558pgb.64.2018.04.07.01.26.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 01:26:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B5U0faMyZEUEcNNcwNhUXcCQmVCig7eD4qDHmGmnx5o=; b=rmF/Amm58ZLNrVw0jlnBs+yN07iZhfze3qMLytg0JFL2TINrjZTvnl3mmDgi4BQd0o Ate4OecMduriSRuY+MR8Sd/HWxQokfMXL1Glu9/kOGrQ4FfJcaeDTA9FB+Iog2HZ2OiE MRB1oQVkcAyRSETIURsE1z1IIqWpiABhmZdp0O6syLCJHs1RNC/FVGtter2w9SxzkP0w AoAjZ53Uljm7so8Sa4gLbnFvL7N29uOZWLFhVvemDfmLJWrgjt8IMOnajcbAPfnP8jjg ed1vzGBILfE1VdtP7LKufy1+J/mfS7EHw0MEX0xEz5lpEefdTV828ylx3GpuV7JgOLgj zy9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B5U0faMyZEUEcNNcwNhUXcCQmVCig7eD4qDHmGmnx5o=; b=cpIOIQDlxNk2wXLa71PtBcyDB6nZi2KSrg8OZq4I+1/R/T6rxCigjLXfVBNjeBcqty B2esaf50LDFGx1KiMHoPIyizKuKheFjU93d3yIdwNf/gYNlelzjsp5gTxCMZlf22gNYf JA4qlvn2xQo5uW037AhBOrsLeKyLqOen7Vbi0bwR5pnuEDtyJxU3QU5zZF4eoSpDL9vv SmFvzsw0TrA7d/b/+JGQwK7w0A7s1OBl386+KcAPoUEV7uFEX9DBPOZVBYlN2r29gfMf Cd4WAeDcVKeryFGXxXRfncr9zkk/TEpSw3teXa3qEr7r/jl8JVom3NrYPnosLjI0geSV Vquw== X-Gm-Message-State: AElRT7GhenWravTxHqA02+BdW0EWGaasuL53j+1vWA9rZX2BMVSHNdnR +q+yHuabJZ+lFEGZmfQzYUc= X-Google-Smtp-Source: AIpwx48U5/lP3BLK2eUqty++twC6U8fJP9YergQOSyWgrOg8kP9Asvz3uQhQHr0MzTOz09uwVHpckQ== X-Received: by 2002:a17:902:102:: with SMTP id 2-v6mr30521433plb.48.1523089612222; Sat, 07 Apr 2018 01:26:52 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: quintela@redhat.com, dgilbert@redhat.com Date: Sat, 7 Apr 2018 16:26:31 +0800 Message-Id: <1523089594-1422-3-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> References: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH 2/5] migration: add the interface to set get_return_path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lidong Chen , adido@mellanox.com, qemu-devel@nongnu.org, licq@mellanox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The default get_return_path function of iochannel does not work for RDMA live migration. So add the interface to set get_return_path. Signed-off-by: Lidong Chen --- migration/qemu-file-channel.c | 12 ++++++++---- migration/qemu-file.c | 10 ++++++++-- migration/qemu-file.h | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c index e202d73..d4dd8c4 100644 --- a/migration/qemu-file-channel.c +++ b/migration/qemu-file-channel.c @@ -156,7 +156,6 @@ static const QEMUFileOps channel_input_ops =3D { .close =3D channel_close, .shut_down =3D channel_shutdown, .set_blocking =3D channel_set_blocking, - .get_return_path =3D channel_get_input_return_path, }; =20 =20 @@ -165,18 +164,23 @@ static const QEMUFileOps channel_output_ops =3D { .close =3D channel_close, .shut_down =3D channel_shutdown, .set_blocking =3D channel_set_blocking, - .get_return_path =3D channel_get_output_return_path, }; =20 =20 QEMUFile *qemu_fopen_channel_input(QIOChannel *ioc) { + QEMUFile *f; object_ref(OBJECT(ioc)); - return qemu_fopen_ops(ioc, &channel_input_ops); + f =3D qemu_fopen_ops(ioc, &channel_input_ops); + qemu_file_set_return_path(f, channel_get_input_return_path); + return f; } =20 QEMUFile *qemu_fopen_channel_output(QIOChannel *ioc) { + QEMUFile *f; object_ref(OBJECT(ioc)); - return qemu_fopen_ops(ioc, &channel_output_ops); + f =3D qemu_fopen_ops(ioc, &channel_output_ops); + qemu_file_set_return_path(f, channel_get_output_return_path); + return f; } diff --git a/migration/qemu-file.c b/migration/qemu-file.c index bb63c77..8acb574 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -36,6 +36,7 @@ struct QEMUFile { const QEMUFileOps *ops; const QEMUFileHooks *hooks; + QEMURetPathFunc *get_return_path; void *opaque; =20 int64_t bytes_xfer; @@ -72,10 +73,15 @@ int qemu_file_shutdown(QEMUFile *f) */ QEMUFile *qemu_file_get_return_path(QEMUFile *f) { - if (!f->ops->get_return_path) { + if (!f->get_return_path) { return NULL; } - return f->ops->get_return_path(f->opaque); + return f->get_return_path(f->opaque); +} + +void qemu_file_set_return_path(QEMUFile *f, QEMURetPathFunc *get_return_pa= th) +{ + f->get_return_path =3D get_return_path; } =20 bool qemu_file_mode_is_not_valid(const char *mode) diff --git a/migration/qemu-file.h b/migration/qemu-file.h index f4f356a..74210b7 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -102,7 +102,6 @@ typedef struct QEMUFileOps { QEMUFileCloseFunc *close; QEMUFileSetBlocking *set_blocking; QEMUFileWritevBufferFunc *writev_buffer; - QEMURetPathFunc *get_return_path; QEMUFileShutdownFunc *shut_down; } QEMUFileOps; =20 @@ -114,6 +113,7 @@ typedef struct QEMUFileHooks { } QEMUFileHooks; =20 QEMUFile *qemu_fopen_ops(void *opaque, const QEMUFileOps *ops); +void qemu_file_set_return_path(QEMUFile *f, QEMURetPathFunc *get_return_pa= th); void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks); int qemu_get_fd(QEMUFile *f); int qemu_fclose(QEMUFile *f); --=20 1.8.3.1 From nobody Thu May 2 09:45:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523089720454468.39264227976946; Sat, 7 Apr 2018 01:28:40 -0700 (PDT) Received: from localhost ([::1]:40866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jD9-0005uu-Pf for importer@patchew.org; Sat, 07 Apr 2018 04:28:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jBY-0004vd-4c for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4jBX-000287-3f for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:56 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:35826) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f4jBW-00027x-TU for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:55 -0400 Received: by mail-pf0-x241.google.com with SMTP id u86so2381298pfd.2 for ; Sat, 07 Apr 2018 01:26:54 -0700 (PDT) Received: from VM_127_91_centos.localdomain ([119.28.195.137]) by smtp.gmail.com with ESMTPSA id y129sm18478558pgb.64.2018.04.07.01.26.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 01:26:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F/LhuOuEAG96WLQdVIFLedAXwZVIGT9cZmBjjZ6NZlA=; b=hhrteowCjCI8MNQa4e8/ShpO/QgKlo28hXiKdkFfBu6XjefrHVwbiM6RmXVOuHCvX8 cESjPNRVZ25mxNICcHVPEsbqJo+dRJYNM5/q1tlmVZ8u6dQICrBQwsqYM5b8+Lf2m9YQ 4ATGkkzqM9j4xC9gKVjiHTgj3G5cvSkNaaKwUNIRADDZWxpMY9NZlmQqOZTIJAMr1f6V wzfz4BDY3cAjeABugFFW/20aUJesWYlyJJzBjtVyqLEkdJyZxgHnEwMSLIzJJcoe38ka XEF9+mCbtruGtfhiK0uQ6yR1uX/5PFV9tlrAlCV2+feYq54hhDkaLEfJfuN1RvZ59Ipn 4GSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F/LhuOuEAG96WLQdVIFLedAXwZVIGT9cZmBjjZ6NZlA=; b=dB1d6ZRmVAG6bkO36mQxqv/Xr0Q7kOeCz6O1PBLHqzGdsr8+7fuRAle49hvYeWzcUv /Pgn/MxhlTTgqZofeEJjwFhz4o6Zd2kLPpiY5ATbtim9wZwleZlwl5nn+GX1CHJ6SMEx JVbJzzxjZ7/z53wFiFEd/R7dzhqfG13Q9EfAQLMR19qUqdfiH2+ur9QDtH9/KV8IjKrl XpMpqDDOOVERJY+QNaOYU1p5YpE9YdDawC6HZGnYzZC35a2ySO0Ur7pwWeubxsMhrUnf Nbi5M3hsZf0xnolGcFMzMLeBOa9LIbHDBd/B0ujEd+GvKDko9dJlmp4lf4Xu1DL3t0d6 fqag== X-Gm-Message-State: AElRT7GBiejeXGMBzv5AIA2pGFqD7Ze1XVlzqrDnjHDsTEyDfDsVx8oa DVFhX8MZl5RlELo1+yBOqUI= X-Google-Smtp-Source: AIpwx4++P92O3Roolu4Y4PZ/W3cWyCcRQ+0fFRFIaQdNDNx4X5frP7jO8XIhDw9lD0MVC+Ka1UzxlQ== X-Received: by 10.99.95.144 with SMTP id t138mr19247849pgb.94.1523089614000; Sat, 07 Apr 2018 01:26:54 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: quintela@redhat.com, dgilbert@redhat.com Date: Sat, 7 Apr 2018 16:26:32 +0800 Message-Id: <1523089594-1422-4-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> References: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH 3/5] migration: implement the get_return_path for RDMA iochannel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lidong Chen , adido@mellanox.com, qemu-devel@nongnu.org, licq@mellanox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" the default get_return_path function does not work for RDMA live migration, the patch implement the get_return_path for RDMA iochannel. Signed-off-by: Lidong Chen --- migration/rdma.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/migration/rdma.c b/migration/rdma.c index 230bd97..53773c7 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -3638,6 +3638,40 @@ err: return ret; } =20 +static QEMUFile *qio_channel_rdma_get_return_path(void *opaque, int input) +{ + QIOChannel *ioc =3D opaque; + QIOChannelRDMA *rioc =3D QIO_CHANNEL_RDMA(ioc); + RDMAContext *rdma =3D rioc->rdma; + + QIOChannelRDMA *rioc_return_path; + RDMAContext *rdma_return_path =3D rdma->return_path; + + if (!rdma_return_path) { + return NULL; + } + + rioc_return_path =3D QIO_CHANNEL_RDMA(object_new(TYPE_QIO_CHANNEL_RDMA= )); + rioc_return_path->rdma =3D rdma_return_path; + if (input) { + rioc_return_path->file =3D qemu_fopen_channel_output( + QIO_CHANNEL(rioc_return_path)); + } else { + rioc_return_path->file =3D qemu_fopen_channel_input( + QIO_CHANNEL(rioc_return_path)); + } + return rioc_return_path->file; +} + +static QEMUFile *qio_channel_rdma_get_output_return_path(void *opaque) +{ + return qio_channel_rdma_get_return_path(opaque, 0); +} + +static QEMUFile *qio_channel_rdma_get_input_return_path(void *opaque) +{ + return qio_channel_rdma_get_return_path(opaque, 1); +} static const QEMUFileHooks rdma_read_hooks =3D { .hook_ram_load =3D rdma_load_hook, }; @@ -3700,9 +3734,13 @@ static QEMUFile *qemu_fopen_rdma(RDMAContext *rdma, = const char *mode) if (mode[0] =3D=3D 'w') { rioc->file =3D qemu_fopen_channel_output(QIO_CHANNEL(rioc)); qemu_file_set_hooks(rioc->file, &rdma_write_hooks); + qemu_file_set_return_path(rioc->file, + qio_channel_rdma_get_output_return_path); } else { rioc->file =3D qemu_fopen_channel_input(QIO_CHANNEL(rioc)); qemu_file_set_hooks(rioc->file, &rdma_read_hooks); + qemu_file_set_return_path(rioc->file, + qio_channel_rdma_get_input_return_path); } =20 return rioc->file; --=20 1.8.3.1 From nobody Thu May 2 09:45:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15230898441551015.7098275507101; Sat, 7 Apr 2018 01:30:44 -0700 (PDT) Received: from localhost ([::1]:40970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jFD-0007vp-Ay for importer@patchew.org; Sat, 07 Apr 2018 04:30:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jBZ-0004xb-LJ for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4jBY-00028o-My for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:57 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:42930) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f4jBY-00028T-H6 for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:56 -0400 Received: by mail-pf0-x241.google.com with SMTP id o16so2368204pfk.9 for ; Sat, 07 Apr 2018 01:26:56 -0700 (PDT) Received: from VM_127_91_centos.localdomain ([119.28.195.137]) by smtp.gmail.com with ESMTPSA id y129sm18478558pgb.64.2018.04.07.01.26.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 01:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cVXeoTTxwn2Pmx2b7Dr/CQJkMiD6nbYL6ScmXHmHn+I=; b=YVcTDqToqyzqaddqEGDPC+enLFjWVeW4boP4E7Kqz0uw7upYF5eRW1No6TIzNB5cBG XKMNJ6IfIDxwh1Lc6qZsWdj2A1+HNqpjOJYGdYhYPVEAvl4O2jBn5saB8qK6LR/y1V2j x/1SpjqnSEIlY4C21AA0hQ9qLsXrTAhCzWtKvducJA+esxMsAn+EUGWOj+3sdQVjop3x RsV9bNUHOrBdL3fs0EeFJw7wgkX7zfiFE/z322WCA12fToV7ZPys18+c3kpaUgwdtL5a wako633W36+A809nAGA1M5QlUgoaX4I7oF9wWzfnocwQyMTig24bSJSCLM115lYsaGLV BvCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cVXeoTTxwn2Pmx2b7Dr/CQJkMiD6nbYL6ScmXHmHn+I=; b=VheqvcqmXTy4dzBESrfizVRyrLQmArLnYHMeUuKw9lreYuByBYDfkH786DEkcitPJE uj1hrABDqsU6iTX4OeAK3GXaahzs0dxg9TQW8nWbEDmeoPFcbkPtLQ71aXT38XUGuhFk LAkYLAEgLutHMgmG+FMdBJa5Ca3B3bXDLdJwgbIkhbDdwhqrr+e87jeqxGcOHOujq4Em ajhuRO3vLUVQ2D+mExiY1R7oUBMQQKx1S1IuzwyrZcPXmlKj0HKfoN2Dus/kWwQ+JR64 qv8rBxPx/WFThtltqyuMr6GDwRGsveyiH6J9JqWlyBMnO6Fh5M2Aipj1fpRzSdFGa2MI RTVQ== X-Gm-Message-State: ALQs6tB40dFSBr7c9OZ8u76cnJRniB4vBWJIjasRwFl0TjMfvqtqc9H9 k7TyedQtrQymbcL0/McITZFEWg== X-Google-Smtp-Source: AIpwx48aYIpDtrfIcZwJeim1iqNh2gP5JCHgfM9cvJ2Ugw3aSoPZd38AV1RGDLOLbNWe7Bk5aLOM+Q== X-Received: by 10.99.117.79 with SMTP id f15mr3464247pgn.263.1523089615808; Sat, 07 Apr 2018 01:26:55 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: quintela@redhat.com, dgilbert@redhat.com Date: Sat, 7 Apr 2018 16:26:33 +0800 Message-Id: <1523089594-1422-5-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> References: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH 4/5] migration: fix qemu carsh when RDMA live migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lidong Chen , adido@mellanox.com, qemu-devel@nongnu.org, licq@mellanox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" After postcopy, the destination qemu work in the dedicated thread, so only invoke yield_until_fd_readable before postcopy migration. Signed-off-by: Lidong Chen Reviewed-by: Dr. David Alan Gilbert --- migration/rdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/rdma.c b/migration/rdma.c index 53773c7..81be482 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1489,11 +1489,13 @@ static int qemu_rdma_wait_comp_channel(RDMAContext = *rdma) * Coroutine doesn't start until migration_fd_process_incoming() * so don't yield unless we know we're running inside of a coroutine. */ - if (rdma->migration_started_on_destination) { + if (rdma->migration_started_on_destination && + migration_incoming_get_current()->state =3D=3D MIGRATION_STATUS_AC= TIVE) { yield_until_fd_readable(rdma->comp_channel->fd); } else { /* This is the source side, we're in a separate thread * or destination prior to migration_fd_process_incoming() + * after postcopy, the destination also in a seprate thread. * we can't yield; so we have to poll the fd. * But we need to be able to handle 'cancel' or an error * without hanging forever. --=20 1.8.3.1 From nobody Thu May 2 09:45:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523089998560584.3417135507235; Sat, 7 Apr 2018 01:33:18 -0700 (PDT) Received: from localhost ([::1]:41121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jHh-0001Hc-QV for importer@patchew.org; Sat, 07 Apr 2018 04:33:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4jBd-00051p-KJ for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:27:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4jBa-00029e-HD for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:27:01 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:37125) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f4jBa-00029J-CQ for qemu-devel@nongnu.org; Sat, 07 Apr 2018 04:26:58 -0400 Received: by mail-pf0-x242.google.com with SMTP id x16so2379399pfm.4 for ; Sat, 07 Apr 2018 01:26:58 -0700 (PDT) Received: from VM_127_91_centos.localdomain ([119.28.195.137]) by smtp.gmail.com with ESMTPSA id y129sm18478558pgb.64.2018.04.07.01.26.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 01:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wZYaZ8b30NFh+3FoBh5WoW8V7qUifH9/scogPqmVxdU=; b=Jo6V1UW4mQLo+VWrk7DBzH15vgSmXw+7POYGekm/pcugiinkeLRpBl/iqUpU9h7zJW k1LvBp+1g7ioPRvJjFDRMh124ZUMV4erSVkuY8LxAJ399Tmao933W7Oolj/FAihiRaDQ wyOne8NEfjSgN6w86lCKmnWgqvnzCruBQ6m11oBRKjuVrz+peNJD1BmWm/LAd9BTB+d/ e4Vk81LdvNYUjo89cYRcZ+2heIiaWyPJAuDzyO/BXoT5Y5bysWtzrSz70wGU7cZjmIrB 2T4VXvFaAQMz27jCsMzlsVJWsWk9GVunwVwY6ayhKHQu2OYq/k+OqCfHoG+/n644vkZM wRmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wZYaZ8b30NFh+3FoBh5WoW8V7qUifH9/scogPqmVxdU=; b=YlChb4mQTrYTEL10FNE7a8IhkVOa8sjNYkWzRDARnUvtcJoRsBHiiu2h4VArOVITt/ i+sX+ag1RhRTQ2wlV6ZVemnVSP0t7jJz1fb2WsoV3J7lHUK0XnhIMTQgUEZ25XKyXDK6 1z/zUHWPuRrIp87yikRKyW2N5vZrrlwBuZYu0jepb6vFzVivaq7ypgRhH6Pz5lSY/mG9 7QQik9NnEiVRuGiQmNt3XLvMgUspZBxS346a70kJAE4lXJ7EMNgXxFAhIM/lelPyejli yE+pPWKDBEm5SLzkl6fEUfENfojBoTv3OthuOx5Kj8cQ8PHpr9bs/sUv7IqixUCGuo5G cuvA== X-Gm-Message-State: AElRT7Gdpjm4SvUcT6wlRhfeJwdpVYGLa4Q0H209bF16VfYl7wMg0aeA KcNDDSPMMC4NXPbNdfmCiZw= X-Google-Smtp-Source: AIpwx4+d0DnkOS7eUx3hMFJHSASMkXuU+k+ngVGJ2/B/u93XDEtY+I98J3n4rAJ6W5wVld6DZucI8w== X-Received: by 10.99.119.74 with SMTP id s71mr19655748pgc.321.1523089617608; Sat, 07 Apr 2018 01:26:57 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: quintela@redhat.com, dgilbert@redhat.com Date: Sat, 7 Apr 2018 16:26:34 +0800 Message-Id: <1523089594-1422-6-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> References: <1523089594-1422-1-git-send-email-lidongchen@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH 5/5] migration: disable RDMA WRITR after postcopy started. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lidong Chen , adido@mellanox.com, qemu-devel@nongnu.org, licq@mellanox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" RDMA write operations are performed with no notification to the destination qemu, then the destination qemu can not wakeup. So disable RDMA WRITE after postcopy started. Signed-off-by: Lidong Chen --- migration/qemu-file.c | 3 ++- migration/rdma.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 8acb574..a64ac3a 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -260,7 +260,8 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t bl= ock_offset, int ret =3D f->hooks->save_page(f, f->opaque, block_offset, offset, size, bytes_sent); f->bytes_xfer +=3D size; - if (ret !=3D RAM_SAVE_CONTROL_DELAYED) { + if (ret !=3D RAM_SAVE_CONTROL_DELAYED && + ret !=3D RAM_SAVE_CONTROL_NOT_SUPP) { if (bytes_sent && *bytes_sent > 0) { qemu_update_position(f, *bytes_sent); } else if (ret < 0) { diff --git a/migration/rdma.c b/migration/rdma.c index 81be482..8529ddd 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2964,6 +2964,10 @@ static size_t qemu_rdma_save_page(QEMUFile *f, void = *opaque, =20 CHECK_ERROR_STATE(); =20 + if (migrate_get_current()->state =3D=3D MIGRATION_STATUS_POSTCOPY_ACTI= VE) { + return RAM_SAVE_CONTROL_NOT_SUPP; + } + qemu_fflush(f); =20 if (size > 0) { @@ -3528,6 +3532,10 @@ static int qemu_rdma_registration_start(QEMUFile *f,= void *opaque, =20 CHECK_ERROR_STATE(); =20 + if (migrate_get_current()->state =3D=3D MIGRATION_STATUS_POSTCOPY_ACTI= VE) { + return 0; + } + trace_qemu_rdma_registration_start(flags); qemu_put_be64(f, RAM_SAVE_FLAG_HOOK); qemu_fflush(f); @@ -3550,6 +3558,10 @@ static int qemu_rdma_registration_stop(QEMUFile *f, = void *opaque, =20 CHECK_ERROR_STATE(); =20 + if (migrate_get_current()->state =3D=3D MIGRATION_STATUS_POSTCOPY_ACTI= VE) { + return 0; + } + qemu_fflush(f); ret =3D qemu_rdma_drain_cq(f, rdma); =20 --=20 1.8.3.1