From patchwork Tue Jun 5 15:28:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 10448491 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 0B17A600CA for ; Tue, 5 Jun 2018 15:29:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF2A42975F for ; Tue, 5 Jun 2018 15:29:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E198B2976B; Tue, 5 Jun 2018 15:29:38 +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 4C9DF2975F for ; Tue, 5 Jun 2018 15:29:38 +0000 (UTC) Received: from localhost ([::1]:47506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQDtx-00014W-8T for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jun 2018 11:29:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQDsl-00083u-OI for qemu-devel@nongnu.org; Tue, 05 Jun 2018 11:28:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQDsj-0003mH-DN for qemu-devel@nongnu.org; Tue, 05 Jun 2018 11:28:23 -0400 Received: from mail-pl0-x230.google.com ([2607:f8b0:400e:c01::230]:46320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQDsj-0003lt-67 for qemu-devel@nongnu.org; Tue, 05 Jun 2018 11:28:21 -0400 Received: by mail-pl0-x230.google.com with SMTP id 30-v6so1720750pld.13 for ; Tue, 05 Jun 2018 08:28:21 -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=NlDdsPqvKyL/hLM8p1ZbcsrVMLFk27hIrWz1IvXFCBQ=; b=oI3oVR8EEIHRbbZfk+r42ptLAR0wS8ifcCMTq+Nxq2L4UsY/4IC4ZDj6uuR7/gpZBu Mq9eK2sHgcHHje4NYnG/Q45+5Mq+ddfWTt5G5kxO55/KWgIzu5OqcyDUtmIiusUhZSDu aO97p5FTYrvJOSZlMravpHS2UV7F9KM+qJDNWCSDmKsUpeQ21WWrICnlHe4FvcpJvLcQ 94LMKirgFDYbYzBVYG5JG/hx2c06WkfhShI4lvisnbm1dWCsijrJ4asSxoE1GITLwF5o mjekhb4E6Yty86Gh1WMEX/i2IRJAeyQThY5mja/r0yNHT75khopVj+BGqMtAstYkYorO FBAg== 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=NlDdsPqvKyL/hLM8p1ZbcsrVMLFk27hIrWz1IvXFCBQ=; b=CRrrKYhzoHtwPMPuIgVg23WfOaREvCCD66vfd1BpQftByIYbPU7YVFGrNzXRLwNPnI cbgf7kigkb2eJC51NyOFiwJEqSGhu5D7fBt2lwwYX1k6a8T6o8cFsnkft9x0BtIpEvxz eH2NQyjKjU07REn6iqtxLcQPy/qRBh94Dyryw7Ff2QvJlO0dLgNs/1ujMQDIHC8vzyT1 BxwDfy/cmdyhZD97t9A5mjjMQPds4Q0IOMTooRWQ3Ba2yar43Irxwy4WAtLTVVjU82BQ YILqHOhg6O5nlfjN0YeR8YhKX5DvZnUmuw3OjSV7dk4g/l9IqikbMvfsoaTvebR9HkNH uL4Q== X-Gm-Message-State: ALKqPwcrEmMEX8A0zogiZSdgtzS1kNl5UbU7EcFembPrboLL5cuWMOAh BBsMQ7hbirWLJuiW4K81ces= X-Google-Smtp-Source: ADUXVKIKbXJwYvs1ymOY91BKfyN1U3hAQX0XygxxCjFhAxHiao60cSCDTsB23RSLO0FrjnHi/IiTfQ== X-Received: by 2002:a17:902:3a5:: with SMTP id d34-v6mr27416487pld.103.1528212500426; Tue, 05 Jun 2018 08:28:20 -0700 (PDT) Received: from VM_93_245_centos.localdomain ([150.109.57.149]) by smtp.gmail.com with ESMTPSA id t14-v6sm101952007pfh.109.2018.06.05.08.28.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jun 2018 08:28:19 -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: Tue, 5 Jun 2018 23:28:00 +0800 Message-Id: <1528212489-19137-2-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1528212489-19137-1-git-send-email-lidongchen@tencent.com> References: <1528212489-19137-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::230 Subject: [Qemu-devel] [PATCH v5 01/10] 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: galsha@mellanox.com, 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 05aee3d..185ed98 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2921,6 +2921,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) { @@ -3480,6 +3484,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); @@ -3502,6 +3510,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);