From patchwork Sat Aug 11 20:59:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 956641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BCuSWrZH"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41nvql3S4tz9s82 for ; Sun, 12 Aug 2018 07:13:55 +1000 (AEST) Received: from localhost ([::1]:33240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fobCr-000879-2K for incoming@patchwork.ozlabs.org; Sat, 11 Aug 2018 17:13:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fob0V-0005Rw-NW for qemu-devel@nongnu.org; Sat, 11 Aug 2018 17:01:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fob0S-0001ap-Ma for qemu-devel@nongnu.org; Sat, 11 Aug 2018 17:01:07 -0400 Received: from mail-pl0-x234.google.com ([2607:f8b0:400e:c01::234]:40187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fob0S-0001aY-GL for qemu-devel@nongnu.org; Sat, 11 Aug 2018 17:01:04 -0400 Received: by mail-pl0-x234.google.com with SMTP id s17-v6so5377864plp.7 for ; Sat, 11 Aug 2018 14:01:04 -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=ktX0J9bUdPM6g6Qi3dOomt5iQ9JyknqMDbDqhS9ZkG4=; b=BCuSWrZH4GrtKKthHzzINm3gx3/PCHHKl3g8ekq3v6guqyOuX6zJl7tLrXBJ+gJUeC BKl+4jC4Sou226Yi/buQxSE4+FECdbThElk8KNJnTkc/wr3uUIzQfkrFwJndRO0i31iI v2duZQQN/8vj8yWVUY8vE4qQCeF8l3esXTTRnOw1rFsWjr2FS06ELMT6DbGnvn0H8hu7 ZJVyJaxcsVofEjxMjdnA+pJByCT9gf/CTK9P2223ICLpiMM/BqGiokeaJ5lI/dcPbLRM nezwynqb4e1MSvJHsN8UOXwWmZNVcsQ48VtRSnVV1OcYwjbhuP2Cgf/3Ucs8tsInihoT ndgA== 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=ktX0J9bUdPM6g6Qi3dOomt5iQ9JyknqMDbDqhS9ZkG4=; b=fpbCuDk2tC9n3r1MXVRDtIj5ETYbZ2OqukEXu6LgoH3beqI5X6hkYnPyURPgFl1TSJ wY0uNIR5rriHmFMXA9D4509nk4oukxWlq8uwDtdGKkj+1Qf3AOvwTEcGWUNKk9lUXoM3 usHcxDz3xjxAAohXAa3sYcqmjVqzSOwqycyoufzQ9a2x4l8pHxCdDLWkkWo0AhqBWbDi JP2EDzoiNBcFsagA+lhBAdyQReOacPMWhqGK1KjRO+Ude7Fv1sY7h77ZY1shzL/dRRQM 5VbBBlLpKjbc6okFT84d0mC36EDG37B1BYVwYZC/3jdzTfQKMbPro89U8Xm3AKXmVUxV vPjw== X-Gm-Message-State: AOUpUlEgIrDlKiaFJGL6THyVZOSi/3eRmnq2VyIFLb1NCvdMBTs56rLm kOg+sdQkpFuQkIz5cek6qRDTpZS3 X-Google-Smtp-Source: AA+uWPyVFQhrdqaxEPSAf0No1UjsbPVFhyh6ib0ctqZPkBJmuEAX0SV1q0C/vieDfBcyPAKwHtjuXw== X-Received: by 2002:a17:902:b60b:: with SMTP id b11-v6mr10953400pls.301.1534021263210; Sat, 11 Aug 2018 14:01:03 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id h24-v6sm23502641pfk.113.2018.08.11.14.00.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Aug 2018 14:01:02 -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, 12 Aug 2018 04:59:20 +0800 Message-Id: <20180811205924.4113-17-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180811205924.4113-1-zhangckid@gmail.com> References: <20180811205924.4113-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::234 Subject: [Qemu-devel] [PATCH V11 16/20] 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 , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 a77ea88fff..b4f6a2efb2 100644 --- a/net/net.c +++ b/net/net.c @@ -1331,6 +1331,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];