[Qemu-devel] [PATCH V4 0/2] net/filter-mirror:add filter-mirror and unit test

[Qemu-devel] [PATCH V4 0/2] net/filter-mirror:add filter-mirror and unit test

[Zhang Chen]

From: ZhangChen <zhangchen.fnst@cn.fujitsu.com>

Filter-mirror is a netfilter plugin.
It gives qemu the ability to mirror
packets to a chardev.


v4:
 - Address Jason's comments.

v3:
 - Add filter-mirror unit test according
   to Jason's comments
 - Address zhanghailiang's comments.
 - Address Jason's comments.

v2:
 - Address zhanghailiang's comments.
 - Address Eric Blake's comments.
 - Address Yang Hongyang's comments.
 - Address Dave's comments.

v1:
 initial patch.


ZhangChen (2):
  net/filter-mirror:Add filter-mirror
  tests/test-filter-mirror:add filter-mirror unit test

 net/Makefile.objs          |   1 +
 net/filter-mirror.c        | 178 +++++++++++++++++++++++++++++++++++++++++++++
 qemu-options.hx            |   4 +
 tests/.gitignore           |   1 +
 tests/Makefile             |   2 +
 tests/test-filter-mirror.c |  89 +++++++++++++++++++++++
 vl.c                       |   3 +-
 7 files changed, 277 insertions(+), 1 deletion(-)
 create mode 100644 net/filter-mirror.c
 create mode 100644 tests/test-filter-mirror.c

-- 
1.9.1

[Qemu-devel] [PATCH V4 1/2] net/filter-mirror:Add filter-mirror

[Zhang Chen]

From: ZhangChen <zhangchen.fnst@cn.fujitsu.com>

Filter-mirror is a netfilter plugin.
It gives qemu the ability to mirror
packets to a chardev.

usage:

-netdev tap,id=hn0
-chardev socket,id=mirror0,host=ip_primary,port=X,server,nowait
-filter-mirror,id=m0,netdev=hn0,queue=tx/rx/all,outdev=mirror0

Signed-off-by: ZhangChen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Reviewed-by: Yang Hongyang <hongyang.yang@easystack.cn>
Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
---
 net/Makefile.objs   |   1 +
 net/filter-mirror.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 qemu-options.hx     |   4 ++
 vl.c                |   3 +-
 4 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 net/filter-mirror.c

diff --git a/net/Makefile.objs b/net/Makefile.objs
index 5fa2f97..b7c22fd 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -15,3 +15,4 @@ common-obj-$(CONFIG_VDE) += vde.o
 common-obj-$(CONFIG_NETMAP) += netmap.o
 common-obj-y += filter.o
 common-obj-y += filter-buffer.o
+common-obj-y += filter-mirror.o
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
new file mode 100644
index 0000000..4a88e81
--- /dev/null
+++ b/net/filter-mirror.c
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2016 HUAWEI TECHNOLOGIES CO., LTD.
+ * Copyright (c) 2016 FUJITSU LIMITED
+ * Copyright (c) 2016 Intel Corporation
+ *
+ * Author: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * later.  See the COPYING file in the top-level directory.
+ */
+
+#include "net/filter.h"
+#include "net/net.h"
+#include "qemu-common.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi-visit.h"
+#include "qom/object.h"
+#include "qemu/main-loop.h"
+#include "qemu/error-report.h"
+#include "trace.h"
+#include "sysemu/char.h"
+#include "qemu/iov.h"
+#include "qemu/sockets.h"
+
+#define FILTER_MIRROR(obj) \
+    OBJECT_CHECK(MirrorState, (obj), TYPE_FILTER_MIRROR)
+
+#define TYPE_FILTER_MIRROR "filter-mirror"
+
+typedef struct MirrorState {
+    NetFilterState parent_obj;
+    char *outdev;
+    CharDriverState *chr_out;
+} MirrorState;
+
+static int filter_mirror_send(NetFilterState *nf,
+                                   const struct iovec *iov,
+                                   int iovcnt)
+{
+    MirrorState *s = FILTER_MIRROR(nf);
+    int ret = 0;
+    ssize_t size = 0;
+    uint32_t len =  0;
+    char *buf;
+
+    size = iov_size(iov, iovcnt);
+    if (!size) {
+        return 0;
+    }
+
+    len = htonl(size);
+    ret = qemu_chr_fe_write_all(s->chr_out, (uint8_t *)&len, sizeof(len));
+    if (ret != sizeof(len)) {
+        goto err;
+    }
+
+    buf = g_malloc0(size);
+    iov_to_buf(iov, iovcnt, 0, buf, size);
+    ret = qemu_chr_fe_write_all(s->chr_out, (uint8_t *)buf, size);
+    g_free(buf);
+    if (ret == size) {
+        return 0;
+    }
+
+err:
+      return ret < 0 ? ret : -EIO;
+}
+
+static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
+                                         NetClientState *sender,
+                                         unsigned flags,
+                                         const struct iovec *iov,
+                                         int iovcnt,
+                                         NetPacketSent *sent_cb)
+{
+    int ret;
+
+    ret = filter_mirror_send(nf, iov, iovcnt);
+    if (ret) {
+        error_report("filter_mirror_send failed(%s)", strerror(-ret));
+    }
+    return 0;
+    /*
+     * FIXME： we don't hope this error interrupt the normal
+     * path of net packet, so we always return zero.
+     */
+}
+
+static void filter_mirror_cleanup(NetFilterState *nf)
+{
+    MirrorState *s = FILTER_MIRROR(nf);
+
+    if (s->chr_out) {
+        qemu_chr_fe_release(s->chr_out);
+    }
+}
+
+static void filter_mirror_setup(NetFilterState *nf, Error **errp)
+{
+    MirrorState *s = FILTER_MIRROR(nf);
+
+    if (!s->outdev) {
+        error_setg(errp, "filter filter mirror needs 'outdev' "
+                "property set");
+        return;
+    }
+
+    s->chr_out = qemu_chr_find(s->outdev);
+    if (s->chr_out == NULL) {
+        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+                  "Device '%s' not found", s->outdev);
+        return;
+    }
+
+    if (qemu_chr_fe_claim(s->chr_out) != 0) {
+        error_setg(errp, QERR_DEVICE_IN_USE, s->outdev);
+        return;
+    }
+}
+
+static void filter_mirror_class_init(ObjectClass *oc, void *data)
+{
+    NetFilterClass *nfc = NETFILTER_CLASS(oc);
+
+    nfc->setup = filter_mirror_setup;
+    nfc->cleanup = filter_mirror_cleanup;
+    nfc->receive_iov = filter_mirror_receive_iov;
+}
+
+static char *filter_mirror_get_outdev(Object *obj, Error **errp)
+{
+    MirrorState *s = FILTER_MIRROR(obj);
+
+    return g_strdup(s->outdev);
+}
+
+static void
+filter_mirror_set_outdev(Object *obj, const char *value, Error **errp)
+{
+    MirrorState *s = FILTER_MIRROR(obj);
+
+    g_free(s->outdev);
+    s->outdev = g_strdup(value);
+    if (!s->outdev) {
+        error_setg(errp, "filter filter mirror needs 'outdev' "
+                "property set");
+        return;
+    }
+}
+
+static void filter_mirror_init(Object *obj)
+{
+    object_property_add_str(obj, "outdev", filter_mirror_get_outdev,
+                            filter_mirror_set_outdev, NULL);
+}
+
+static void filter_mirror_fini(Object *obj)
+{
+    MirrorState *s = FILTER_MIRROR(obj);
+
+    g_free(s->outdev);
+}
+
+static const TypeInfo filter_mirror_info = {
+    .name = TYPE_FILTER_MIRROR,
+    .parent = TYPE_NETFILTER,
+    .class_init = filter_mirror_class_init,
+    .instance_init = filter_mirror_init,
+    .instance_finalize = filter_mirror_fini,
+    .instance_size = sizeof(MirrorState),
+};
+
+static void register_types(void)
+{
+    type_register_static(&filter_mirror_info);
+}
+
+type_init(register_types);
diff --git a/qemu-options.hx b/qemu-options.hx
index 2f0465e..057e0e5 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3759,6 +3759,10 @@ 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}]
+
+filter-mirror on netdev @var{netdevid},mirror net packet to outdev.
+
 @item -object filter-dump,id=@var{id},netdev=@var{dev},file=@var{filename}][,maxlen=@var{len}]
 
 Dump the network traffic on netdev @var{dev} to the file specified by
