From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

This patch change the filter_send() parameter from CharBackend to MirrorState,

we can get more information like vnet_hdr(We use it to support packet with vnet_header).

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/filter-mirror.c | 10 +++++-----

1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/filter-mirror.c b/net/filter-mirror.c

index XXXXXXX..XXXXXXX 100644

--- a/net/filter-mirror.c

+++ b/net/filter-mirror.c

@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {

SocketReadState rs;

} MirrorState;

-static int filter_send(CharBackend *chr_out,

+static int filter_send(MirrorState *s,

const struct iovec *iov,

int iovcnt)

{

@@ -XXX,XX +XXX,XX @@ static int filter_send(CharBackend *chr_out,

}

len = htonl(size);

- ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)&len, sizeof(len));

+ ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));

if (ret != sizeof(len)) {

goto err;

}

buf = g_malloc(size);

iov_to_buf(iov, iovcnt, 0, buf, size);

- ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)buf, size);

+ ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);

g_free(buf);

if (ret != size) {

goto err;

@@ -XXX,XX +XXX,XX @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,

MirrorState *s = FILTER_MIRROR(nf);

int ret;

- ret = filter_send(&s->chr_out, iov, iovcnt);

+ ret = filter_send(s, iov, iovcnt);

if (ret) {

error_report("filter mirror send failed(%s)", strerror(-ret));

}

@@ -XXX,XX +XXX,XX @@ static ssize_t filter_redirector_receive_iov(NetFilterState *nf,

int ret;

if (qemu_chr_fe_backend_connected(&s->chr_out)) {

- ret = filter_send(&s->chr_out, iov, iovcnt);

+ ret = filter_send(s, iov, iovcnt);

if (ret) {

error_report("filter redirector send failed(%s)", strerror(-ret));

}

--

2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

We add the vnet_hdr_support option for filter-mirror, default is disabled.

If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.

You can use it for example:

-object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0,vnet_hdr_support

If it has vnet_hdr_support flag, we will change the sending packet format from

struct {int size; const uint8_t buf[];} to {int size; int vnet_hdr_len; const uint8_t buf[];}.

make other module(like colo-compare) know how to parse net packet correctly.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/filter-mirror.c | 42 +++++++++++++++++++++++++++++++++++++++++-

qemu-options.hx | 5 ++---

2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/net/filter-mirror.c b/net/filter-mirror.c

index XXXXXXX..XXXXXXX 100644

--- a/net/filter-mirror.c

+++ b/net/filter-mirror.c

@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {

CharBackend chr_in;

CharBackend chr_out;

SocketReadState rs;

+ bool vnet_hdr;

} MirrorState;

static int filter_send(MirrorState *s,

const struct iovec *iov,

int iovcnt)

{

+ NetFilterState *nf = NETFILTER(s);

int ret = 0;

ssize_t size = 0;

uint32_t len = 0;

@@ -XXX,XX +XXX,XX @@ static int filter_send(MirrorState *s,

goto err;

}

+ if (s->vnet_hdr) {

+ /*

+ * If vnet_hdr = on, we send vnet header len to make other

+ * module(like colo-compare) know how to parse net

+ * packet correctly.

+ */

+ ssize_t vnet_hdr_len;

+

+ vnet_hdr_len = nf->netdev->vnet_hdr_len;

+

+ len = htonl(vnet_hdr_len);

+ ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));

+ if (ret != sizeof(len)) {

+ goto err;

+ }

+ }

+

buf = g_malloc(size);

iov_to_buf(iov, iovcnt, 0, buf, size);

ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);

@@ -XXX,XX +XXX,XX @@ static void filter_redirector_setup(NetFilterState *nf, Error **errp)

}

}

- net_socket_rs_init(&s->rs, redirector_rs_finalize, false);

+ net_socket_rs_init(&s->rs, redirector_rs_finalize, s->vnet_hdr);

if (s->indev) {

chr = qemu_chr_find(s->indev);

@@ -XXX,XX +XXX,XX @@ static void filter_mirror_set_outdev(Object *obj,

}

}

+static bool filter_mirror_get_vnet_hdr(Object *obj, Error **errp)

+{

+ MirrorState *s = FILTER_MIRROR(obj);

+

+ return s->vnet_hdr;

+}

+

+static void filter_mirror_set_vnet_hdr(Object *obj, bool value, Error **errp)

