From patchwork Mon Sep 3 04:38:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10585401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D98014E0 for ; Mon, 3 Sep 2018 04:40:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39E18296C2 for ; Mon, 3 Sep 2018 04:40:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A55E296C7; Mon, 3 Sep 2018 04:40:48 +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 865D5296C2 for ; Mon, 3 Sep 2018 04:40:47 +0000 (UTC) Received: from localhost ([::1]:43355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwgfO-000839-Nh for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Sep 2018 00:40:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwgeC-0006VP-1w for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:39:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fwge8-00046D-Pw for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:39:32 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:37532) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fwge8-00043h-0C for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:39:28 -0400 Received: by mail-pl1-x641.google.com with SMTP id f1-v6so1286522plt.4 for ; Sun, 02 Sep 2018 21:39:25 -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; bh=qOuSoB/SHZs0sXWy5wdGavB6jT5bMp1kA6XkNHrNaSU=; b=BRVGUxm6DuINXLwboECKaOsWNB3a4uQ68RhvxBf7x1YS9W2ArjLwBoi2XIK60h7MNq JU6IBgf0zTbYN+9vS5S66EkrXP9cliHH61LOmdZqKb+j+OClaykROuhiJjMFcpVZxKdo ad/oognmOys8uhrXWw4sJGpYKKf9lBiOPW9Uza/VX5bPi3pV2hvPdjRO4TXW924ZsuzY FI+MCXfbHGzyCBx4D0t1aCoIxqZjWyhJlwsdaZGWW+6sHFQ8lTUZUMpA2FJvU+Atc7qb Uxi3UCjig+hLfFOCLHsnNlRqT86itE+jMQH5q4/+eHAqEep8eotcF09FlqwE3adgq2FE +fYA== 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; bh=qOuSoB/SHZs0sXWy5wdGavB6jT5bMp1kA6XkNHrNaSU=; b=lLB5yMHh5ov95y9QG8G7f2OkzLF/g1wRWmk1YS00ixDMxhehtJ4GwP5F6zVsz+0ff7 LApTTf5ExVXFPmne8qMaQ4IdDomcQMzA7GOLQYxo7TFRj2np9s68bk5CeABd0qiBFZvv iofORpHf8NgxMi8I0Cg0/ILoV5lH4O4rkMtPYWm4RboXzCjkF87kY2pGHY2gEIkD8SvS ashy2Dlxh1hc92vM9UkMknJZTywhLMtt8INuB56e1s6SH5XERXjIocJQdHyeAesoR+sg H1ncX+G75qky71mcwuIyrrehq57nFuGeriz3cW8euY1P+1CCo27HDkyjeqVBhqNvBX/1 UI1Q== X-Gm-Message-State: APzg51C3IFHxVJuAJcNDLwr3iEk7Z1uEL5B0stzUXXjOIbhHneXwmJh3 I05LvGI1KF53RipZcbAuD3mo7fbW X-Google-Smtp-Source: ANB0VdY7YOUMp6RGqFXSKhFcuZ14czB9XTAfl/+KH5ykwYCdlvild6MxAbD6iVcMzvWIimyph8Z84g== X-Received: by 2002:a17:902:8345:: with SMTP id z5-v6mr26018417pln.147.1535949564395; Sun, 02 Sep 2018 21:39:24 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id g6-v6sm32738308pfb.11.2018.09.02.21.39.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Sep 2018 21:39:23 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Jason Wang , Eric Blake , Markus Armbruster Date: Mon, 3 Sep 2018 12:38:41 +0800 Message-Id: <20180903043900.28592-1-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 Subject: [Qemu-devel] [PATCH V12 00/19] COLO: integrate colo frame with block replication and COLO proxy 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: zhanghailiang , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi~ All~ COLO Frame, block replication and COLO proxy(colo-compare,filter-mirror, filter-redirector,filter-rewriter) have been exist in qemu for long time, it's time to integrate these three parts to make COLO really works. In this series, we have some optimizations for COLO frame, including separating the process of saving ram and device state, using an COLO_EXIT event to notify users that VM exits COLO, for these parts, most of them have been reviewed long time ago in old version, but since this series have just rebased on upstream which had merged a new series of migration, parts of pathes in this series deserve review again. We use notifier/callback method for COLO compare to notify COLO frame about net packets inconsistent event, and add a handle_event method for NetFilterClass to help COLO frame to notify filters and colo-compare about checkpoint/failover event, it is flexible. For the neweset version, please refer to: https://github.com/zhangckid/qemu/tree/qemu-colo-18sep1 Please review, thanks. V12: - Rebased on upstream. - Removed the patch 15/20 for feature work as Jason's comments. - Fixed failover bugs in patch 16/19. - Renamed the dummy_handle_event to default_handle_event in patch 15/19. - Cleaned needless check job. V11: - Rebased on upstream. - Used "RAMBLOCK_FOREACH_MIGRATABLE()" to replace "QLIST_FOREACH_RCU()" in patch 08/20. - Fixed COLO related qapi command's since version in patch 10/20. V10: - Rebased on upstream. - Removed the "active" in COLOState. - Fixed some comments. V9: - Rebased on upstream codes. - Addressed Jason's comments add TCP state machine track in filter-rewriter. - Fix some bug in colo-compare. - Fix typo. - Add filter-rewriter failover handle. - Add net client type check in colo-compare. - Add COLO state diagram. - Addressed Markus and Daive's comments. V8: - Rebased on upstream codes. - Addressed Markus's comments in patch 10/17. - Addressed Markus's comments in patch 11/17. - Removed some comments in patch 4/17. - Moved the "migration_bitmap_clear_dirty()" to suitable position in patch 9/17. - Rewrote the patch 07/17 to address Davie's comments. - Moved the "qemu_savevm_live_state" out of the qemu_mutex_lock_iothread. - Fixed the bug that in some status COLO vm crash with segmentation fault. V7: - Addressed Markus's comments in 11/17. - Rebased on upstream. V6: - Addressed Eric Blake's comments, use the enum to feedback in patch 11/17. - Fixed QAPI command separator problem in patch 11/17. Zhang Chen (15): filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table colo-compare: implement the process of checkpoint colo-compare: use notifier to notify packets comparing result COLO: integrate colo compare with colo frame COLO: Add block replication into colo process COLO: Remove colo_state migration struct COLO: Load dirty pages into SVM's RAM cache firstly ram/COLO: Record the dirty pages that SVM received COLO: Flush memory data from ram cache qapi/migration.json: Rename COLO unknown mode to none mode. qapi: Add new command to query colo status savevm: split the process of different stages for loadvm/savevm filter: Add handle_event method for NetFilterClass filter-rewriter: handle checkpoint and failover event docs: Add COLO status diagram to COLO-FT.txt zhanghailiang (4): qmp event: Add COLO_EXIT event to notify users while exited COLO COLO: flush host dirty ram from cache COLO: notify net filters about checkpoint/failover event COLO: quick failover process by kick COLO thread docs/COLO-FT.txt | 34 ++++++ include/exec/ram_addr.h | 1 + include/migration/colo.h | 11 +- include/net/filter.h | 5 + migration/Makefile.objs | 2 +- migration/colo-comm.c | 76 -------------- migration/colo-failover.c | 2 +- migration/colo.c | 212 ++++++++++++++++++++++++++++++++++++-- migration/migration.c | 46 ++++++++- migration/ram.c | 166 ++++++++++++++++++++++++++++- migration/ram.h | 4 + migration/savevm.c | 53 ++++++++-- migration/savevm.h | 5 + migration/trace-events | 3 + net/colo-compare.c | 115 +++++++++++++++++++-- net/colo-compare.h | 24 +++++ net/colo.c | 10 +- net/colo.h | 11 +- net/filter-rewriter.c | 162 +++++++++++++++++++++++++++-- net/filter.c | 17 +++ net/net.c | 19 ++++ qapi/migration.json | 80 +++++++++++++- vl.c | 2 - 23 files changed, 921 insertions(+), 139 deletions(-) delete mode 100644 migration/colo-comm.c create mode 100644 net/colo-compare.h