diff --git a/vl.c b/vl.c
index 175ebcc..d68533a 100644
--- a/vl.c
+++ b/vl.c
@@ -2798,7 +2798,8 @@ static bool object_create_initial(const char *type)
      * they depend on netdevs already existing
      */
     if (g_str_equal(type, "filter-buffer") ||
-        g_str_equal(type, "filter-dump")) {
+        g_str_equal(type, "filter-dump") ||
+        g_str_equal(type, "filter-mirror")) {
         return false;
     }
 
-- 
1.9.1

[Qemu-devel] [PATCH V4 2/2] tests/test-filter-mirror:add filter-mirror unit test

[Zhang Chen]

From: ZhangChen <zhangchen.fnst@cn.fujitsu.com>

In this unit test we will test the mirror function.

start qemu with:
    -netdev socket,id=qtest-bn0,fd=%d
    -device e1000,netdev=qtest-bn0,id=qtest-e0
    -chardev socket,id=mirror0,path=/tmp/filter-mirror-test.sock,server,nowait
    -object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0

We inject packet to netdev socket id = qtest-bn0,
filter-mirror will copy and mirror the packet to mirror0.
we read packet from mirror0 and then compare to what we inject.

Signed-off-by: zhangchen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
 tests/.gitignore           |  1 +
 tests/Makefile             |  2 ++
 tests/test-filter-mirror.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 tests/test-filter-mirror.c

diff --git a/tests/.gitignore b/tests/.gitignore
index 787c95c..10df017 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -63,5 +63,6 @@ test-write-threshold
 test-x86-cpuid
 test-xbzrle
 test-netfilter
