| Message ID | 1495549241-23380-4-git-send-email-zhangchen.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2017年05月23日 22:20, Zhang Chen wrote: > We add the vnet_hdr option for filter-redirector, default is disable. > If you use virtio-net-pci net driver, please enable it. > Because colo-compare or other modules needs the vnet_hdr_len to parse > packet, so 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=on > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > --- > net/filter-mirror.c | 33 +++++++++++++++++++++++++++++++++ > qemu-options.hx | 6 +++--- > 2 files changed, 36 insertions(+), 3 deletions(-) > > diff --git a/net/filter-mirror.c b/net/filter-mirror.c > index 8df0be6..6c8579f 100644 > --- a/net/filter-mirror.c > +++ b/net/filter-mirror.c > @@ -381,6 +381,13 @@ static char *filter_redirector_get_outdev(Object *obj, Error **errp) > return g_strdup(s->outdev); > } > > +static char *filter_redirector_get_vnet_hdr(Object *obj, Error **errp) > +{ > + MirrorState *s = FILTER_REDIRECTOR(obj); > + > + return s->vnet_hdr ? g_strdup("on") : g_strdup("off"); > +} > + > static void > filter_redirector_set_outdev(Object *obj, const char *value, Error **errp) > { > @@ -390,6 +397,21 @@ filter_redirector_set_outdev(Object *obj, const char *value, Error **errp) > s->outdev = g_strdup(value); > } > > +static void filter_redirector_set_vnet_hdr(Object *obj, > + const char *value, > + Error **errp) > +{ > + MirrorState *s = FILTER_REDIRECTOR(obj); > + > + if (strcmp(value, "on") && strcmp(value, "off")) { > + error_setg(errp, "Invalid value for filter-redirector vnet_hdr, " > + "should be 'on' or 'off'"); > + return; > + } > + > + s->vnet_hdr = !strcmp(value, "on"); > +} > + > static void filter_mirror_init(Object *obj) > { > MirrorState *s = FILTER_MIRROR(obj); > @@ -409,10 +431,21 @@ 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); > + > + /* > + * 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_redirector_get_vnet_hdr, > + filter_redirector_set_vnet_hdr, NULL); Why not using object_property_add_bool()? Thanks > } > > static void filter_mirror_fini(Object *obj) > diff --git a/qemu-options.hx b/qemu-options.hx > index 81fb96b..a3c4688 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -4028,11 +4028,11 @@ 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 vnet_hdr = on, 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},vnet_hdr=@var{on|off}[,queue=@var{all|rx|tx}] > > 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 vnet_hdr = on, > +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.
On 05/25/2017 02:10 PM, Jason Wang wrote: > > > On 2017年05月23日 22:20, Zhang Chen wrote: >> We add the vnet_hdr option for filter-redirector, default is disable. >> If you use virtio-net-pci net driver, please enable it. >> Because colo-compare or other modules needs the vnet_hdr_len to parse >> packet, so 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=on >> >> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >> --- >> net/filter-mirror.c | 33 +++++++++++++++++++++++++++++++++ >> qemu-options.hx | 6 +++--- >> 2 files changed, 36 insertions(+), 3 deletions(-) >> >> diff --git a/net/filter-mirror.c b/net/filter-mirror.c >> index 8df0be6..6c8579f 100644 >> --- a/net/filter-mirror.c >> +++ b/net/filter-mirror.c >> @@ -381,6 +381,13 @@ static char *filter_redirector_get_outdev(Object >> *obj, Error **errp) >> return g_strdup(s->outdev); >> } >> +static char *filter_redirector_get_vnet_hdr(Object *obj, Error >> **errp) >> +{ >> + MirrorState *s = FILTER_REDIRECTOR(obj); >> + >> + return s->vnet_hdr ? g_strdup("on") : g_strdup("off"); >> +} >> + >> static void >> filter_redirector_set_outdev(Object *obj, const char *value, Error >> **errp) >> { >> @@ -390,6 +397,21 @@ filter_redirector_set_outdev(Object *obj, const >> char *value, Error **errp) >> s->outdev = g_strdup(value); >> } >> +static void filter_redirector_set_vnet_hdr(Object *obj, >> + const char *value, >> + Error **errp) >> +{ >> + MirrorState *s = FILTER_REDIRECTOR(obj); >> + >> + if (strcmp(value, "on") && strcmp(value, "off")) { >> + error_setg(errp, "Invalid value for filter-redirector >> vnet_hdr, " >> + "should be 'on' or 'off'"); >> + return; >> + } >> + >> + s->vnet_hdr = !strcmp(value, "on"); >> +} >> + >> static void filter_mirror_init(Object *obj) >> { >> MirrorState *s = FILTER_MIRROR(obj); >> @@ -409,10 +431,21 @@ 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); >> + >> + /* >> + * 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_redirector_get_vnet_hdr, >> + filter_redirector_set_vnet_hdr, NULL); > > Why not using object_property_add_bool()? Because use object_property_add_bool() we should change the option from "vnet_hdr=on/off" to "vnet_hdr", it seems hard to read for user. Thanks Zhang Chen > > Thanks > >> } >> static void filter_mirror_fini(Object *obj) >> diff --git a/qemu-options.hx b/qemu-options.hx >> index 81fb96b..a3c4688 100644 >> --- a/qemu-options.hx >> +++ b/qemu-options.hx >> @@ -4028,11 +4028,11 @@ 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 vnet_hdr = on, 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},vnet_hdr=@var{on|off}[,queue=@var{all|rx|tx}] >> 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 vnet_hdr = on, >> +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. > > > > . >
On 2017年05月25日 20:58, Zhang Chen wrote: >>> 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); >>> + >>> + /* >>> + * 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_redirector_get_vnet_hdr, >>> + filter_redirector_set_vnet_hdr, NULL); >> >> Why not using object_property_add_bool()? > > Because use object_property_add_bool() we should change the option from > "vnet_hdr=on/off" to "vnet_hdr", it seems hard to read for user. > > Thanks > Zhang Chen Looks like there's no exist use case for using str as boolean. And you can probably change the name to "vnet-hdr-support" to make it more readable. Thanks
On 05/26/2017 01:30 PM, Jason Wang wrote: > > > On 2017年05月25日 20:58, Zhang Chen wrote: >>>> 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); >>>> + >>>> + /* >>>> + * 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_redirector_get_vnet_hdr, >>>> + filter_redirector_set_vnet_hdr, NULL); >>> >>> Why not using object_property_add_bool()? >> >> Because use object_property_add_bool() we should change the option from >> "vnet_hdr=on/off" to "vnet_hdr", it seems hard to read for user. >> >> Thanks >> Zhang Chen > > Looks like there's no exist use case for using str as boolean. And you > can probably change the name to "vnet-hdr-support" to make it more > readable. OK, I will change it as you said in next version. Thanks ZhangChen > > Thanks > > > . >
diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 8df0be6..6c8579f 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -381,6 +381,13 @@ static char *filter_redirector_get_outdev(Object *obj, Error **errp) return g_strdup(s->outdev); } +static char *filter_redirector_get_vnet_hdr(Object *obj, Error **errp) +{ + MirrorState *s = FILTER_REDIRECTOR(obj); + + return s->vnet_hdr ? g_strdup("on") : g_strdup("off"); +} + static void filter_redirector_set_outdev(Object *obj, const char *value, Error **errp) { @@ -390,6 +397,21 @@ filter_redirector_set_outdev(Object *obj, const char *value, Error **errp) s->outdev = g_strdup(value); } +static void filter_redirector_set_vnet_hdr(Object *obj, + const char *value, + Error **errp) +{ + MirrorState *s = FILTER_REDIRECTOR(obj); + + if (strcmp(value, "on") && strcmp(value, "off")) { + error_setg(errp, "Invalid value for filter-redirector vnet_hdr, " + "should be 'on' or 'off'"); + return; + } + + s->vnet_hdr = !strcmp(value, "on"); +} + static void filter_mirror_init(Object *obj) { MirrorState *s = FILTER_MIRROR(obj); @@ -409,10 +431,21 @@ 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); + + /* + * 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_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 81fb96b..a3c4688 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4028,11 +4028,11 @@ 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 vnet_hdr = on, 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},vnet_hdr=@var{on|off}[,queue=@var{all|rx|tx}] 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 vnet_hdr = on, +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.
We add the vnet_hdr option for filter-redirector, default is disable. If you use virtio-net-pci net driver, please enable it. Because colo-compare or other modules needs the vnet_hdr_len to parse packet, so 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=on Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> --- net/filter-mirror.c | 33 +++++++++++++++++++++++++++++++++ qemu-options.hx | 6 +++--- 2 files changed, 36 insertions(+), 3 deletions(-)