| Message ID | 1496829322-17099-4-git-send-email-zhangchen.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2017年06月07日 17:55, Zhang Chen wrote: > We add the vnet_hdr_support option for filter-redirector, default is disable. s/disable/disabled/ > 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. s/so// > 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> > --- > net/filter-mirror.c | 28 ++++++++++++++++++++++++++++ > qemu-options.hx | 6 +++--- > 2 files changed, 31 insertions(+), 3 deletions(-) > > diff --git a/net/filter-mirror.c b/net/filter-mirror.c > index 50aa81b..3413e82 100644 > --- a/net/filter-mirror.c > +++ b/net/filter-mirror.c > @@ -376,6 +376,13 @@ static char *filter_redirector_get_outdev(Object *obj, Error **errp) > return g_strdup(s->outdev); > } > > +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_outdev(Object *obj, const char *value, Error **errp) > { > @@ -385,6 +392,15 @@ 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, > + 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); > @@ -405,10 +421,22 @@ 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). > + */ Let's remove the comment here. > + 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 5c09fae..e78b942 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 have 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 have 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.
diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 50aa81b..3413e82 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -376,6 +376,13 @@ static char *filter_redirector_get_outdev(Object *obj, Error **errp) return g_strdup(s->outdev); } +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_outdev(Object *obj, const char *value, Error **errp) { @@ -385,6 +392,15 @@ 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, + 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); @@ -405,10 +421,22 @@ 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_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 5c09fae..e78b942 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 have 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 have 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.
We add the vnet_hdr_support 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_support Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> --- net/filter-mirror.c | 28 ++++++++++++++++++++++++++++ qemu-options.hx | 6 +++--- 2 files changed, 31 insertions(+), 3 deletions(-)