From patchwork Wed May 30 09:43:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 10438051 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AF39C602CC for ; Wed, 30 May 2018 09:46:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EB962888B for ; Wed, 30 May 2018 09:46:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93D7E28898; Wed, 30 May 2018 09:46:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 53A8E288F4 for ; Wed, 30 May 2018 09:46:24 +0000 (UTC) Received: from localhost ([::1]:37244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNxgV-0001Sx-BN for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 May 2018 05:46:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNxe8-0000K4-NO for qemu-devel@nongnu.org; Wed, 30 May 2018 05:43:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNxe7-0006ns-N5 for qemu-devel@nongnu.org; Wed, 30 May 2018 05:43:56 -0400 Received: from mail-pg0-x233.google.com ([2607:f8b0:400e:c05::233]:33251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNxe7-0006ne-H0 for qemu-devel@nongnu.org; Wed, 30 May 2018 05:43:55 -0400 Received: by mail-pg0-x233.google.com with SMTP id e21-v6so7906523pgv.0 for ; Wed, 30 May 2018 02:43: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=KS0xlWIpngwTUUYXTv5XW1KchXCdXZy4qTzrl+t6rR4=; b=lUrTYNz791Mafbz0tcG88mkdbJDiACc4xOEDezAdqDwGYdKus1UGjFSXCYRu04bnNw Xqac8X/vpSLe27yB0JHSk8QrZtTZaeMyGYBNgBzuYiEx8U4MWdPVi/YGNSNvAXMBgO3N 0kCxxjIiG3GlsMWa1EqdvfsOi7KUC9IuPgQPm468jyl7DRMCLQfOkyl3BdWu0QPxXQAy 9qhkw4KFjbZE5my+uqvFzb73KvcXvZ3vlhE/4IJqhSbS92ow9LZFl+c+CFawPmrtGogQ KafBG9HtrXCCHMezqq+3xGojPyirMvUdUG/C1ijPrRtmHuMa188AlI4rZInbB8a7fqe5 2jAg== 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=KS0xlWIpngwTUUYXTv5XW1KchXCdXZy4qTzrl+t6rR4=; b=Jd462wzy/GgV70ZeuIUH8UNPfM4C4XBrXwqktBFDkeMt9tSd+I7RR1mmZmqsKiu93k 0XwzFXmBlP3JUV5mt9xiesn97NolFXnI8jAKj+PkfCUtnP1d9hnBOdloB4NrBRpdebJj CBRGthZecK+Yhvg6AXAAKBsrKhAiiKJWCfbWXFMqJ3C6KlJFLmXDqoN4orczCvvnMAbX pRh1r8Vh8zzpKpdriOzlEFVV77eSnkjLntWjGc1gjDk+as5QOO1MUdmp2c6JT5sKdfry EakU1EGTzcXbKbS2yLngvmtQmQ7GfQSQtcb28Im1Z7WGLUd7ZQVJEZPrOMr98eNm1wgw PNQg== X-Gm-Message-State: ALKqPwf16VAohtbZlGIW0CCNtPl8rfXbW3sVQqJaxpP9ABPUUQnhHXjW 4rEOGojUxVPOy99ItDSXHEI= X-Google-Smtp-Source: ADUXVKJfzPvjjInnwzpBpE/kP+nx1BvRpyWvROEzTlV5ixhrc4nBpRuH8oZEQVe77I+o8yiWuXIXUA== X-Received: by 2002:a65:62d9:: with SMTP id m25-v6mr1632098pgv.407.1527673434612; Wed, 30 May 2018 02:43:54 -0700 (PDT) Received: from VM_93_245_centos.localdomain ([150.109.57.149]) by smtp.gmail.com with ESMTPSA id 29-v6sm60565257pfj.14.2018.05.30.02.43.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 02:43:54 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com, berrange@redhat.com, aviadye@mellanox.com, pbonzini@redhat.com Date: Wed, 30 May 2018 17:43:25 +0800 Message-Id: <1527673416-31268-2-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527673416-31268-1-git-send-email-lidongchen@tencent.com> References: <1527673416-31268-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:c05::233 Subject: [Qemu-devel] [PATCH v4 01/12] migration: disable RDMA WRITE 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, Lidong Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Lidong Chen RDMA WRITE operations are performed with no notification to the destination qemu, then the destination qemu can not wakeup. This patch disable RDMA WRITE after postcopy started. Signed-off-by: Lidong Chen Reviewed-by: Dr. David Alan Gilbert --- migration/qemu-file.c | 8 ++++++-- migration/rdma.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 0463f4c..977b9ae 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -253,8 +253,12 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, if (f->hooks && f->hooks->save_page) { int ret = f->hooks->save_page(f, f->opaque, block_offset, offset, size, bytes_sent); - f->bytes_xfer += size; - if (ret != RAM_SAVE_CONTROL_DELAYED) { + if (ret != RAM_SAVE_CONTROL_NOT_SUPP) { + f->bytes_xfer += size; + } + + if (ret != RAM_SAVE_CONTROL_DELAYED && + ret != 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 7d233b0..a0748f4 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2930,6 +2930,10 @@ static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, CHECK_ERROR_STATE(); + if (migrate_get_current()->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) { + return RAM_SAVE_CONTROL_NOT_SUPP; + } + qemu_fflush(f); if (size > 0) { @@ -3489,6 +3493,10 @@ static int qemu_rdma_registration_start(QEMUFile *f, void *opaque, CHECK_ERROR_STATE(); + if (migrate_get_current()->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) { + return 0; + } + trace_qemu_rdma_registration_start(flags); qemu_put_be64(f, RAM_SAVE_FLAG_HOOK); qemu_fflush(f); @@ -3511,6 +3519,10 @@ static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque, CHECK_ERROR_STATE(); + if (migrate_get_current()->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) { + return 0; + } + qemu_fflush(f); ret = qemu_rdma_drain_cq(f, rdma);