From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLMf5-0006jZ-Hq for qemu-devel@nongnu.org; Thu, 07 Jul 2016 23:41:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLMez-0006Di-Sa for qemu-devel@nongnu.org; Thu, 07 Jul 2016 23:41:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53768) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLMez-0006De-KB for qemu-devel@nongnu.org; Thu, 07 Jul 2016 23:41:01 -0400 References: <1466681677-30487-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> <1466681677-30487-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> From: Jason Wang Message-ID: <577F20C7.7000205@redhat.com> Date: Fri, 8 Jul 2016 11:40:55 +0800 MIME-Version: 1.0 In-Reply-To: <1466681677-30487-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC PATCH V5 1/4] colo-compare: introduce colo compare initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Zhang Chen , qemu devel Cc: Li Zhijian , Wen Congyang , zhanghailiang , "eddie . dong" , "Dr . David Alan Gilbert" On 2016=E5=B9=B406=E6=9C=8823=E6=97=A5 19:34, Zhang Chen wrote: > Packets coming from the primary char indev will be sent to outdev > Packets coming from the secondary char dev will be dropped > > usage: > > primary: > -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D/= etc/qemu-ifdown > -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 > -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server,nowait > -chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,nowait > -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server,nowait > -chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 > -chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server,nowa= it > -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 > -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0 > -object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx,indev=3D= compare_out > -object filter-redirector,netdev=3Dhn0,id=3Dredire1,queue=3Drx,outdev=3D= compare0 > -object colo-compare,id=3Dcomp0,primary_in=3Dcompare0-0,secondary_in=3D= compare1,outdev=3Dcompare_out0 > > secondary: > -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,down script=3D= /etc/qemu-ifdown > -device e1000,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 > -chardev socket,id=3Dred0,host=3D3.3.3.3,port=3D9003 > -chardev socket,id=3Dred1,host=3D3.3.3.3,port=3D9004 > -object filter-redirector,id=3Df1,netdev=3Dhn0,queue=3Dtx,indev=3Dred0 > -object filter-redirector,id=3Df2,netdev=3Dhn0,queue=3Drx,outdev=3Dred1 Consider we finally want a non-rfc patch, it's better to have a some=20 explanations on the above configurations since it was not easy to for=20 starters at first glance.Maybe you can use either a ascii figure or a=20 paragraph. Also need to explain the parameter of colo-compare in detail. > > Signed-off-by: Zhang Chen > Signed-off-by: Li Zhijian > Signed-off-by: Wen Congyang > --- > net/Makefile.objs | 1 + > net/colo-compare.c | 231 ++++++++++++++++++++++++++++++++++++++++++++= +++++++++ > qemu-options.hx | 34 ++++++++ > vl.c | 3 +- > 4 files changed, 268 insertions(+), 1 deletion(-) > create mode 100644 net/colo-compare.c > > diff --git a/net/Makefile.objs b/net/Makefile.objs > index b7c22fd..ba92f73 100644 > --- a/net/Makefile.objs > +++ b/net/Makefile.objs > @@ -16,3 +16,4 @@ common-obj-$(CONFIG_NETMAP) +=3D netmap.o > common-obj-y +=3D filter.o > common-obj-y +=3D filter-buffer.o > common-obj-y +=3D filter-mirror.o > +common-obj-y +=3D colo-compare.o > diff --git a/net/colo-compare.c b/net/colo-compare.c > new file mode 100644 > index 0000000..a3e1456 > --- /dev/null > +++ b/net/colo-compare.c > @@ -0,0 +1,231 @@ > +/* > + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (C= OLO) > + * (a.k.a. Fault Tolerance or Continuous Replication) > + * > + * 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 "qemu/osdep.h" > +#include "qemu/error-report.h" > +#include "qemu-common.h" > +#include "qapi/qmp/qerror.h" > +#include "qapi/error.h" > +#include "net/net.h" > +#include "net/vhost_net.h" > +#include "qom/object_interfaces.h" > +#include "qemu/iov.h" > +#include "qom/object.h" > +#include "qemu/typedefs.h" > +#include "net/queue.h" > +#include "sysemu/char.h" > +#include "qemu/sockets.h" > +#include "qapi-visit.h" > +#include "trace.h" Looks like trace were not really used in the patch, you can delay the=20 inclusion until is was really used. > + > +#define TYPE_COLO_COMPARE "colo-compare" > +#define COLO_COMPARE(obj) \ > + OBJECT_CHECK(CompareState, (obj), TYPE_COLO_COMPARE) > + > +#define COMPARE_READ_LEN_MAX NET_BUFSIZE > + > +static QTAILQ_HEAD(, CompareState) net_compares =3D > + QTAILQ_HEAD_INITIALIZER(net_compares); What's the usage of this? A comment would be better. > + > +typedef struct CompareState { > + Object parent; > + > + char *pri_indev; > + char *sec_indev; > + char *outdev; > + CharDriverState *chr_pri_in; > + CharDriverState *chr_sec_in; > + CharDriverState *chr_out; > + QTAILQ_ENTRY(CompareState) next; > + SocketReadState pri_rs; > + SocketReadState sec_rs; > +} CompareState; > + > +typedef struct CompareClass { > + ObjectClass parent_class; > +} CompareClass; > + > +static char *compare_get_pri_indev(Object *obj, Error **errp) > +{ > + CompareState *s =3D COLO_COMPARE(obj); > + > + return g_strdup(s->pri_indev); > +} > + > +static void compare_set_pri_indev(Object *obj, const char *value, Erro= r **errp) > +{ > + CompareState *s =3D COLO_COMPARE(obj); > + > + g_free(s->pri_indev); > + s->pri_indev =3D g_strdup(value); I think we need do something more than this, e.g release the orig dev=20 and get the new one? Or just forbid setting this property. And looks like we have similar issues for sec_indev and outdev. > +} > + > +static char *compare_get_sec_indev(Object *obj, Error **errp) > +{ > + CompareState *s =3D COLO_COMPARE(obj); > + > + return g_strdup(s->sec_indev); > +} > + > +static void compare_set_sec_indev(Object *obj, const char *value, Erro= r **errp) > +{ > + CompareState *s =3D COLO_COMPARE(obj); > + > + g_free(s->sec_indev); > + s->sec_indev =3D g_strdup(value); > +} > + > +static char *compare_get_outdev(Object *obj, Error **errp) > +{ > + CompareState *s =3D COLO_COMPARE(obj); > + > + return g_strdup(s->outdev); > +} > + > +static void compare_set_outdev(Object *obj, const char *value, Error *= *errp) > +{ > + CompareState *s =3D COLO_COMPARE(obj); > + > + g_free(s->outdev); > + s->outdev =3D g_strdup(value); > +} > + > +static void compare_pri_rs_finalize(SocketReadState *pri_rs) > +{ > + /* if packet_enqueue pri pkt failed we will send unsupported packe= t */ > +} > + > +static void compare_sec_rs_finalize(SocketReadState *sec_rs) > +{ > + /* if packet_enqueue sec pkt failed we will notify trace */ > +} > + > +/* > + * called from the main thread on the primary > + * to setup colo-compare. > + */ > +static void colo_compare_complete(UserCreatable *uc, Error **errp) > +{ > + CompareState *s =3D COLO_COMPARE(uc); > + > + if (!s->pri_indev || !s->sec_indev || !s->outdev) { > + error_setg(errp, "colo compare needs 'primary_in' ," > + "'secondary_in','outdev' property set"); > + return; > + } else if (!strcmp(s->pri_indev, s->outdev) || > + !strcmp(s->sec_indev, s->outdev) || > + !strcmp(s->pri_indev, s->sec_indev)) { > + error_setg(errp, "'indev' and 'outdev' could not be same " > + "for compare module"); > + return; > + } > + > + s->chr_pri_in =3D qemu_chr_find(s->pri_indev); > + if (s->chr_pri_in =3D=3D NULL) { > + error_setg(errp, "Primary IN Device '%s' not found", > + s->pri_indev); > + return; > + } > + > + s->chr_sec_in =3D qemu_chr_find(s->sec_indev); > + if (s->chr_sec_in =3D=3D NULL) { > + error_setg(errp, "Secondary IN Device '%s' not found", > + s->sec_indev); > + return; > + } > + > + s->chr_out =3D qemu_chr_find(s->outdev); > + if (s->chr_out =3D=3D NULL) { > + error_setg(errp, "OUT Device '%s' not found", s->outdev); > + return; > + } > + > + qemu_chr_fe_claim_no_fail(s->chr_pri_in); > + > + qemu_chr_fe_claim_no_fail(s->chr_sec_in); > + > + qemu_chr_fe_claim_no_fail(s->chr_out); > + QTAILQ_INSERT_TAIL(&net_compares, s, next); > + > + net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize); > + net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize); > + > + return; > +} > + > +static void colo_compare_class_init(ObjectClass *oc, void *data) > +{ > + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); > + > + ucc->complete =3D colo_compare_complete; > +} > + > +static void colo_compare_init(Object *obj) > +{ > + object_property_add_str(obj, "primary_in", > + compare_get_pri_indev, compare_set_pri_ind= ev, > + NULL); > + object_property_add_str(obj, "secondary_in", > + compare_get_sec_indev, compare_set_sec_ind= ev, > + NULL); > + object_property_add_str(obj, "outdev", > + compare_get_outdev, compare_set_outdev, > + NULL); > +} > + > +static void colo_compare_finalize(Object *obj) > +{ > + CompareState *s =3D COLO_COMPARE(obj); > + > + if (s->chr_pri_in) { > + qemu_chr_add_handlers(s->chr_pri_in, NULL, NULL, NULL, NULL); Why need do this? > + qemu_chr_fe_release(s->chr_pri_in); > + } > + if (s->chr_sec_in) { > + qemu_chr_add_handlers(s->chr_sec_in, NULL, NULL, NULL, NULL); > + qemu_chr_fe_release(s->chr_sec_in); > + } > + if (s->chr_out) { > + qemu_chr_fe_release(s->chr_out); > + } > + > + if (!QTAILQ_EMPTY(&net_compares)) { > + QTAILQ_REMOVE(&net_compares, s, next); > + } > + > + g_free(s->pri_indev); > + g_free(s->sec_indev); > + g_free(s->outdev); > +} > + > +static const TypeInfo colo_compare_info =3D { > + .name =3D TYPE_COLO_COMPARE, > + .parent =3D TYPE_OBJECT, > + .instance_size =3D sizeof(CompareState), > + .instance_init =3D colo_compare_init, > + .instance_finalize =3D colo_compare_finalize, > + .class_size =3D sizeof(CompareClass), > + .class_init =3D colo_compare_class_init, > + .interfaces =3D (InterfaceInfo[]) { > + { TYPE_USER_CREATABLE }, > + { } > + } > +}; > + > +static void register_types(void) > +{ > + type_register_static(&colo_compare_info); > +} > + > +type_init(register_types); > diff --git a/qemu-options.hx b/qemu-options.hx > index 587de8f..14bade5 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -3866,6 +3866,40 @@ Dump the network traffic on netdev @var{dev} to = the file specified by > The file format is libpcap, so it can be analyzed with tools such as = tcpdump > or Wireshark. > =20 > +@item -object colo-compare,id=3D@var{id},primary_in=3D@var{chardevid},= secondary_in=3D@var{chardevid}, > +outdev=3D@var{chardevid} > + > +Colo-compare gets packet from primary_in@var{chardevid} and secondary_= in@var{chardevid}, > +and outputs to outdev@var{chardevid}, we can use it with the help of f= ilter-mirror and filter-redirector. Need a better organization of the above description. E.g it does not=20 even mention any comparing. > + > +The simple usage: > + > +@example > + > +primary: > +-netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D= /etc/qemu-ifdown > +-device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 > +-chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server,nowait > +-chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,nowait > +-chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server,nowait > +-chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 > +-chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server,now= ait > +-chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 > +-object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0 > +-object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx,indev=3D= compare_out > +-object filter-redirector,netdev=3Dhn0,id=3Dredire1,queue=3Drx,outdev=3D= compare0 > +-object colo-compare,id=3Dcomp0,primary_in=3Dcompare0-0,secondary_in=3D= compare1,outdev=3Dcompare_out0 > + > +secondary: > +-netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,down script=3D= /etc/qemu-ifdown > +-device e1000,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 > +-chardev socket,id=3Dred0,host=3D3.3.3.3,port=3D9003 > +-chardev socket,id=3Dred1,host=3D3.3.3.3,port=3D9004 > +-object filter-redirector,id=3Df1,netdev=3Dhn0,queue=3Dtx,indev=3Dred0 > +-object filter-redirector,id=3Df2,netdev=3Dhn0,queue=3Drx,outdev=3Dred= 1 > + > +@end example > + > @item -object secret,id=3D@var{id},data=3D@var{string},format=3D@var{= raw|base64}[,keyid=3D@var{secretid},iv=3D@var{string}] > @item -object secret,id=3D@var{id},file=3D@var{filename},format=3D@va= r{raw|base64}[,keyid=3D@var{secretid},iv=3D@var{string}] > =20 > diff --git a/vl.c b/vl.c > index cbe51ac..c6b9a6f 100644 > --- a/vl.c > +++ b/vl.c > @@ -2865,7 +2865,8 @@ static bool object_create_initial(const char *typ= e) > if (g_str_equal(type, "filter-buffer") || > g_str_equal(type, "filter-dump") || > g_str_equal(type, "filter-mirror") || > - g_str_equal(type, "filter-redirector")) { > + g_str_equal(type, "filter-redirector") || > + g_str_equal(type, "colo-compare")) { > return false; > } > =20