From patchwork Sun Jun 3 05:05:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10445147 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 7A58960234 for ; Sun, 3 Jun 2018 05:23:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F5AD286AD for ; Sun, 3 Jun 2018 05:23:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50ABC286C1; Sun, 3 Jun 2018 05:23: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 C7A4A286AD for ; Sun, 3 Jun 2018 05:23:23 +0000 (UTC) Received: from localhost ([::1]:33710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLUB-0003Mn-33 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 03 Jun 2018 01:23:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLEb-0000Yq-I7 for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:07:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPLEa-00016I-GN for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:07:17 -0400 Received: from mail-pl0-x235.google.com ([2607:f8b0:400e:c01::235]:46814) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPLEa-00015Y-AX for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:07:16 -0400 Received: by mail-pl0-x235.google.com with SMTP id 30-v6so17638887pld.13 for ; Sat, 02 Jun 2018 22:07:16 -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=JRTYEkNp4mEWB73celv7UEJSi6SIr5keQeQTLS1CCg0=; b=DKo9ZG9bSST0CTP8N5PGKKZAeRjg9fwZyESavdq3gZOrffQlYtRQkAhhmyUuFXPbgW NG/WRDlE67NH4HTaTKmjh9oF8F+HGTVEIJ1FZbvRBWTEASzljbOyumJK1h6fZc23HcSk 21tnjJ/AJu7x+gcvkcFSyBfF8/ZRgYgSskuULRcaV5l7ZL/FHGbiHxngrAEwBSsEwoQi BdrXzFrC9FjYqA6dYxwrkgofo4IGGnEWTzPxaAghjAmlEt9LEVH4mt6flVI59o/csWjz QOiq5sOKZMcTsXLEW/Zd0ch1spdjlXIjNB/hAnvjlRiTYn4YeSQHZed8G4jwp5rbjYC0 y0Rg== 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=JRTYEkNp4mEWB73celv7UEJSi6SIr5keQeQTLS1CCg0=; b=KB7OTw0ofBDX15KVh94nxKu30K4qvVjcj0d9/1yDMGAFvG9MhisxlNWqW9aYrxHP4M KvQidwJgBBVq0U2aE0S5wLmsKmBiqnpIfSa/HMy9Qq3oG3/cIxYWkxxRzMJutb+EdJU7 QudKg7D6MsUohIbed0mp1+ExzUGV0Cg2p/BELQS72RX3Nws5YEC7fKduZtgsT2h7l2Sq suzkLKqNc+ujjtqTIvFlJXyzPgWA9LSwMNnTOVa2v1203DYnvey3vhKSHUKew5xpm79G mS/3G5ZJA+ycHtMV0z3LIzzztl+CCukIbitcuexmQQwdZbBl3s3iVJiasvBI5ixTsqz3 Wwsw== X-Gm-Message-State: ALKqPwetT3ZLzboXuO5PA0PHW+hPhcwSHPRDOQv1ZhdzgVLqjkrLe5Zu hB3NT1xQMjI10s83hF39ktbsmg== X-Google-Smtp-Source: ADUXVKIdJD3qNd6k7t5VHhZQKctp0EpR/zGAIJrpstnEDDQhSw2gO5chORhNUFjaWPjzELfQKBAS1Q== X-Received: by 2002:a17:902:28ab:: with SMTP id f40-v6mr17057408plb.208.1528002435098; Sat, 02 Jun 2018 22:07:15 -0700 (PDT) Received: from localhost.localdomain (197.225.229.35.bc.googleusercontent.com. [35.229.225.197]) by smtp.gmail.com with ESMTPSA id 10-v6sm45841595pgb.40.2018.06.02.22.07.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 22:07:14 -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: Sun, 3 Jun 2018 13:05:44 +0800 Message-Id: <20180603050546.6827-16-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180603050546.6827-1-zhangckid@gmail.com> References: <20180603050546.6827-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::235 Subject: [Qemu-devel] [PATCH V8 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 , 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 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 442471e088..0bff21d9e5 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"); @@ -800,6 +806,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 = {