From patchwork Fri Jan 19 13:44:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10175355 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 E574160386 for ; Fri, 19 Jan 2018 13:59:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D679F285EA for ; Fri, 19 Jan 2018 13:59:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB49B2869F; Fri, 19 Jan 2018 13:59:30 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 443E0285EA for ; Fri, 19 Jan 2018 13:59:30 +0000 (UTC) Received: from localhost ([::1]:50673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecXCb-0006OC-Il for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Jan 2018 08:59:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecX0V-0004Ab-Gu for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:47:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecX0Q-0003bI-KI for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:46:59 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:42798) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecX0Q-0003aE-EV for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:46:54 -0500 Received: by mail-pg0-x242.google.com with SMTP id q67so1459034pga.9 for ; Fri, 19 Jan 2018 05:46:54 -0800 (PST) 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=MmtdVD5J5uBdRDEP+kxjmLnMZS7z1Fh9r9xNvavOdso=; b=fEPCD5gaAETZ+MYlYv3MTPoA+U3xgYJEkT3dYEvPkFkJK8+q/6oDLDPPJhVvmXQC7L wTs3IP4jtdnnkvI42R/gVXoLQMkx17gtNNP1hLpfpkiyqpwCe1nidp6MfvBOR1QurSL6 wbdF23LdF3rL0Y9FQxSTPMeog6lFgIL1zTmEfc0nu5hoZBWc272OIRnQGfNkVyqToshr /AOA56hLK0A02tKV1psKqHn8z4wD9YXVqQVir0WJnQhL/tVkbseB6yz7cTa+xrgjkpjA Oe844t0hFn6OnMrokHbOwr7aPgqKYqE85+0SuqWZGJer7w+ZkPkt7e0PxJmzUfsK74Tr YHQw== 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=MmtdVD5J5uBdRDEP+kxjmLnMZS7z1Fh9r9xNvavOdso=; b=H6QUJW5Xtubp6YcLhed49IAFnnXP55LOsD6GqdaDF9gYjduByHjpBmHaWOeQrHKx/O TOHrAYOwSi4d7ojtmE3ejcUYXG1hLO+ivO/i7mc2WAPYaDup2gK1XOS4VLqInmtrRowB MOwKLeFcjVtj+8di+Lqq9n4+No3xVEvSgSjUqXHsHws5UdAvKAlO4coa2Eo8xImefejW 4m7yh6PA5D8r6L70tZJC1o9QtYZ3oaYdGP9QViIHxkmXVgvhO+e2IJJD//gLGJwreKvN M06hkkEhgHig9V9WCV41Y8yNaLhD4NR8BZN5QuAprdyCITQ/XSt1Uo5qkYcQkUJLaPjI 1AWA== X-Gm-Message-State: AKwxytdHWhE9nQG4xGXyyDprMwoMTP6p+27eUCO+N140cwPcy/H7c4pc UY3IGfJ7sOrnTaGIjNI1GzW8DQln X-Google-Smtp-Source: ACJfBotojPvMB//ExumiHVwNfawg9gza6xxTbj6JpduLJKmqLetpgH6pdpxrLZcIbmm2k8Folllxfg== X-Received: by 2002:a17:902:b687:: with SMTP id c7-v6mr1662829pls.138.1516369613055; Fri, 19 Jan 2018 05:46:53 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id r88sm14251865pfb.17.2018.01.19.05.46.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Jan 2018 05:46:52 -0800 (PST) From: Zhang Chen To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 21:44:42 +0800 Message-Id: <1516369485-5374-14-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516369485-5374-1-git-send-email-zhangckid@gmail.com> References: <1516369485-5374-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:c05::242 Subject: [Qemu-devel] [PATCH V4 13/16] 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 , Juan Quintela , Jason Wang , "Dr . David Alan Gilbert" , Markus Armbruster , 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 0c4a2ea..df4510d 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -37,6 +37,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; @@ -44,6 +46,7 @@ typedef struct NetFilterClass { FilterSetup *setup; FilterCleanup *cleanup; FilterStatusChanged *status_changed; + FilterHandleEvent *handle_event; /* mandatory */ FilterReceiveIOV *receive_iov; } NetFilterClass; @@ -76,4 +79,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 2fd7d7d..0f17eba 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 2b81c93..56a54e7 100644 --- a/net/net.c +++ b/net/net.c @@ -1399,6 +1399,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];