+test-filter-mirror
 *-test
 qapi-schema/*.test.*
diff --git a/tests/Makefile b/tests/Makefile
index 650e654..e56c514 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -212,6 +212,7 @@ ifeq ($(CONFIG_VHOST_NET_TEST_i386),)
 check-qtest-x86_64-$(CONFIG_VHOST_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF)
 endif
 check-qtest-i386-y += tests/test-netfilter$(EXESUF)
+check-qtest-i386-y += tests/test-filter-mirror$(EXESUF)
 check-qtest-x86_64-y = $(check-qtest-i386-y)
 gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
 gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
@@ -563,6 +564,7 @@ tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_hel
 tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)
 tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)
 tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y)
+tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
 tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y)
 tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
 
diff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c
new file mode 100644
index 0000000..9c23135
--- /dev/null
+++ b/tests/test-filter-mirror.c
@@ -0,0 +1,89 @@
+/*
+ * QTest testcase for filter-mirror
+ *
+ * Copyright (c) 2016 FUJITSU LIMITED
+ * Author: Zhang chen <zhangchen.fnst@cn.fujitsu.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * later.  See the COPYING file in the top-level directory.
+ */
+
+#include <glib.h>
+#include "libqtest.h"
+#include "qemu/iov.h"
+#include "qemu/sockets.h"
+#include "qemu/error-report.h"
+#include "qemu/main-loop.h"
+
+static void test_mirror(void)
+{
+    int send_sock[2];
+    char *cmdline;
+    uint32_t ret = 0;
+    char send_buf[] = "Hello! filter-mirror~";
+    uint32_t size = sizeof(send_buf);
+    size = htonl(size);
+
+    ret = socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock);
+    g_assert_cmpint(ret, !=, -1);
+
+    cmdline = g_strdup_printf("-netdev socket,id=qtest-bn0,fd=%d "
+                 "-device e1000,netdev=qtest-bn0,id=qtest-e0 "
+                 "-chardev socket,id=mirror0,path=/tmp/filter-mirror-test.sock,server,nowait "
+                 "-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0 "
+                 , send_sock[1]);
+    qtest_start(cmdline);
+    g_free(cmdline);
+
+    if (fork() == 0) {
+        int recv_sock;
+        uint32_t len = 0;
+        char *recv_buf;
+
+        recv_sock = unix_connect("/tmp/filter-mirror-test.sock", NULL);
+        if (recv_sock < 0) {
+            error_report("test_mirror connect filter-mirror-test.sock failed");
+            exit(1);
+        }
+        ret = qemu_recv(recv_sock, &len, sizeof(len), 0);
+        g_assert_cmpint(ret, ==, sizeof(len));
+        len = ntohl(len);
+
+        g_assert_cmpint(len, ==, sizeof(send_buf));
+        recv_buf = g_malloc0(len);
+        ret = qemu_recv(recv_sock, recv_buf, len, 0);
+        g_assert_cmpstr(recv_buf, ==, send_buf);
+
+        g_free(recv_buf);
+        close(recv_sock);
+        exit(0);
+    }
+
+    usleep(5000);
+    struct iovec iov[] = {
+        {
+            .iov_base = &size,
+            .iov_len = sizeof(size),
+        }, {
+            .iov_base = send_buf,
+            .iov_len = sizeof(send_buf),
+        },
+    };
+    ret = iov_send(send_sock[0], iov, 2, 0, sizeof(size) + sizeof(send_buf));
+    g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size));
+    close(send_sock[0]);
+
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+
+    g_test_init(&argc, &argv, NULL);
+
+    qtest_add_func("/netfilter/test-mirror", test_mirror);
+    ret = g_test_run();
+    qtest_end();
+
+    return ret;
+}
-- 
1.9.1

Re: [Qemu-devel] [PATCH V4 0/2] net/filter-mirror:add filter-mirror and unit test

[Jason Wang]

On 02/18/2016 04:10 PM, Zhang Chen wrote:
> From: ZhangChen <zhangchen.fnst@cn.fujitsu.com>
>
> Filter-mirror is a netfilter plugin.
> It gives qemu the ability to mirror
> packets to a chardev.
>
>
> v4:
>  - Address Jason's comments.
>
> v3:
>  - Add filter-mirror unit test according
>    to Jason's comments
>  - Address zhanghailiang's comments.
>  - Address Jason's comments.
>
> v2:
>  - Address zhanghailiang's comments.
>  - Address Eric Blake's comments.
>  - Address Yang Hongyang's comments.
>  - Address Dave's comments.
>
> v1:
>  initial patch.
>
>
> ZhangChen (2):
>   net/filter-mirror:Add filter-mirror
>   tests/test-filter-mirror:add filter-mirror unit test
>
>  net/Makefile.objs          |   1 +
>  net/filter-mirror.c        | 178 +++++++++++++++++++++++++++++++++++++++++++++
>  qemu-options.hx            |   4 +
>  tests/.gitignore           |   1 +
>  tests/Makefile             |   2 +
>  tests/test-filter-mirror.c |  89 +++++++++++++++++++++++
>  vl.c                       |   3 +-
>  7 files changed, 277 insertions(+), 1 deletion(-)
>  create mode 100644 net/filter-mirror.c
>  create mode 100644 tests/test-filter-mirror.c
>

Looks good overall. Just few nits, see individual patches.

Thanks

Re: [Qemu-devel] [PATCH V4 1/2] net/filter-mirror:Add filter-mirror

[Jason Wang]

