From patchwork Mon May 14 03:23:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10396797 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 AFBA16038F for ; Mon, 14 May 2018 06:33:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CAF328A04 for ; Mon, 14 May 2018 06:33:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90C0E28A1D; Mon, 14 May 2018 06:33:26 +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 EF1BF28A04 for ; Mon, 14 May 2018 06:33:25 +0000 (UTC) Received: from localhost ([::1]:42593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fI72z-0006Qt-7R for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 May 2018 02:33:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fI6Y3-0006aO-6W for qemu-devel@nongnu.org; Mon, 14 May 2018 02:01:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fI472-0000sj-4I for qemu-devel@nongnu.org; Sun, 13 May 2018 23:25:25 -0400 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:40443) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fI471-0000rz-UX for qemu-devel@nongnu.org; Sun, 13 May 2018 23:25:24 -0400 Received: by mail-pl0-x243.google.com with SMTP id t12-v6so6514205plo.7 for ; Sun, 13 May 2018 20:25:23 -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=/weR4mu/aSbI0SOgvZGIaau+uyj4HGEo84Dt7VF0Cx8=; b=tRmAD62yUA2rgtx/oPQlWbPPJS5CBXfhF9bd5RqEcnNRIe2yLvy1qpj9RZL2SSV2Nj 6ul6q1e+KKwcKheIkO1GD+yH0VOpdWD3W6eO2StHLmTDs73KUhS7Mn3BL0W5T7HoLc67 1koyu1DnIz60CePobxMQbRGIA5qxXYyUNSSC3Jvst66nLs/pgLjt4+p6rYpKDlF0hxHF UqCB8tRrDip96c3xqnYmxK+GKRchqCJTUX4qB4f4dSeT15qAOAc2exauaVuBFCiZ/exY fJoHfu76CfgGwlQOu98FY9456J35mLgBDGD4nTloVkwbmn3IxcWnP6kVMKot1OgBk1WL AidA== 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=/weR4mu/aSbI0SOgvZGIaau+uyj4HGEo84Dt7VF0Cx8=; b=bt5XPBDsEgJuO+YFfGBc9M83d6CH1FJtII7qRsjKYX5JFMJQVm/1TBKczniqstywyB hBQivUgcnfE+TWOTVegGsSXwml1vtJRLsoDtrMLwMPK8WBKmxgAgUmXc0Pki64pZbdgu kNEhGjTo2FVPWWsZH12tWHHvyTYQOHIypBFvDYADykl+egaEA22Yd8LpdyFHbukvn9r3 eXqUF0AVC4eg8FTj5s4TpMWlcJq6U9ni+1TvXy6fu3q9XtRrKRIMj/Al3gxLNnkKdmOm +DfcXvXkZyG0FbJm9niqe0FzPkyh5sky69BRUUDlF3vzMyQIF8+ledFCsZuIPevBswte UODw== X-Gm-Message-State: ALKqPwdAelCBWOM1QPUlPjjNayZ89Q+D6fruFij4nhRjzBx6jOGmgVtY sk22R0ojU2XViqXpuVRmIrah+Q== X-Google-Smtp-Source: AB8JxZqm9qaLKVO2pJLP3bbruwb8xya3JY8rySoHRPRnVBms4zWwFiP2a+1PWqXLW+DBwPVFOdFAjg== X-Received: by 2002:a17:902:ab93:: with SMTP id f19-v6mr8140376plr.392.1526268322785; Sun, 13 May 2018 20:25:22 -0700 (PDT) Received: from localhost.localdomain (109.227.199.104.bc.googleusercontent.com. [104.199.227.109]) by smtp.gmail.com with ESMTPSA id p6-v6sm17183532pfg.157.2018.05.13.20.25.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 13 May 2018 20:25:21 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 11:23:46 +0800 Message-Id: <1526268228-27951-16-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526268228-27951-1-git-send-email-zhangckid@gmail.com> References: <1526268228-27951-1-git-send-email-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::243 Subject: [Qemu-devel] [PATCH V7 15/17] filter-rewriter: handle checkpoint and failover event 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 , Jason Wang , Markus Armbruster , "Dr . David Alan Gilbert" , Zhang Chen , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP After one round of checkpoint, the states between PVM and SVM become consistent, so it is unnecessary to adjust the sequence of net packets for old connections, besides, while failover happens, filter-rewriter needs to check if it still needs to adjust sequence of net packets. Signed-off-by: zhanghailiang Signed-off-by: Zhang Chen --- migration/colo.c | 13 +++++++++++++ net/filter-rewriter.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 7869d55..5e517dc 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -31,6 +31,7 @@ #include "qapi/qapi-events-migration.h" #include "qapi/qmp/qerror.h" #include "sysemu/cpus.h" +#include "net/filter.h" static bool vmstate_loading; static Notifier packets_compare_notifier; @@ -82,6 +83,11 @@ static void secondary_vm_do_failover(void) if (local_err) { error_report_err(local_err); } + /* Notify all filters of all NIC to do checkpoint */ + colo_notify_filters_event(COLO_EVENT_FAILOVER, &local_err); + if (local_err) { + error_report_err(local_err); + } if (!autostart) { error_report("\"-S\" qemu option will be ignored in secondary side"); @@ -786,6 +792,13 @@ void *colo_process_incoming_thread(void *opaque) goto out; } + /* Notify all filters of all NIC to do checkpoint */ + colo_notify_filters_event(COLO_EVENT_CHECKPOINT, &local_err); + if (local_err) { + qemu_mutex_unlock_iothread(); + goto out; + } + vmstate_loading = false; vm_start(); trace_colo_vm_state_change("stop", "run"); diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 0909a9a..f3c306c 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -20,6 +20,8 @@ #include "qemu/main-loop.h" #include "qemu/iov.h" #include "net/checksum.h" +#include "net/colo.h" +#include "migration/colo.h" #define FILTER_COLO_REWRITER(obj) \ OBJECT_CHECK(RewriterState, (obj), TYPE_FILTER_REWRITER) @@ -277,6 +279,43 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf, return 0; } +static void reset_seq_offset(gpointer key, gpointer value, gpointer user_data) +{ + Connection *conn = (Connection *)value; + + conn->offset = 0; +} + +static gboolean offset_is_nonzero(gpointer key, + gpointer value, + gpointer user_data) +{ + Connection *conn = (Connection *)value; + + return conn->offset ? true : false; +} + +static void colo_rewriter_handle_event(NetFilterState *nf, int event, + Error **errp) +{ + RewriterState *rs = FILTER_COLO_REWRITER(nf); + + switch (event) { + case COLO_EVENT_CHECKPOINT: + g_hash_table_foreach(rs->connection_track_table, + reset_seq_offset, NULL); + break; + case COLO_EVENT_FAILOVER: + if (!g_hash_table_find(rs->connection_track_table, + offset_is_nonzero, NULL)) { + object_property_set_str(OBJECT(nf), "off", "status", errp); + } + break; + default: + break; + } +} + static void colo_rewriter_cleanup(NetFilterState *nf) { RewriterState *s = FILTER_COLO_REWRITER(nf); @@ -332,6 +371,7 @@ static void colo_rewriter_class_init(ObjectClass *oc, void *data) nfc->setup = colo_rewriter_setup; nfc->cleanup = colo_rewriter_cleanup; nfc->receive_iov = colo_rewriter_receive_iov; + nfc->handle_event = colo_rewriter_handle_event; } static const TypeInfo colo_rewriter_info = {