From patchwork Sun Jul 22 19:33:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10539365 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 987F61823 for ; Sun, 22 Jul 2018 19:35:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87C182841D for ; Sun, 22 Jul 2018 19:35:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A0472842A; Sun, 22 Jul 2018 19:35:49 +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 DF4532841D for ; Sun, 22 Jul 2018 19:35:47 +0000 (UTC) Received: from localhost ([::1]:57210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhK8w-0003Nt-Ib for patchwork-qemu-devel@patchwork.kernel.org; Sun, 22 Jul 2018 15:35:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhK7S-0001sh-MA for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:34:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhK7P-0000PP-Gq for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:34:14 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:41125) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhK7P-0000PB-8J for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:34:11 -0400 Received: by mail-pg1-x543.google.com with SMTP id z8-v6so10654810pgu.8 for ; Sun, 22 Jul 2018 12:34:10 -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=/vt1LovWGh5ALK+NGrU0yHPEFs1YvhzRI21Eze5t5WA=; b=igurN9IpueX7sTWkJK6AZzEhNhf7o2FXa/GUqFbucqlV6lE3nvHbrMYIJg0EYELS8H gdNv3cOZES9P8D5lzRRD5xCknym4WbHV47iqVHanKNMY68hFdLsntICbX+Dpqlkr5RlL pxtcaaGuqTobf2zkIscXDoIOBAAEpgpvBVwsBTUoVcDCd4yioDhJy7U6hIoThVEpQWJF Gq1Ws5V1CEJ6imsMEOD3Kl9hLNZ47GNAfddc80UaimMsqKwVL9257vZp84ztk8Fc6cTk KDPfvRDSVufS/KZNZx1qTIMeqNLf/n72dI/wgTC5yJnztJPnNOacJLZ9A7ZJ8g13+V0P uklQ== 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=/vt1LovWGh5ALK+NGrU0yHPEFs1YvhzRI21Eze5t5WA=; b=sbdudW+yiJNBbQYX53J6NUNATkMRe38NSBjXyoyWnfYht38giT44zSYU5qEgIck2Kn /WT6vkFlict0jCdQc30nLk18UDbYw+AirJ/NQsXbcuI0yfKbMj/wPHiuovvSdDqO9jl9 2iMzM7bc72qvR/4/8MPzuS+A2N3zi4CdRL0awPsVc/kkF46zEawaPGI2AzYrjsfbeNRt UQc2hmnDEMP9Oz6l/R4n02oxX0LoPZhqK7cqBIghPzL+REoFpZhYTzrqCVfzJQDKbJy6 13LStDJSixUlA8g6fUOb7QVWhq15JJyGDaUK3a1Ol5RmUONn8SXxPZTOLp49alT8H1Pu tH5Q== X-Gm-Message-State: AOUpUlGGs1dtSG0RdwyauU/VYPd0f4wiKNVhhDC5Cvfmskutfakt1t2w UMGkkLOyCJ9JGQAIrMIvD6JvP+Hy X-Google-Smtp-Source: AAOMgpeTV9PznOVyzB9OSL/qBOt7Ld2NJZiMn/cq9t0stI6MoYSCr9vamJJXC91sWwbe9r4qAWZTWA== X-Received: by 2002:a62:e00a:: with SMTP id f10-v6mr10425018pfh.208.1532288049702; Sun, 22 Jul 2018 12:34:09 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id 87-v6sm14215353pfn.103.2018.07.22.12.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jul 2018 12:34:08 -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, 23 Jul 2018 03:33:30 +0800 Message-Id: <20180722193350.6028-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::543 Subject: [Qemu-devel] [PATCH V10 00/20] 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 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-18jul22 Please review, thanks. V10: - Rebase on upstream. - Remove the "active" in COLOState. - Fix 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 (16): 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 net/net.c: Add net client type check function for COLO 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 + include/net/net.h | 1 + migration/Makefile.objs | 2 +- migration/colo-comm.c | 76 -------------- migration/colo-failover.c | 2 +- migration/colo.c | 212 ++++++++++++++++++++++++++++++++++++-- migration/migration.c | 44 +++++++- migration/ram.c | 163 ++++++++++++++++++++++++++++- migration/ram.h | 4 + migration/savevm.c | 53 ++++++++-- migration/savevm.h | 5 + migration/trace-events | 3 + net/colo-compare.c | 120 +++++++++++++++++++-- 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 | 42 ++++++++ qapi/migration.json | 80 +++++++++++++- vl.c | 2 - 24 files changed, 945 insertions(+), 139 deletions(-) delete mode 100644 migration/colo-comm.c create mode 100644 net/colo-compare.h