On 02/18/2016 04:10 PM, Zhang Chen wrote:
> From: ZhangChen <zhangchen.fnst@cn.fujitsu.com>
>
> Filter-mirror is a netfilter plugin.
> It gives qemu the ability to mirror
> packets to a chardev.
>
> usage:
>
> -netdev tap,id=hn0
> -chardev socket,id=mirror0,host=ip_primary,port=X,server,nowait
> -filter-mirror,id=m0,netdev=hn0,queue=tx/rx/all,outdev=mirror0
>
> Signed-off-by: ZhangChen <zhangchen.fnst@cn.fujitsu.com>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> Reviewed-by: Yang Hongyang <hongyang.yang@easystack.cn>
> Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> ---
>  net/Makefile.objs   |   1 +
>  net/filter-mirror.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  qemu-options.hx     |   4 ++
>  vl.c                |   3 +-
>  4 files changed, 185 insertions(+), 1 deletion(-)
>  create mode 100644 net/filter-mirror.c
>
> diff --git a/net/Makefile.objs b/net/Makefile.objs
> index 5fa2f97..b7c22fd 100644
> --- a/net/Makefile.objs
> +++ b/net/Makefile.objs
> @@ -15,3 +15,4 @@ common-obj-$(CONFIG_VDE) += vde.o
>  common-obj-$(CONFIG_NETMAP) += netmap.o
>  common-obj-y += filter.o
>  common-obj-y += filter-buffer.o
> +common-obj-y += filter-mirror.o
> diff --git a/net/filter-mirror.c b/net/filter-mirror.c
> new file mode 100644
> index 0000000..4a88e81
> --- /dev/null
> +++ b/net/filter-mirror.c
> @@ -0,0 +1,178 @@
> +/*
> + * Copyright (c) 2016 HUAWEI TECHNOLOGIES CO., LTD.
> + * Copyright (c) 2016 FUJITSU LIMITED
> + * Copyright (c) 2016 Intel Corporation
> + *
> + * Author: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> + * later.  See the COPYING file in the top-level directory.
> + */
> +
> +#include "net/filter.h"
> +#include "net/net.h"
> +#include "qemu-common.h"
> +#include "qapi/qmp/qerror.h"
> +#include "qapi-visit.h"
> +#include "qom/object.h"
> +#include "qemu/main-loop.h"
> +#include "qemu/error-report.h"
> +#include "trace.h"
> +#include "sysemu/char.h"
> +#include "qemu/iov.h"
> +#include "qemu/sockets.h"
> +
> +#define FILTER_MIRROR(obj) \
> +    OBJECT_CHECK(MirrorState, (obj), TYPE_FILTER_MIRROR)
> +
> +#define TYPE_FILTER_MIRROR "filter-mirror"
> +
> +typedef struct MirrorState {
> +    NetFilterState parent_obj;
> +    char *outdev;
> +    CharDriverState *chr_out;
> +} MirrorState;
> +
> +static int filter_mirror_send(NetFilterState *nf,
> +                                   const struct iovec *iov,
> +                                   int iovcnt)
> +{
> +    MirrorState *s = FILTER_MIRROR(nf);
> +    int ret = 0;
> +    ssize_t size = 0;
> +    uint32_t len =  0;
> +    char *buf;
> +
> +    size = iov_size(iov, iovcnt);
> +    if (!size) {
> +        return 0;
> +    }
> +
> +    len = htonl(size);
> +    ret = qemu_chr_fe_write_all(s->chr_out, (uint8_t *)&len, sizeof(len));
> +    if (ret != sizeof(len)) {
> +        goto err;
> +    }
> +
> +    buf = g_malloc0(size);

g_malloc() should be sufficient.

> +    iov_to_buf(iov, iovcnt, 0, buf, size);
> +    ret = qemu_chr_fe_write_all(s->chr_out, (uint8_t *)buf, size);
> +    g_free(buf);
> +    if (ret == size) {
> +        return 0;
> +    }

This looks odd, I'd rather have:

if (ret != size) {
    goto err;
}

return 0;

> +
> +err:
> +      return ret < 0 ? ret : -EIO;
> +}
> +
> +static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
> +                                         NetClientState *sender,
> +                                         unsigned flags,
> +                                         const struct iovec *iov,
> +                                         int iovcnt,
> +                                         NetPacketSent *sent_cb)
> +{
> +    int ret;
> +
> +    ret = filter_mirror_send(nf, iov, iovcnt);
> +    if (ret) {
> +        error_report("filter_mirror_send failed(%s)", strerror(-ret));
> +    }
> +    return 0;
> +    /*
> +     * FIXME： we don't hope this error interrupt the normal
> +     * path of net packet, so we always return zero.
> +     */
> +}

Looks like it's better to place the above as a comment before 'return 0'
(and remove FIXME).

> +
> +static void filter_mirror_cleanup(NetFilterState *nf)
> +{
> +    MirrorState *s = FILTER_MIRROR(nf);
> +
> +    if (s->chr_out) {
> +        qemu_chr_fe_release(s->chr_out);
> +    }
> +}
> +
> +static void filter_mirror_setup(NetFilterState *nf, Error **errp)
> +{
> +    MirrorState *s = FILTER_MIRROR(nf);
> +
> +    if (!s->outdev) {
> +        error_setg(errp, "filter filter mirror needs 'outdev' "
> +                "property set");
> +        return;
> +    }
> +
> +    s->chr_out = qemu_chr_find(s->outdev);
> +    if (s->chr_out == NULL) {
> +        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
> +                  "Device '%s' not found", s->outdev);
> +        return;
> +    }
> +
> +    if (qemu_chr_fe_claim(s->chr_out) != 0) {
> +        error_setg(errp, QERR_DEVICE_IN_USE, s->outdev);
> +        return;
> +    }
> +}
> +
> +static void filter_mirror_class_init(ObjectClass *oc, void *data)
> +{
> +    NetFilterClass *nfc = NETFILTER_CLASS(oc);
> +
> +    nfc->setup = filter_mirror_setup;
> +    nfc->cleanup = filter_mirror_cleanup;
> +    nfc->receive_iov = filter_mirror_receive_iov;
> +}
> +
> +static char *filter_mirror_get_outdev(Object *obj, Error **errp)
> +{
> +    MirrorState *s = FILTER_MIRROR(obj);
> +
> +    return g_strdup(s->outdev);
> +}
> +
> +static void
> +filter_mirror_set_outdev(Object *obj, const char *value, Error **errp)
> +{
> +    MirrorState *s = FILTER_MIRROR(obj);
> +
> +    g_free(s->outdev);
> +    s->outdev = g_strdup(value);
> +    if (!s->outdev) {
> +        error_setg(errp, "filter filter mirror needs 'outdev' "
> +                "property set");
> +        return;
> +    }
> +}
> +
> +static void filter_mirror_init(Object *obj)
> +{
> +    object_property_add_str(obj, "outdev", filter_mirror_get_outdev,
> +                            filter_mirror_set_outdev, NULL);
> +}
> +
> +static void filter_mirror_fini(Object *obj)
> +{
> +    MirrorState *s = FILTER_MIRROR(obj);
> +
> +    g_free(s->outdev);
> +}
> +
> +static const TypeInfo filter_mirror_info = {
> +    .name = TYPE_FILTER_MIRROR,
> +    .parent = TYPE_NETFILTER,
> +    .class_init = filter_mirror_class_init,
> +    .instance_init = filter_mirror_init,
> +    .instance_finalize = filter_mirror_fini,
> +    .instance_size = sizeof(MirrorState),
> +};
> +
> +static void register_types(void)
> +{
> +    type_register_static(&filter_mirror_info);
> +}
> +
> +type_init(register_types);
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 2f0465e..057e0e5 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -3759,6 +3759,10 @@ 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}]
> +
> +filter-mirror on netdev @var{netdevid},mirror net packet to outdev.