+{

+ MirrorState *s = FILTER_MIRROR(obj);

+

+ s->vnet_hdr = value;

+}

+

static char *filter_redirector_get_outdev(Object *obj, Error **errp)

{

MirrorState *s = FILTER_REDIRECTOR(obj);

@@ -XXX,XX +XXX,XX @@ static void filter_redirector_set_outdev(Object *obj,

static void filter_mirror_init(Object *obj)

{

+ MirrorState *s = FILTER_MIRROR(obj);

+

object_property_add_str(obj, "outdev", filter_mirror_get_outdev,

filter_mirror_set_outdev, NULL);

+

+ s->vnet_hdr = false;

+ object_property_add_bool(obj, "vnet_hdr_support",

+ filter_mirror_get_vnet_hdr,

+ filter_mirror_set_vnet_hdr, NULL);

}

static void filter_redirector_init(Object *obj)

diff --git a/qemu-options.hx b/qemu-options.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -XXX,XX +XXX,XX @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter.

@option{tx}: the filter is attached to the transmit queue of the netdev,

where it will receive packets sent by the netdev.

-@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid}[,queue=@var{all|rx|tx}]

+@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support]

-filter-mirror on netdev @var{netdevid},mirror net packet to chardev

-@var{chardevid}

+filter-mirror on netdev @var{netdevid},mirror net packet to chardev@var{chardevid}, if it has the vnet_hdr_support flag, filter-mirror will mirror packet with vnet_hdr_len.

@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},

outdev=@var{chardevid}[,queue=@var{all|rx|tx}]

--

2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

We add the vnet_hdr_support option for filter-redirector, default is disabled.

If you use virtio-net-pci net driver or other driver needs vnet_hdr, please enable it.

Because colo-compare or other modules needs the vnet_hdr_len to parse

packet, we add this new option send the len to others.

You can use it for example:

-object filter-redirector,id=r0,netdev=hn0,queue=tx,outdev=red0,vnet_hdr_support

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/filter-mirror.c | 23 +++++++++++++++++++++++

qemu-options.hx | 6 +++---

2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/net/filter-mirror.c b/net/filter-mirror.c

index XXXXXXX..XXXXXXX 100644

--- a/net/filter-mirror.c

+++ b/net/filter-mirror.c

@@ -XXX,XX +XXX,XX @@ static void filter_redirector_set_outdev(Object *obj,

s->outdev = g_strdup(value);

}

+static bool filter_redirector_get_vnet_hdr(Object *obj, Error **errp)

+{

+ MirrorState *s = FILTER_REDIRECTOR(obj);

+

+ return s->vnet_hdr;

+}

+

+static void filter_redirector_set_vnet_hdr(Object *obj,

+ bool value,

+ Error **errp)

+{

+ MirrorState *s = FILTER_REDIRECTOR(obj);

+

+ s->vnet_hdr = value;

+}

+

static void filter_mirror_init(Object *obj)

{

MirrorState *s = FILTER_MIRROR(obj);

@@ -XXX,XX +XXX,XX @@ static void filter_mirror_init(Object *obj)

static void filter_redirector_init(Object *obj)

{

+ MirrorState *s = FILTER_REDIRECTOR(obj);

+

object_property_add_str(obj, "indev", filter_redirector_get_indev,

filter_redirector_set_indev, NULL);

object_property_add_str(obj, "outdev", filter_redirector_get_outdev,

filter_redirector_set_outdev, NULL);

+

+ s->vnet_hdr = false;

+ object_property_add_bool(obj, "vnet_hdr_support",

+ filter_redirector_get_vnet_hdr,

+ filter_redirector_set_vnet_hdr, NULL);

}

static void filter_mirror_fini(Object *obj)

diff --git a/qemu-options.hx b/qemu-options.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -XXX,XX +XXX,XX @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter.

filter-mirror on netdev @var{netdevid},mirror net packet to chardev@var{chardevid}, if it has the vnet_hdr_support flag, filter-mirror will mirror packet with vnet_hdr_len.

-@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},

-outdev=@var{chardevid}[,queue=@var{all|rx|tx}]

+@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support]

filter-redirector on netdev @var{netdevid},redirect filter's net packet to chardev

-@var{chardevid},and redirect indev's packet to filter.

+@var{chardevid},and redirect indev's packet to filter.if it has the vnet_hdr_support flag,

+filter-redirector will redirect packet with vnet_hdr_len.

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.

--

2.7.4