From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Zhang Chen <zhangckid@gmail.com>,
zhanghailiang <zhang.zhanghailiang@huawei.com>,
Zhang Chen <chen.zhang@intel.com>,
Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 15/26] filter: Add handle_event method for NetFilterClass
Date: Mon, 15 Oct 2018 16:46:15 +0800 [thread overview]
Message-ID: <1539593186-32183-16-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1539593186-32183-1-git-send-email-jasowang@redhat.com>
From: Zhang Chen <zhangckid@gmail.com>
Filter needs to process the event of checkpoint/failover or
other event passed by COLO frame.
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
include/net/filter.h | 5 +++++
net/filter.c | 17 +++++++++++++++++
net/net.c | 19 +++++++++++++++++++
3 files changed, 41 insertions(+)
diff --git a/include/net/filter.h b/include/net/filter.h
index 435acd6..49da666 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 2fd7d7d..c9f9e5f 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 default_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 = default_handle_event;
}
static const TypeInfo netfilter_info = {
diff --git a/net/net.c b/net/net.c
index cdcd5cf..c66847e 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1335,6 +1335,25 @@ void hmp_info_network(Monitor *mon, const QDict *qdict)
}
}
+void colo_notify_filters_event(int event, Error **errp)
+{
+ NetClientState *nc;
+ NetFilterState *nf;
+ NetFilterClass *nfc = NULL;
+ Error *local_err = NULL;
+
+ QTAILQ_FOREACH(nc, &net_clients, next) {
+ QTAILQ_FOREACH(nf, &nc->filters, next) {
+ nfc = NETFILTER_GET_CLASS(OBJECT(nf));
+ 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];
--
2.5.0
next prev parent reply other threads:[~2018-10-15 8:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 8:46 [Qemu-devel] [PULL 00/26] Net patches Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 02/26] colo-compare: implement the process of checkpoint Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 03/26] colo-compare: use notifier to notify packets comparing result Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 04/26] COLO: integrate colo compare with colo frame Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 05/26] COLO: Add block replication into colo process Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 06/26] COLO: Remove colo_state migration struct Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 07/26] COLO: Load dirty pages into SVM's RAM cache firstly Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 08/26] ram/COLO: Record the dirty pages that SVM received Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 09/26] COLO: Flush memory data from ram cache Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 10/26] qmp event: Add COLO_EXIT event to notify users while exited COLO Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 11/26] qapi/migration.json: Rename COLO unknown mode to none mode Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 12/26] qapi: Add new command to query colo status Jason Wang
2018-10-15 18:31 ` Eric Blake
2018-10-15 8:46 ` [Qemu-devel] [PULL 13/26] savevm: split the process of different stages for loadvm/savevm Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 14/26] COLO: flush host dirty ram from cache Jason Wang
2018-10-15 8:46 ` Jason Wang [this message]
2018-10-15 8:46 ` [Qemu-devel] [PULL 16/26] filter-rewriter: handle checkpoint and failover event Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 17/26] COLO: notify net filters about checkpoint/failover event Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 18/26] COLO: quick failover process by kick COLO thread Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 19/26] docs: Add COLO status diagram to COLO-FT.txt Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 20/26] clean up callback when del virtqueue Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 21/26] ne2000: fix possible out of bound access in ne2000_receive Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 22/26] rtl8139: fix possible out of bound access Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 23/26] pcnet: fix possible buffer overflow Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 24/26] net: ignore packet size greater than INT_MAX Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 25/26] e1000: indicate dropped packets in HW counters Jason Wang
2018-10-15 8:46 ` [Qemu-devel] [PULL 26/26] qemu-options: Fix bad "macaddr" property in the documentation Jason Wang
2018-10-15 13:20 ` [Qemu-devel] [PULL 00/26] Net patches Peter Maydell
2018-10-16 10:10 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1539593186-32183-16-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=chen.zhang@intel.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=zhang.zhanghailiang@huawei.com \
--cc=zhangckid@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).