To be more accurate, better use "mirror net packet to chardev
@var{chardevid}

> +
>  @item -object filter-dump,id=@var{id},netdev=@var{dev},file=@var{filename}][,maxlen=@var{len}]
>  
>  Dump the network traffic on netdev @var{dev} to the file specified by
> diff --git a/vl.c b/vl.c
> index 175ebcc..d68533a 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2798,7 +2798,8 @@ static bool object_create_initial(const char *type)
>       * they depend on netdevs already existing
>       */
>      if (g_str_equal(type, "filter-buffer") ||
> -        g_str_equal(type, "filter-dump")) {
> +        g_str_equal(type, "filter-dump") ||
> +        g_str_equal(type, "filter-mirror")) {
>          return false;
>      }
>  

Re: [Qemu-devel] [PATCH V4 2/2] tests/test-filter-mirror:add filter-mirror unit test

[Jason Wang]

On 02/18/2016 04:10 PM, Zhang Chen wrote:
> From: ZhangChen <zhangchen.fnst@cn.fujitsu.com>
>
> In this unit test we will test the mirror function.
>
> start qemu with:
>     -netdev socket,id=qtest-bn0,fd=%d
>     -device e1000,netdev=qtest-bn0,id=qtest-e0
>     -chardev socket,id=mirror0,path=/tmp/filter-mirror-test.sock,server,nowait
>     -object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0
>
> We inject packet to netdev socket id = qtest-bn0,
> filter-mirror will copy and mirror the packet to mirror0.
> we read packet from mirror0 and then compare to what we inject.
>
> Signed-off-by: zhangchen <zhangchen.fnst@cn.fujitsu.com>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> ---
>  tests/.gitignore           |  1 +
>  tests/Makefile             |  2 ++
>  tests/test-filter-mirror.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 92 insertions(+)
>  create mode 100644 tests/test-filter-mirror.c
>
> diff --git a/tests/.gitignore b/tests/.gitignore
> index 787c95c..10df017 100644
> --- a/tests/.gitignore
> +++ b/tests/.gitignore
> @@ -63,5 +63,6 @@ test-write-threshold
>  test-x86-cpuid
>  test-xbzrle
>  test-netfilter
> +test-filter-mirror
>  *-test
>  qapi-schema/*.test.*
> diff --git a/tests/Makefile b/tests/Makefile
> index 650e654..e56c514 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -212,6 +212,7 @@ ifeq ($(CONFIG_VHOST_NET_TEST_i386),)
>  check-qtest-x86_64-$(CONFIG_VHOST_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF)
>  endif
>  check-qtest-i386-y += tests/test-netfilter$(EXESUF)
> +check-qtest-i386-y += tests/test-filter-mirror$(EXESUF)
>  check-qtest-x86_64-y = $(check-qtest-i386-y)
>  gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
>  gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
> @@ -563,6 +564,7 @@ tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_hel
>  tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)
>  tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)
>  tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y)
> +tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
>  tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y)
>  tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
>  
> diff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c
> new file mode 100644
> index 0000000..9c23135
> --- /dev/null
> +++ b/tests/test-filter-mirror.c
> @@ -0,0 +1,89 @@
> +/*
> + * QTest testcase for filter-mirror
> + *
> + * Copyright (c) 2016 FUJITSU LIMITED
> + * Author: Zhang chen <zhangchen.fnst@cn.fujitsu.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> + * later.  See the COPYING file in the top-level directory.
> + */
> +
> +#include <glib.h>
> +#include "libqtest.h"
> +#include "qemu/iov.h"
> +#include "qemu/sockets.h"
> +#include "qemu/error-report.h"
> +#include "qemu/main-loop.h"
> +
> +static void test_mirror(void)
> +{
> +    int send_sock[2];
> +    char *cmdline;
> +    uint32_t ret = 0;
> +    char send_buf[] = "Hello! filter-mirror~";
> +    uint32_t size = sizeof(send_buf);
> +    size = htonl(size);
> +
> +    ret = socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock);
> +    g_assert_cmpint(ret, !=, -1);

socketpair does not exist on w32, let's exclude this from windows.

> +
> +    cmdline = g_strdup_printf("-netdev socket,id=qtest-bn0,fd=%d "
> +                 "-device e1000,netdev=qtest-bn0,id=qtest-e0 "
> +                 "-chardev socket,id=mirror0,path=/tmp/filter-mirror-test.sock,server,nowait "
> +                 "-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0 "
> +                 , send_sock[1]);
> +    qtest_start(cmdline);
> +    g_free(cmdline);
> +
> +    if (fork() == 0) {

Don't get the point of why need a fork() here. I think you can just do
the test in one process, first inject the packet though sending socket
and then try to receive it.

> +        int recv_sock;
> +        uint32_t len = 0;
> +        char *recv_buf;
> +
> +        recv_sock = unix_connect("/tmp/filter-mirror-test.sock", NULL);

Let's define /tmp/filter-mirror-test.sock as a macro.

> +        if (recv_sock < 0) {
> +            error_report("test_mirror connect filter-mirror-test.sock failed");

I was think maybe we can just pass the test here? Since we don't even
start the test.

> +            exit(1);
> +        }
> +        ret = qemu_recv(recv_sock, &len, sizeof(len), 0);
> +        g_assert_cmpint(ret, ==, sizeof(len));
> +        len = ntohl(len);
> +
> +        g_assert_cmpint(len, ==, sizeof(send_buf));
> +        recv_buf = g_malloc0(len);
> +        ret = qemu_recv(recv_sock, recv_buf, len, 0);
> +        g_assert_cmpstr(recv_buf, ==, send_buf);
> +
> +        g_free(recv_buf);
> +        close(recv_sock);
> +        exit(0);
> +    }
> +
> +    usleep(5000);
> +    struct iovec iov[] = {
> +        {
> +            .iov_base = &size,
> +            .iov_len = sizeof(size),
> +        }, {
> +            .iov_base = send_buf,
> +            .iov_len = sizeof(send_buf),
> +        },
> +    };
> +    ret = iov_send(send_sock[0], iov, 2, 0, sizeof(size) + sizeof(send_buf));
> +    g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size));
> +    close(send_sock[0]);
> +

