[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 9/9] net/filter-rewriter.c: Make filter-rewriter
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V5 9/9] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len |
Date: |
Tue, 23 May 2017 22:20:41 +0800 |
We add the vnet_hdr option for filter-rewriter, default is disable.
If you use virtio-net-pci net driver, please enable it.
You can use it for example:
-object filter-rewriter,id=rew0,netdev=hn0,queue=all,vnet_hdr=on
We get the vnet_hdr_len from NetClientState that make us
parse net packet correctly.
Signed-off-by: Zhang Chen <address@hidden>
---
net/filter-rewriter.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-
qemu-options.hx | 4 ++--
2 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index 63256c7..be129c7 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -17,6 +17,7 @@
#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
#include "qapi-visit.h"
#include "qom/object.h"
#include "qemu/main-loop.h"
@@ -33,6 +34,7 @@ typedef struct RewriterState {
NetQueue *incoming_queue;
/* hashtable to save connection */
GHashTable *connection_track_table;
+ bool vnet_hdr;
} RewriterState;
static void filter_rewriter_flush(NetFilterState *nf)
@@ -155,10 +157,24 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState
*nf,
ConnectionKey key;
Packet *pkt;
ssize_t size = iov_size(iov, iovcnt);
+ ssize_t vnet_hdr_len = 0;
char *buf = g_malloc0(size);
iov_to_buf(iov, iovcnt, 0, buf, size);
- pkt = packet_new(buf, size, 0);
+
+ if (s->vnet_hdr) {
+ if (nf->netdev->using_vnet_hdr) {
+ vnet_hdr_len = nf->netdev->vnet_hdr_len;
+ } else if (nf->netdev->peer->using_vnet_hdr) {
+ vnet_hdr_len = nf->netdev->peer->vnet_hdr_len;
+ } else {
+ error_report("filter-rewriter get vnet_hdr_len failed");
+ /* When error occurred we drop the packet */
+ return 1;
+ }
+ }
+
+ pkt = packet_new(buf, size, vnet_hdr_len);
g_free(buf);
/*
@@ -237,6 +253,42 @@ static void colo_rewriter_setup(NetFilterState *nf, Error
**errp)
s->incoming_queue = qemu_new_net_queue(qemu_netfilter_pass_to_next, nf);
}
+static char *filter_rewriter_get_vnet_hdr(Object *obj, Error **errp)
+{
+ RewriterState *s = FILTER_COLO_REWRITER(obj);
+
+ return s->vnet_hdr ? g_strdup("on") : g_strdup("off");
+}
+
+static void filter_rewriter_set_vnet_hdr(Object *obj,
+ const char *value,
+ Error **errp)
+{
+ RewriterState *s = FILTER_COLO_REWRITER(obj);
+
+ if (strcmp(value, "on") && strcmp(value, "off")) {
+ error_setg(errp, "Invalid value for filter-rewriter vnet_hdr, "
+ "should be 'on' or 'off'");
+ return;
+ }
+
+ s->vnet_hdr = !strcmp(value, "on");
+}
+
+static void filter_rewriter_init(Object *obj)
+{
+ RewriterState *s = FILTER_COLO_REWRITER(obj);
+
+ /*
+ * The vnet_hdr is disabled by default, if you want to enable
+ * this option, you must enable all the option on related modules
+ * (like other filter or colo-compare).
+ */
+ s->vnet_hdr = false;
+ object_property_add_str(obj, "vnet_hdr", filter_rewriter_get_vnet_hdr,
+ filter_rewriter_set_vnet_hdr, NULL);
+}
+
static void colo_rewriter_class_init(ObjectClass *oc, void *data)
{
NetFilterClass *nfc = NETFILTER_CLASS(oc);
@@ -250,6 +302,7 @@ static const TypeInfo colo_rewriter_info = {
.name = TYPE_FILTER_REWRITER,
.parent = TYPE_NETFILTER,
.class_init = colo_rewriter_class_init,
+ .instance_init = filter_rewriter_init,
.instance_size = sizeof(RewriterState),
};
diff --git a/qemu-options.hx b/qemu-options.hx
index bb3f400..59cbdd9 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4037,12 +4037,12 @@ Create a filter-redirector we need to differ outdev id
from indev id, id can not
be the same. we can just use indev or outdev, but at least one of indev or
outdev
need to be specified.
address@hidden -object
filter-rewriter,address@hidden,address@hidden,address@hidden,address@hidden|rx|tx}]
address@hidden -object
filter-rewriter,address@hidden,address@hidden,address@hidden,address@hidden|off}[,address@hidden|rx|tx}]
Filter-rewriter is a part of COLO project.It will rewrite tcp packet to
secondary from primary to keep secondary tcp connection,and rewrite
tcp packet to primary from secondary make tcp packet can be handled by
-client.
+client.if vnet_hdr = on, we can parse packet with vnet header.
usage:
colo secondary:
--
2.7.4
- [Qemu-devel] [PATCH V5 3/9] net/filter-mirror.c: Add new option to enable vnet support for filter-redirector, (continued)
- [Qemu-devel] [PATCH V5 3/9] net/filter-mirror.c: Add new option to enable vnet support for filter-redirector, Zhang Chen, 2017/05/23
- [Qemu-devel] [PATCH V5 6/9] net/colo-compare.c: Make colo-compare support vnet_hdr_len, Zhang Chen, 2017/05/23
- [Qemu-devel] [PATCH V5 1/9] net: Add vnet_hdr_len related arguments in NetClientState, Zhang Chen, 2017/05/23
- [Qemu-devel] [PATCH V5 8/9] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare, Zhang Chen, 2017/05/23
- [Qemu-devel] [PATCH V5 5/9] net/colo.c: Make vnet_hdr_len as packet property, Zhang Chen, 2017/05/23
- [Qemu-devel] [PATCH V5 9/9] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len,
Zhang Chen <=
- [Qemu-devel] [PATCH V5 7/9] net/colo.c: Add vnet packet parse feature in colo-proxy, Zhang Chen, 2017/05/23
- [Qemu-devel] [PATCH V5 2/9] net/filter-mirror.c: Make filter mirror support vnet support., Zhang Chen, 2017/05/23
- [Qemu-devel] [PATCH V5 4/9] net/net.c: Add vnet_hdr support in SocketReadState, Zhang Chen, 2017/05/23