| Message ID | 1456710366-10980-2-git-send-email-zhang.zhanghailiang@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/29/2016 09:46 AM, zhanghailiang wrote: > With this property, users can control if this filter is 'on' > or 'off'. The default behavior for filter is 'on'. > > For some types of filters, they may need to react to status changing, > So here, we introduced status changing callback/notifier for filter class. > > We will skip the disabled ('off') filter when delivering packets in net layer. > > Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > Cc: Jason Wang <jasowang@redhat.com> > Cc: Yang Hongyang <hongyang.yang@easystack.cn> > --- > v2: > - Split the processing of buffer-filter into a new patch (Jason) > - Use 'status' instead of 'enabled' to store the filter state (Jason) > - Rename FilterDisable() callback to FilterStatusChanged(Jason) > --- Thanks, looks good, just few nits. > include/net/filter.h | 4 ++++ > net/filter.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > qemu-options.hx | 4 +++- > 3 files changed, 49 insertions(+), 1 deletion(-) > > diff --git a/include/net/filter.h b/include/net/filter.h > index 5639976..ebef0dc 100644 > --- a/include/net/filter.h > +++ b/include/net/filter.h > @@ -36,12 +36,15 @@ typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc, > int iovcnt, > NetPacketSent *sent_cb); > > +typedef void (FilterStatusChanged) (NetFilterState *nf, Error **errp); > + > typedef struct NetFilterClass { > ObjectClass parent_class; > > /* optional */ > FilterSetup *setup; > FilterCleanup *cleanup; > + FilterStatusChanged *status_changed; > /* mandatory */ > FilterReceiveIOV *receive_iov; > } NetFilterClass; > @@ -55,6 +58,7 @@ struct NetFilterState { > char *netdev_id; > NetClientState *netdev; > NetFilterDirection direction; > + char *status; Let's use bool instead.
On 2016/2/29 15:26, Jason Wang wrote: > > > On 02/29/2016 09:46 AM, zhanghailiang wrote: >> With this property, users can control if this filter is 'on' >> or 'off'. The default behavior for filter is 'on'. >> >> For some types of filters, they may need to react to status changing, >> So here, we introduced status changing callback/notifier for filter class. >> >> We will skip the disabled ('off') filter when delivering packets in net layer. >> >> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> >> Cc: Jason Wang <jasowang@redhat.com> >> Cc: Yang Hongyang <hongyang.yang@easystack.cn> >> --- >> v2: >> - Split the processing of buffer-filter into a new patch (Jason) >> - Use 'status' instead of 'enabled' to store the filter state (Jason) >> - Rename FilterDisable() callback to FilterStatusChanged(Jason) >> --- > > Thanks, looks good, just few nits. > >> include/net/filter.h | 4 ++++ >> net/filter.c | 42 ++++++++++++++++++++++++++++++++++++++++++ >> qemu-options.hx | 4 +++- >> 3 files changed, 49 insertions(+), 1 deletion(-) >> >> diff --git a/include/net/filter.h b/include/net/filter.h >> index 5639976..ebef0dc 100644 >> --- a/include/net/filter.h >> +++ b/include/net/filter.h >> @@ -36,12 +36,15 @@ typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc, >> int iovcnt, >> NetPacketSent *sent_cb); >> >> +typedef void (FilterStatusChanged) (NetFilterState *nf, Error **errp); >> + >> typedef struct NetFilterClass { >> ObjectClass parent_class; >> >> /* optional */ >> FilterSetup *setup; >> FilterCleanup *cleanup; >> + FilterStatusChanged *status_changed; >> /* mandatory */ >> FilterReceiveIOV *receive_iov; >> } NetFilterClass; >> @@ -55,6 +58,7 @@ struct NetFilterState { >> char *netdev_id; >> NetClientState *netdev; >> NetFilterDirection direction; >> + char *status; > > Let's use bool instead. > Er, then status=true means 'on' ? false means 'off' ? That looks odd. What about using 'bool status_on' ? > > . >
On 02/29/2016 03:34 PM, Hailiang Zhang wrote: > On 2016/2/29 15:26, Jason Wang wrote: >> >> >> On 02/29/2016 09:46 AM, zhanghailiang wrote: >>> With this property, users can control if this filter is 'on' >>> or 'off'. The default behavior for filter is 'on'. >>> >>> For some types of filters, they may need to react to status changing, >>> So here, we introduced status changing callback/notifier for filter >>> class. >>> >>> We will skip the disabled ('off') filter when delivering packets in >>> net layer. >>> >>> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> >>> Cc: Jason Wang <jasowang@redhat.com> >>> Cc: Yang Hongyang <hongyang.yang@easystack.cn> >>> --- >>> v2: >>> - Split the processing of buffer-filter into a new patch (Jason) >>> - Use 'status' instead of 'enabled' to store the filter state (Jason) >>> - Rename FilterDisable() callback to FilterStatusChanged(Jason) >>> --- >> >> Thanks, looks good, just few nits. >> >>> include/net/filter.h | 4 ++++ >>> net/filter.c | 42 ++++++++++++++++++++++++++++++++++++++++++ >>> qemu-options.hx | 4 +++- >>> 3 files changed, 49 insertions(+), 1 deletion(-) >>> >>> diff --git a/include/net/filter.h b/include/net/filter.h >>> index 5639976..ebef0dc 100644 >>> --- a/include/net/filter.h >>> +++ b/include/net/filter.h >>> @@ -36,12 +36,15 @@ typedef ssize_t >>> (FilterReceiveIOV)(NetFilterState *nc, >>> int iovcnt, >>> NetPacketSent *sent_cb); >>> >>> +typedef void (FilterStatusChanged) (NetFilterState *nf, Error **errp); >>> + >>> typedef struct NetFilterClass { >>> ObjectClass parent_class; >>> >>> /* optional */ >>> FilterSetup *setup; >>> FilterCleanup *cleanup; >>> + FilterStatusChanged *status_changed; >>> /* mandatory */ >>> FilterReceiveIOV *receive_iov; >>> } NetFilterClass; >>> @@ -55,6 +58,7 @@ struct NetFilterState { >>> char *netdev_id; >>> NetClientState *netdev; >>> NetFilterDirection direction; >>> + char *status; >> >> Let's use bool instead. >> > > Er, then status=true means 'on' ? false means 'off' ? > That looks odd. What about using 'bool status_on' ? Or just "bool on" :) > >> >> . >> > >
diff --git a/include/net/filter.h b/include/net/filter.h index 5639976..ebef0dc 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -36,12 +36,15 @@ typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc, int iovcnt, NetPacketSent *sent_cb); +typedef void (FilterStatusChanged) (NetFilterState *nf, Error **errp); + typedef struct NetFilterClass { ObjectClass parent_class; /* optional */ FilterSetup *setup; FilterCleanup *cleanup; + FilterStatusChanged *status_changed; /* mandatory */ FilterReceiveIOV *receive_iov; } NetFilterClass; @@ -55,6 +58,7 @@ struct NetFilterState { char *netdev_id; NetClientState *netdev; NetFilterDirection direction; + char *status; QTAILQ_ENTRY(NetFilterState) next; }; diff --git a/net/filter.c b/net/filter.c index d2a514e..68b7bba 100644 --- a/net/filter.c +++ b/net/filter.c @@ -17,6 +17,11 @@ #include "qom/object_interfaces.h" #include "qemu/iov.h" +static inline bool qemu_can_skip_netfilter(NetFilterState *nf) +{ + return !!strcmp(nf->status, "on"); +} + ssize_t qemu_netfilter_receive(NetFilterState *nf, NetFilterDirection direction, NetClientState *sender, @@ -25,6 +30,9 @@ ssize_t qemu_netfilter_receive(NetFilterState *nf, int iovcnt, NetPacketSent *sent_cb) { + if (qemu_can_skip_netfilter(nf)) { + return 0; + } if (nf->direction == direction || nf->direction == NET_FILTER_DIRECTION_ALL) { return NETFILTER_GET_CLASS(OBJECT(nf))->receive_iov( @@ -134,8 +142,39 @@ static void netfilter_set_direction(Object *obj, int direction, Error **errp) nf->direction = direction; } +static char *netfilter_get_status(Object *obj, Error **errp) +{ + NetFilterState *nf = NETFILTER(obj); + + return g_strdup(nf->status); +} + +static void netfilter_set_status(Object *obj, const char *str, Error **errp) +{ + NetFilterState *nf = NETFILTER(obj); + NetFilterClass *nfc = NETFILTER_GET_CLASS(obj); + + if (!strcmp(nf->status, str)) { + return; + } + if (strcmp(str, "on") && strcmp(str, "off")) { + error_setg(errp, "Invalid value for netfilter status, " + "should be 'on' or 'off'"); + return; + } + g_free(nf->status); + nf->status = g_strdup(str); + if (nfc->status_changed) { + nfc->status_changed(nf, errp); + } +} + static void netfilter_init(Object *obj) { + NetFilterState *nf = NETFILTER(obj); + + nf->status = g_strdup("on"); + object_property_add_str(obj, "netdev", netfilter_get_netdev_id, netfilter_set_netdev_id, NULL); @@ -143,6 +182,9 @@ static void netfilter_init(Object *obj) NetFilterDirection_lookup, netfilter_get_direction, netfilter_set_direction, NULL); + object_property_add_str(obj, "status", + netfilter_get_status, netfilter_set_status, + NULL); } static void netfilter_complete(UserCreatable *uc, Error **errp) diff --git a/qemu-options.hx b/qemu-options.hx index 599db94..5291347 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3787,11 +3787,13 @@ version by providing the @var{passwordid} parameter. This provides the ID of a previously created @code{secret} object containing the password for decryption. -@item -object filter-buffer,id=@var{id},netdev=@var{netdevid},interval=@var{t}[,queue=@var{all|rx|tx}] +@item -object filter-buffer,id=@var{id},netdev=@var{netdevid},interval=@var{t}[,queue=@var{all|rx|tx}][,status=@var{on|off}] Interval @var{t} can't be 0, this filter batches the packet delivery: all packets arriving in a given interval on netdev @var{netdevid} are delayed until the end of the interval. Interval is in microseconds. +@option{status} is optional that indicate whether the netfilter is +on (enabled) or off (disabled), the default status for netfilter will be 'on'. queue @var{all|rx|tx} is an option that can be applied to any netfilter.
With this property, users can control if this filter is 'on' or 'off'. The default behavior for filter is 'on'. For some types of filters, they may need to react to status changing, So here, we introduced status changing callback/notifier for filter class. We will skip the disabled ('off') filter when delivering packets in net layer. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Yang Hongyang <hongyang.yang@easystack.cn> --- v2: - Split the processing of buffer-filter into a new patch (Jason) - Use 'status' instead of 'enabled' to store the filter state (Jason) - Rename FilterDisable() callback to FilterStatusChanged(Jason) --- include/net/filter.h | 4 ++++ net/filter.c | 42 ++++++++++++++++++++++++++++++++++++++++++ qemu-options.hx | 4 +++- 3 files changed, 49 insertions(+), 1 deletion(-)