Should we unlink the socket file?

> +}
> +
> +int main(int argc, char **argv)
> +{
> +    int ret;
> +
> +    g_test_init(&argc, &argv, NULL);
> +
> +    qtest_add_func("/netfilter/test-mirror", test_mirror);

We've already in the namespace of test, so probably no need for "test"
prefix here.

> +    ret = g_test_run();
> +    qtest_end();
> +
> +    return ret;
> +}

Re: [Qemu-devel] [PATCH V4 1/2] net/filter-mirror:Add filter-mirror

[Zhang Chen]

On 02/23/2016 10:03 AM, Jason Wang wrote:
>
> On 02/18/2016 04:10 PM, Zhang Chen wrote:
>> From: ZhangChen <zhangchen.fnst@cn.fujitsu.com>
>>
>> Filter-mirror is a netfilter plugin.
>> It gives qemu the ability to mirror
>> packets to a chardev.
>>
>> usage:
>>
>> -netdev tap,id=hn0
>> -chardev socket,id=mirror0,host=ip_primary,port=X,server,nowait
>> -filter-mirror,id=m0,netdev=hn0,queue=tx/rx/all,outdev=mirror0
>>
>> Signed-off-by: ZhangChen <zhangchen.fnst@cn.fujitsu.com>
>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>> Reviewed-by: Yang Hongyang <hongyang.yang@easystack.cn>
>> Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
>> ---
>>   net/Makefile.objs   |   1 +
>>   net/filter-mirror.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>   qemu-options.hx     |   4 ++
>>   vl.c                |   3 +-
>>   4 files changed, 185 insertions(+), 1 deletion(-)
>>   create mode 100644 net/filter-mirror.c
>>
>> diff --git a/net/Makefile.objs b/net/Makefile.objs
>> index 5fa2f97..b7c22fd 100644
>> --- a/net/Makefile.objs
>> +++ b/net/Makefile.objs
>> @@ -15,3 +15,4 @@ common-obj-$(CONFIG_VDE) += vde.o
>>   common-obj-$(CONFIG_NETMAP) += netmap.o
>>   common-obj-y += filter.o
>>   common-obj-y += filter-buffer.o
>> +common-obj-y += filter-mirror.o
>> diff --git a/net/filter-mirror.c b/net/filter-mirror.c
>> new file mode 100644
>> index 0000000..4a88e81
>> --- /dev/null
>> +++ b/net/filter-mirror.c
>> @@ -0,0 +1,178 @@
>> +/*
>> + * Copyright (c) 2016 HUAWEI TECHNOLOGIES CO., LTD.
>> + * Copyright (c) 2016 FUJITSU LIMITED
>> + * Copyright (c) 2016 Intel Corporation
>> + *
>> + * Author: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>> + *
>> + * This work is licensed under the terms of the GNU GPL, version 2 or
>> + * later.  See the COPYING file in the top-level directory.
>> + */
>> +
>> +#include "net/filter.h"
>> +#include "net/net.h"
>> +#include "qemu-common.h"
>> +#include "qapi/qmp/qerror.h"
>> +#include "qapi-visit.h"
>> +#include "qom/object.h"
>> +#include "qemu/main-loop.h"
>> +#include "qemu/error-report.h"
>> +#include "trace.h"
>> +#include "sysemu/char.h"
>> +#include "qemu/iov.h"
>> +#include "qemu/sockets.h"
>> +
>> +#define FILTER_MIRROR(obj) \
>> +    OBJECT_CHECK(MirrorState, (obj), TYPE_FILTER_MIRROR)
>> +
>> +#define TYPE_FILTER_MIRROR "filter-mirror"
>> +
>> +typedef struct MirrorState {
>> +    NetFilterState parent_obj;
>> +    char *outdev;
>> +    CharDriverState *chr_out;
>> +} MirrorState;
>> +
>> +static int filter_mirror_send(NetFilterState *nf,
>> +                                   const struct iovec *iov,
>> +                                   int iovcnt)
>> +{
>> +    MirrorState *s = FILTER_MIRROR(nf);
>> +    int ret = 0;
>> +    ssize_t size = 0;
>> +    uint32_t len =  0;
>> +    char *buf;
>> +
>> +    size = iov_size(iov, iovcnt);
>> +    if (!size) {
>> +        return 0;
>> +    }
>> +
>> +    len = htonl(size);
>> +    ret = qemu_chr_fe_write_all(s->chr_out, (uint8_t *)&len, sizeof(len));
>> +    if (ret != sizeof(len)) {
>> +        goto err;
>> +    }
>> +
>> +    buf = g_malloc0(size);
> g_malloc() should be sufficient.

OK, I will fix in next version.

>> +    iov_to_buf(iov, iovcnt, 0, buf, size);
>> +    ret = qemu_chr_fe_write_all(s->chr_out, (uint8_t *)buf, size);
>> +    g_free(buf);
>> +    if (ret == size) {
>> +        return 0;
>> +    }
> This looks odd, I'd rather have:
>
> if (ret != size) {
>      goto err;
> }
>
> return 0;

OK, I will fix it in next version.

>> +
>> +err:
>> +      return ret < 0 ? ret : -EIO;
>> +}
>> +
>> +static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
>> +                                         NetClientState *sender,
>> +                                         unsigned flags,
>> +                                         const struct iovec *iov,
>> +                                         int iovcnt,
>> +                                         NetPacketSent *sent_cb)
>> +{
>> +    int ret;
>> +
>> +    ret = filter_mirror_send(nf, iov, iovcnt);
>> +    if (ret) {
>> +        error_report("filter_mirror_send failed(%s)", strerror(-ret));
>> +    }
>> +    return 0;
>> +    /*
>> +     * FIXME： we don't hope this error interrupt the normal
>> +     * path of net packet, so we always return zero.
>> +     */
>> +}
> Looks like it's better to place the above as a comment before 'return 0'
> (and remove FIXME).

