From patchwork Mon May 14 16:54:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10398963 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 A3BE660216 for ; Mon, 14 May 2018 17:08:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 960352811E for ; Mon, 14 May 2018 17:08:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AD552834A; Mon, 14 May 2018 17:08:24 +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 B523F2811E for ; Mon, 14 May 2018 17:08:23 +0000 (UTC) Received: from localhost ([::1]:47328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGxR-0003NL-RF for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 May 2018 13:08:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGlR-00005F-42 for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIGlM-00062s-9p for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:57 -0400 Received: from mail-pl0-x22a.google.com ([2607:f8b0:400e:c01::22a]:46484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIGlM-00062b-3K for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:52 -0400 Received: by mail-pl0-x22a.google.com with SMTP id 30-v6so2871319pld.13 for ; Mon, 14 May 2018 09:55:51 -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=RDzK/IZdtuxv+giKDkRCJEMEUmWV17NczqputA7O5qY=; b=sXKsiAvHDlzXlLeUeoIaqy4D9XjKRqKUNEci7ahMytJTWRBo2gBwUUz5ZoeJX4bBkZ kopekERu4Ti7LFrORo6421ndAyYqkdwNGZJOCwwhiuNnAQbOwbqSf+w51O1nq6t7hKHN wQwcuyBkrfg18ZilnoB8DR9FAvZLQZndQnyxFLViIh97r/dsk0Xgo6F2O6Qxu3rOArSZ hAqr8Vm39ECFzsv0lLYPitdke31rK0siehWgpvwwNlAPaOhXdDuz6rTKcC4wu5rdAToD pwnxB/lovGYauJzwaQq9zqdZT+EiuIHvh2ZDiQ4uj6gB9/7nu1hpcA6UJlXQu1ppdKdf ZLjg== 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=RDzK/IZdtuxv+giKDkRCJEMEUmWV17NczqputA7O5qY=; b=iwTxv14U0pRSE4dJ4FG17pE73dURGVyW/VJ9EyhmJvICnziJF3kSPReNh/N5oKrN+u nLgQsmnh89OLbgzpkslnp7a1T4mfuNxZxEy6pRAN8YAT9/4mtpJg7h/ecYhOvsuF+shB IL5LzKnNM+q95zTPHgm+7/Fn3yal+oyAhurrACN/TvXlonjMMzGiJo40HcR9Q872TP8H jCfCzu+uBYa5iJwMa2oTMYWacXy3bgwPhQdFtHoEpVoNqepikSNhcQBrfrqr4ycitRYd +liSaR0TTYF3bX5sVlfUKy8fP8vzO+avpqiaEMalEjdxx5Lb4AigHD5tgeIhT9fkl00S oKFQ== X-Gm-Message-State: ALKqPweXIoQhLnTbipLTQkpv1bJeXjliRzpUMLvC/10GcIwmC1a2OYRW 0/H+8Yla6qlK+zuz4/Wm0szYJQ== X-Google-Smtp-Source: AB8JxZoAkCr6mr0GdI/hePw8GPuy2gBtCkC1F2Wnubmb6rYsU5oRFCIXWX96Wr3DO+u0fQGxzGQ/vw== X-Received: by 2002:a17:902:683:: with SMTP id 3-v6mr7270174plh.291.1526316950750; Mon, 14 May 2018 09:55:50 -0700 (PDT) Received: from localhost.localdomain (109.227.199.104.bc.googleusercontent.com. [104.199.227.109]) by smtp.gmail.com with ESMTPSA id u69-v6sm631448pgb.42.2018.05.14.09.55.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 09:55:49 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org Date: Tue, 15 May 2018 00:54:22 +0800 Message-Id: <20180514165424.12884-16-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514165424.12884-1-zhangckid@gmail.com> References: <20180514165424.12884-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22a Subject: [Qemu-devel] [PATCH V7 RESEND 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 5b055f79f1..3dfd84d897 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 0909a9a8af..f3c306cc89 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 = {