From patchwork Mon Aug 6 13:29:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 953869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mbfUw0fG"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41kdsG3Sd3z9rxx for ; Mon, 6 Aug 2018 23:33:54 +1000 (AEST) Received: from localhost ([::1]:34127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmfdw-0006L7-3a for incoming@patchwork.ozlabs.org; Mon, 06 Aug 2018 09:33:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmfa0-0003FO-HS for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:29:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmfZz-0008DD-9V for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:29:48 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:46296) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmfZz-0008Cw-3S for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:29:47 -0400 Received: by mail-pf1-x430.google.com with SMTP id u24-v6so6854132pfn.13 for ; Mon, 06 Aug 2018 06:29:47 -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=Gw1eRPs9Eiy6kcsN8PtO8YyrNNK7Uhup63R4pYFlYZQ=; b=mbfUw0fGMEjeBkDZhlLjE0SwWQTjBUZHIeIY4rRdnL4oTksmAtL6LGRUt+Le5kTayq J6Z/+xXK3mgymzEOsay+z9r5TSYn4C4I8Pbr9+m16/wX7iVlNshSqa/u9g7oneZxUWnR rXRLECpvcHu3blLxkRmzd9QRponJ6BVnUw3Z/qdkOkFndKm04k2Y/dxEe68i1KWPoqZ+ gvXnBVz0d3o4XUIsNbHTsK1jd3s+l/zvcVf4eHw3cU1leznIV5GQk086rNIdwb7An+dm 0Jn4EjbT+pCuh8cubPc5aaOYeLSdMRTTz82SOXoiIDR0yrd7xLscL/lEIqSe167cKDCA 4W5Q== 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=Gw1eRPs9Eiy6kcsN8PtO8YyrNNK7Uhup63R4pYFlYZQ=; b=QkmJqzA3Ll1+t0qrKdN4H6TgiQBfxvY2MJJqTMtpWAeZ4Ip4apI4l1urECqWgPvTQY H7ykiWnpjcQbppUNtKv9scqkxD2W40JbcokC+V9TCLPNO+npc8u0DzehO2wU4RQoNFRH gmps6jCaHfCHmonJqr7e+s+rv5VACMSDeNfYf+8SLWDwe87FChj1t0IBRpOk1cHJ/sKx x2fidb/JIHlYhrn7C77E0m9HXwCe06C3qGwYd6pITZuP3rIU2/1MmbpjQsf0dYQy2RFu 85DTm0V++08+Wm0wWIFZ5mi7RNnFqxmxCp5sQebbHDQPyscLvLqXS+8MKDywG1WVBpN5 duuw== X-Gm-Message-State: AOUpUlGBycPe1t6GkWwrkM4JIK2sUI8ev8cdyWuKpN+ujQ5oUTLjkkfp kZEhsqtXfrM7YfB0vmeDI7s= X-Google-Smtp-Source: AAOMgpdR9ruIpfGwMY2UzJytk2jHfsmZzFzVvzaAqd2xRIOIm83jkXcG/sfQlB8pr98PrywJRf3mDg== X-Received: by 2002:a65:4384:: with SMTP id m4-v6mr14613001pgp.265.1533562186214; Mon, 06 Aug 2018 06:29:46 -0700 (PDT) Received: from VM_120_46_centos.localdomain ([119.28.87.64]) by smtp.gmail.com with ESMTPSA id f11-v6sm11756302pfa.131.2018.08.06.06.29.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 06:29:45 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com Date: Mon, 6 Aug 2018 21:29:27 +0800 Message-Id: <1533562177-16447-2-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533562177-16447-1-git-send-email-lidongchen@tencent.com> References: <1533562177-16447-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:4864:20::430 Subject: [Qemu-devel] [PATCH v6 01/11] 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 , qemu-devel@nongnu.org, Lidong Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Juan Quintela --- 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 8bd7159..76424a5 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);