I will fix it next version.

>> +
>> +static void filter_mirror_cleanup(NetFilterState *nf)
>> +{
>> +    MirrorState *s = FILTER_MIRROR(nf);
>> +
>> +    if (s->chr_out) {
>> +        qemu_chr_fe_release(s->chr_out);
>> +    }
>> +}
>> +
>> +static void filter_mirror_setup(NetFilterState *nf, Error **errp)
>> +{
>> +    MirrorState *s = FILTER_MIRROR(nf);
>> +
>> +    if (!s->outdev) {
>> +        error_setg(errp, "filter filter mirror needs 'outdev' "
>> +                "property set");
>> +        return;
>> +    }
>> +
>> +    s->chr_out = qemu_chr_find(s->outdev);
>> +    if (s->chr_out == NULL) {
>> +        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
>> +                  "Device '%s' not found", s->outdev);
>> +        return;
>> +    }
>> +
>> +    if (qemu_chr_fe_claim(s->chr_out) != 0) {
>> +        error_setg(errp, QERR_DEVICE_IN_USE, s->outdev);
>> +        return;
>> +    }
>> +}
>> +
>> +static void filter_mirror_class_init(ObjectClass *oc, void *data)
>> +{
>> +    NetFilterClass *nfc = NETFILTER_CLASS(oc);
>> +
>> +    nfc->setup = filter_mirror_setup;
>> +    nfc->cleanup = filter_mirror_cleanup;
>> +    nfc->receive_iov = filter_mirror_receive_iov;
>> +}
>> +
>> +static char *filter_mirror_get_outdev(Object *obj, Error **errp)
>> +{
>> +    MirrorState *s = FILTER_MIRROR(obj);
>> +
>> +    return g_strdup(s->outdev);
>> +}
>> +
>> +static void
>> +filter_mirror_set_outdev(Object *obj, const char *value, Error **errp)
>> +{
>> +    MirrorState *s = FILTER_MIRROR(obj);
>> +
>> +    g_free(s->outdev);
>> +    s->outdev = g_strdup(value);
>> +    if (!s->outdev) {
>> +        error_setg(errp, "filter filter mirror needs 'outdev' "
>> +                "property set");
>> +        return;
>> +    }
>> +}
>> +
>> +static void filter_mirror_init(Object *obj)
>> +{
>> +    object_property_add_str(obj, "outdev", filter_mirror_get_outdev,
>> +                            filter_mirror_set_outdev, NULL);
>> +}
>> +
>> +static void filter_mirror_fini(Object *obj)
>> +{
>> +    MirrorState *s = FILTER_MIRROR(obj);
>> +
>> +    g_free(s->outdev);
>> +}
>> +
>> +static const TypeInfo filter_mirror_info = {
>> +    .name = TYPE_FILTER_MIRROR,
>> +    .parent = TYPE_NETFILTER,
>> +    .class_init = filter_mirror_class_init,
>> +    .instance_init = filter_mirror_init,
>> +    .instance_finalize = filter_mirror_fini,
>> +    .instance_size = sizeof(MirrorState),
>> +};
>> +
>> +static void register_types(void)
>> +{
>> +    type_register_static(&filter_mirror_info);
>> +}
>> +
>> +type_init(register_types);
>> diff --git a/qemu-options.hx b/qemu-options.hx
>> index 2f0465e..057e0e5 100644
>> --- a/qemu-options.hx
>> +++ b/qemu-options.hx
>> @@ -3759,6 +3759,10 @@ 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}]
>> +
>> +filter-mirror on netdev @var{netdevid},mirror net packet to outdev.
> To be more accurate, better use "mirror net packet to chardev
> @var{chardevid}

OK, I will fix it in next version.

Thanks
zhangchen

>> +
>>   @item -object filter-dump,id=@var{id},netdev=@var{dev},file=@var{filename}][,maxlen=@var{len}]
>>   
>>   Dump the network traffic on netdev @var{dev} to the file specified by
>> diff --git a/vl.c b/vl.c
>> index 175ebcc..d68533a 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -2798,7 +2798,8 @@ static bool object_create_initial(const char *type)
>>        * they depend on netdevs already existing
>>        */
>>       if (g_str_equal(type, "filter-buffer") ||
>> -        g_str_equal(type, "filter-dump")) {
>> +        g_str_equal(type, "filter-dump") ||
>> +        g_str_equal(type, "filter-mirror")) {
>>           return false;
>>       }
>>   
>
>
> .
>

-- 
Thanks
zhangchen

Re: [Qemu-devel] [PATCH V4 2/2] tests/test-filter-mirror:add filter-mirror unit test

[Zhang Chen]

