From patchwork Mon May 14 16:54:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10398949 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 8A2B66038F for ; Mon, 14 May 2018 17:05:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7975127D4A for ; Mon, 14 May 2018 17:05:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E3B627D4D; Mon, 14 May 2018 17:05:15 +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 C79612811E for ; Mon, 14 May 2018 17:05:14 +0000 (UTC) Received: from localhost ([::1]:47314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGuP-0000wG-Ms for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 May 2018 13:05:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGlI-0008PC-7Q for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIGlH-0005zU-D1 for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:48 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:36600) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIGlH-0005z2-69 for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:47 -0400 Received: by mail-pg0-x241.google.com with SMTP id z70-v6so5738390pgz.3 for ; Mon, 14 May 2018 09:55:46 -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=uSLxxx8sgpwe+c/fwWitSvkqKpBqgINTlXyIVHjl6NU=; b=OcPQGn5l/N/Kb47XMUQOEo7FeHi2eh0Ow3h29mlbDIRj/aOHurZsseXy1K1RLeFapc +KyFuQBt8bIml/k9PtdmORToE1j23rEh/EHCK5UIrlOhIjlDFQlOuiiagbv6btPfM9Bc q+z4rnA29ppI2fwaYIY2eLj7ltTvVjf/crN909VUPt8rZNQqvBIz+Y6ZRIxtiz046teQ 4mHvBwaFBdytH+r3i9fewCq/apteqF0sWnqTF4OpL3h/0FP89nEkbEdWzOoMCvcVAPGd cXVHx26UYprp7pyKvFzWu68chj9XTChEtDs5CDuC2pzf1wsVKnMucWR/XBQY9UwYYkZl TRSA== 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=uSLxxx8sgpwe+c/fwWitSvkqKpBqgINTlXyIVHjl6NU=; b=YILIYPBNgfMWqhtnW8XrGLMB3/G9bsANrDDm8o4HQZvA2C8S2I/Bvq6EPDxXU6/s6d LG7kVkp026lK86grzyD6CrXqw2hpvAdZT3rOSW8wF1OpLjBz3O6MVTXxtV/bF0jCcZ5y Y91IEImTsCvzcnM8jkF0kp8bpw4XqdMpK21E556m7iViI9p12vElz58lOObArd1DzfYy gSZMuJf8db9WghHoReRK3pC/YKh/7jIZ0ahWTAQewIwsJP11MZxV9a1rcdJeYSwoRCkA EX+92K16bCpDFlVVWSxPyz6I1jIFVYsMxqIydaGvg9SLD0vJPTXe9tJxV2YUP5rYpFW0 kaxw== X-Gm-Message-State: ALKqPwfTuzCYT1d/hLQo57DqIPA6v70DRcOBqdlhDeDF81mcNQ3HEQCW +T26MM5DtDjXlxLFngJgpdbOvA== X-Google-Smtp-Source: AB8JxZq2fKL7BtMb198gjCAtQ/lZJ/pgZaE5jPZgMTRWnOq3JrJTGMAolN0MKTNSJL211yqOdP5zUg== X-Received: by 2002:a65:61c8:: with SMTP id j8-v6mr9129085pgv.370.1526316945859; Mon, 14 May 2018 09:55:45 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 09:55:45 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org Date: Tue, 15 May 2018 00:54:21 +0800 Message-Id: <20180514165424.12884-15-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:c05::241 Subject: [Qemu-devel] [PATCH V7 RESEND 14/17] filter: Add handle_event method for NetFilterClass 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 Filter needs to process the event of checkpoint/failover or other event passed by COLO frame. Signed-off-by: zhanghailiang --- include/net/filter.h | 5 +++++ net/filter.c | 17 +++++++++++++++++ net/net.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/include/net/filter.h b/include/net/filter.h index 435acd6f82..49da666ac0 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -38,6 +38,8 @@ typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc, typedef void (FilterStatusChanged) (NetFilterState *nf, Error **errp); +typedef void (FilterHandleEvent) (NetFilterState *nf, int event, Error **errp); + typedef struct NetFilterClass { ObjectClass parent_class; @@ -45,6 +47,7 @@ typedef struct NetFilterClass { FilterSetup *setup; FilterCleanup *cleanup; FilterStatusChanged *status_changed; + FilterHandleEvent *handle_event; /* mandatory */ FilterReceiveIOV *receive_iov; } NetFilterClass; @@ -77,4 +80,6 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender, int iovcnt, void *opaque); +void colo_notify_filters_event(int event, Error **errp); + #endif /* QEMU_NET_FILTER_H */ diff --git a/net/filter.c b/net/filter.c index 2fd7d7d663..0f17eba143 100644 --- a/net/filter.c +++ b/net/filter.c @@ -17,6 +17,8 @@ #include "net/vhost_net.h" #include "qom/object_interfaces.h" #include "qemu/iov.h" +#include "net/colo.h" +#include "migration/colo.h" static inline bool qemu_can_skip_netfilter(NetFilterState *nf) { @@ -245,11 +247,26 @@ static void netfilter_finalize(Object *obj) g_free(nf->netdev_id); } +static void dummy_handle_event(NetFilterState *nf, int event, Error **errp) +{ + switch (event) { + case COLO_EVENT_CHECKPOINT: + break; + case COLO_EVENT_FAILOVER: + object_property_set_str(OBJECT(nf), "off", "status", errp); + break; + default: + break; + } +} + static void netfilter_class_init(ObjectClass *oc, void *data) { UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); + NetFilterClass *nfc = NETFILTER_CLASS(oc); ucc->complete = netfilter_complete; + nfc->handle_event = dummy_handle_event; } static const TypeInfo netfilter_info = { diff --git a/net/net.c b/net/net.c index 29f83983e5..d58691bb8e 100644 --- a/net/net.c +++ b/net/net.c @@ -1335,6 +1335,34 @@ void hmp_info_network(Monitor *mon, const QDict *qdict) } } +void colo_notify_filters_event(int event, Error **errp) +{ + NetClientState *nc, *peer; + NetClientDriver type; + NetFilterState *nf; + NetFilterClass *nfc = NULL; + Error *local_err = NULL; + + QTAILQ_FOREACH(nc, &net_clients, next) { + peer = nc->peer; + type = nc->info->type; + if (!peer || type != NET_CLIENT_DRIVER_TAP) { + continue; + } + QTAILQ_FOREACH(nf, &nc->filters, next) { + nfc = NETFILTER_GET_CLASS(OBJECT(nf)); + if (!nfc->handle_event) { + continue; + } + nfc->handle_event(nf, event, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + } + } +} + void qmp_set_link(const char *name, bool up, Error **errp) { NetClientState *ncs[MAX_QUEUE_NUM];