From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab19T-0004Tz-Eg for qemu-devel@nongnu.org; Wed, 02 Mar 2016 02:24:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ab19P-0002H1-BZ for qemu-devel@nongnu.org; Wed, 02 Mar 2016 02:24:55 -0500 Received: from [59.151.112.132] (port=11846 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab19O-0002FJ-39 for qemu-devel@nongnu.org; Wed, 02 Mar 2016 02:24:51 -0500 References: <1456748635-1912-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> <1456748635-1912-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> <56D685FE.6030207@redhat.com> From: Zhang Chen Message-ID: <56D6955E.5090102@cn.fujitsu.com> Date: Wed, 2 Mar 2016 15:25:18 +0800 MIME-Version: 1.0 In-Reply-To: <56D685FE.6030207@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V2 1/3] net/filter-traffic: add filter-traffic.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang , qemu devel Cc: Li Zhijian , Gui jianfeng , "eddie.dong" , zhanghailiang , "Dr. David Alan Gilbert" , Yang Hongyang On 03/02/2016 02:19 PM, Jason Wang wrote: > > On 02/29/2016 08:23 PM, Zhang Chen wrote: >> We can reuse filter-traffic by filter-mirror, >> filter-redirector and so on. > I think we could share more than this. E.g just use filter-mirror.c to > implement both mirror and redirector. OK, should we change the name to filter-mirror? like filter-traffic? and add redirect=on/off -object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,indev=redirect0,redirect=on,outdev=mirror0 > >> Signed-off-by: Zhang Chen >> Signed-off-by: Wen Congyang >> --- >> net/filter-mirror.c | 70 +++++++-------------------------------------------- >> net/filter-traffic.h | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 80 insertions(+), 61 deletions(-) >> create mode 100644 net/filter-traffic.h >> >> diff --git a/net/filter-mirror.c b/net/filter-mirror.c >> index ee13d94..d9698f2 100644 >> --- a/net/filter-mirror.c >> +++ b/net/filter-mirror.c >> @@ -9,65 +9,13 @@ >> * 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" >> +#include "net/filter-traffic.h" >> >> #define FILTER_MIRROR(obj) \ >> - OBJECT_CHECK(MirrorState, (obj), TYPE_FILTER_MIRROR) >> + OBJECT_CHECK(TrafficState, (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_malloc(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) { >> - goto err; >> - } >> - >> - return 0; >> - >> -err: >> - return ret < 0 ? ret : -EIO; >> -} >> - >> static ssize_t filter_mirror_receive_iov(NetFilterState *nf, >> NetClientState *sender, >> unsigned flags, >> @@ -77,7 +25,7 @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf, >> { >> int ret; >> >> - ret = filter_mirror_send(nf, iov, iovcnt); >> + ret = filter_traffic_send(nf, iov, iovcnt); >> if (ret) { >> error_report("filter_mirror_send failed(%s)", strerror(-ret)); >> } >> @@ -91,7 +39,7 @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf, >> >> static void filter_mirror_cleanup(NetFilterState *nf) >> { >> - MirrorState *s = FILTER_MIRROR(nf); >> + TrafficState *s = FILTER_MIRROR(nf); >> >> if (s->chr_out) { >> qemu_chr_fe_release(s->chr_out); >> @@ -100,7 +48,7 @@ static void filter_mirror_cleanup(NetFilterState *nf) >> >> static void filter_mirror_setup(NetFilterState *nf, Error **errp) >> { >> - MirrorState *s = FILTER_MIRROR(nf); >> + TrafficState *s = FILTER_MIRROR(nf); >> >> if (!s->outdev) { >> error_setg(errp, "filter filter mirror needs 'outdev' " >> @@ -132,7 +80,7 @@ static void filter_mirror_class_init(ObjectClass *oc, void *data) >> >> static char *filter_mirror_get_outdev(Object *obj, Error **errp) >> { >> - MirrorState *s = FILTER_MIRROR(obj); >> + TrafficState *s = FILTER_MIRROR(obj); >> >> return g_strdup(s->outdev); >> } >> @@ -140,7 +88,7 @@ static char *filter_mirror_get_outdev(Object *obj, Error **errp) >> static void >> filter_mirror_set_outdev(Object *obj, const char *value, Error **errp) >> { >> - MirrorState *s = FILTER_MIRROR(obj); >> + TrafficState *s = FILTER_MIRROR(obj); >> >> g_free(s->outdev); >> s->outdev = g_strdup(value); >> @@ -159,7 +107,7 @@ static void filter_mirror_init(Object *obj) >> >> static void filter_mirror_fini(Object *obj) >> { >> - MirrorState *s = FILTER_MIRROR(obj); >> + TrafficState *s = FILTER_MIRROR(obj); >> >> g_free(s->outdev); >> } >> @@ -170,7 +118,7 @@ static const TypeInfo filter_mirror_info = { >> .class_init = filter_mirror_class_init, >> .instance_init = filter_mirror_init, >> .instance_finalize = filter_mirror_fini, >> - .instance_size = sizeof(MirrorState), >> + .instance_size = sizeof(TrafficState), >> }; >> >> static void register_types(void) >> diff --git a/net/filter-traffic.h b/net/filter-traffic.h >> new file mode 100644 >> index 0000000..24cb5c3 >> --- /dev/null >> +++ b/net/filter-traffic.h >> @@ -0,0 +1,71 @@ >> +/* >> + * Copyright (c) 2016 HUAWEI TECHNOLOGIES CO., LTD. >> + * Copyright (c) 2016 FUJITSU LIMITED >> + * Copyright (c) 2016 Intel Corporation >> + * >> + * Author: Zhang Chen >> + * >> + * 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" >> + >> +#ifndef QEMU_FILTER_MIRROR_H >> +#define QEMU_FILTER_MIRROR_H >> + >> +typedef struct TrafficState { >> + NetFilterState parent_obj; >> + NetQueue *incoming_queue;/* guest normal net queue */ > The comment is wrong here, guest nic net queue should be incoming_queue > of NetClientState. I will fix it next version. >> + char *indev; >> + char *outdev; >> + CharDriverState *chr_in; >> + CharDriverState *chr_out; > We could just extend current MirrorState. OK, next version will based on filter-mirror Thanks zhangchen >> +} TrafficState; >> + >> +static int filter_traffic_send(NetFilterState *nf, >> + const struct iovec *iov, >> + int iovcnt) >> +{ >> + TrafficState *s = (TrafficState *)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_malloc(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) { >> + goto err; >> + } >> + >> + return 0; >> + >> +err: >> + return ret < 0 ? ret : -EIO; >> +} >> + >> +#endif /* QEMU_FILTER_MIRROR_H */ > > > . > -- Thanks zhangchen