On 02/23/2016 10:31 AM, Jason Wang wrote:
>
> On 02/18/2016 04:10 PM, Zhang Chen wrote:
>> From: ZhangChen <zhangchen.fnst@cn.fujitsu.com>
>>
>> In this unit test we will test the mirror function.
>>
>> start qemu with:
>>      -netdev socket,id=qtest-bn0,fd=%d
>>      -device e1000,netdev=qtest-bn0,id=qtest-e0
>>      -chardev socket,id=mirror0,path=/tmp/filter-mirror-test.sock,server,nowait
>>      -object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0
>>
>> We inject packet to netdev socket id = qtest-bn0,
>> filter-mirror will copy and mirror the packet to mirror0.
>> we read packet from mirror0 and then compare to what we inject.
>>
>> Signed-off-by: zhangchen <zhangchen.fnst@cn.fujitsu.com>
>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>> ---
>>   tests/.gitignore           |  1 +
>>   tests/Makefile             |  2 ++
>>   tests/test-filter-mirror.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++
>>   3 files changed, 92 insertions(+)
>>   create mode 100644 tests/test-filter-mirror.c
>>
>> diff --git a/tests/.gitignore b/tests/.gitignore
>> index 787c95c..10df017 100644
>> --- a/tests/.gitignore
>> +++ b/tests/.gitignore
>> @@ -63,5 +63,6 @@ test-write-threshold
>>   test-x86-cpuid
>>   test-xbzrle
>>   test-netfilter
>> +test-filter-mirror
>>   *-test
>>   qapi-schema/*.test.*
>> diff --git a/tests/Makefile b/tests/Makefile
>> index 650e654..e56c514 100644
>> --- a/tests/Makefile
>> +++ b/tests/Makefile
>> @@ -212,6 +212,7 @@ ifeq ($(CONFIG_VHOST_NET_TEST_i386),)
>>   check-qtest-x86_64-$(CONFIG_VHOST_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF)
>>   endif
>>   check-qtest-i386-y += tests/test-netfilter$(EXESUF)
>> +check-qtest-i386-y += tests/test-filter-mirror$(EXESUF)
>>   check-qtest-x86_64-y = $(check-qtest-i386-y)
>>   gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
>>   gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
>> @@ -563,6 +564,7 @@ tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_hel
>>   tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)
>>   tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)
>>   tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y)
>> +tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
>>   tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y)
>>   tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
>>   
>> diff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c
>> new file mode 100644
>> index 0000000..9c23135
>> --- /dev/null
>> +++ b/tests/test-filter-mirror.c
>> @@ -0,0 +1,89 @@
>> +/*
>> + * QTest testcase for filter-mirror
>> + *
>> + * Copyright (c) 2016 FUJITSU LIMITED
>> + * Author: Zhang chen <zhangchen.fnst@cn.fujitsu.com>
>> + *
>> + * This work is licensed under the terms of the GNU GPL, version 2 or
>> + * later.  See the COPYING file in the top-level directory.
>> + */
>> +
>> +#include <glib.h>
>> +#include "libqtest.h"
>> +#include "qemu/iov.h"
>> +#include "qemu/sockets.h"
>> +#include "qemu/error-report.h"
>> +#include "qemu/main-loop.h"
>> +
>> +static void test_mirror(void)
>> +{
>> +    int send_sock[2];
>> +    char *cmdline;
>> +    uint32_t ret = 0;
>> +    char send_buf[] = "Hello! filter-mirror~";
>> +    uint32_t size = sizeof(send_buf);
>> +    size = htonl(size);
>> +
>> +    ret = socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock);
>> +    g_assert_cmpint(ret, !=, -1);
> socketpair does not exist on w32, let's exclude this from windows.

OK, I will fix~~

>> +
>> +    cmdline = g_strdup_printf("-netdev socket,id=qtest-bn0,fd=%d "
>> +                 "-device e1000,netdev=qtest-bn0,id=qtest-e0 "
>> +                 "-chardev socket,id=mirror0,path=/tmp/filter-mirror-test.sock,server,nowait "
>> +                 "-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0 "
>> +                 , send_sock[1]);
>> +    qtest_start(cmdline);
>> +    g_free(cmdline);
>> +
>> +    if (fork() == 0) {
> Don't get the point of why need a fork() here. I think you can just do
> the test in one process, first inject the packet though sending socket
> and then try to receive it.

I will fix it in next version.

>> +        int recv_sock;
>> +        uint32_t len = 0;
>> +        char *recv_buf;
>> +
>> +        recv_sock = unix_connect("/tmp/filter-mirror-test.sock", NULL);
> Let's define /tmp/filter-mirror-test.sock as a macro.
>

OK~

>> +        if (recv_sock < 0) {
>> +            error_report("test_mirror connect filter-mirror-test.sock failed");
> I was think maybe we can just pass the test here? Since we don't even
> start the test.

yes, I will fix it in next version.

>> +            exit(1);
>> +        }
>> +        ret = qemu_recv(recv_sock, &len, sizeof(len), 0);
>> +        g_assert_cmpint(ret, ==, sizeof(len));
>> +        len = ntohl(len);
>> +
>> +        g_assert_cmpint(len, ==, sizeof(send_buf));
>> +        recv_buf = g_malloc0(len);
>> +        ret = qemu_recv(recv_sock, recv_buf, len, 0);
>> +        g_assert_cmpstr(recv_buf, ==, send_buf);
>> +
>> +        g_free(recv_buf);
>> +        close(recv_sock);
>> +        exit(0);
>> +    }
>> +
>> +    usleep(5000);
>> +    struct iovec iov[] = {
>> +        {
>> +            .iov_base = &size,
>> +            .iov_len = sizeof(size),
>> +        }, {
>> +            .iov_base = send_buf,
>> +            .iov_len = sizeof(send_buf),
>> +        },
>> +    };
>> +    ret = iov_send(send_sock[0], iov, 2, 0, sizeof(size) + sizeof(send_buf));
>> +    g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size));
>> +    close(send_sock[0]);
>> +
> Should we unlink the socket file?

OK, I will fix.

>> +}
>> +
>> +int main(int argc, char **argv)
>> +{
>> +    int ret;
>> +
>> +    g_test_init(&argc, &argv, NULL);
>> +
>> +    qtest_add_func("/netfilter/test-mirror", test_mirror);
> We've already in the namespace of test, so probably no need for "test"
> prefix here.

OK, I will fix it in next version.

Thanks
zhangchen

>
>> +    ret = g_test_run();
>> +    qtest_end();
>> +
>> +    return ret;
>> +}
>
>
> .
>

-- 
Thanks
zhangchen