* [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN
@ 2014-03-26 10:29 Amos Kong
2014-03-26 10:55 ` Michael S. Tsirkin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Amos Kong @ 2014-03-26 10:29 UTC (permalink / raw)
To: qemu-devel; +Cc: vyasevic, sf, stefanha, aliguori, mst
From: Stefan Fritsch <sf@sfritsch.de>
If VIRTIO_NET_F_CTRL_VLAN is not negotiated, do not filter out all
VLAN-tagged packets but send them to the guest.
This fixes VLANs with OpenBSD guests (and probably NetBSD, too, because
the OpenBSD driver started as a port from NetBSD).
Signed-off-by: Stefan Fritsch <sf@sfritsch.de>
Signed-off-by: Amos Kong <akong@redhat.com>
---
V2: it's not good to check guest features at reset time,
so reset vlan table in setting features
---
hw/net/virtio-net.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 43b4eda..439477b 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -530,6 +530,12 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features)
}
vhost_net_ack_features(tap_get_vhost_net(nc->peer), features);
}
+
+ if ((1 << VIRTIO_NET_F_CTRL_VLAN) & features) {
+ memset(n->vlans, 0, MAX_VLAN >> 3);
+ } else {
+ memset(n->vlans, 0xff, MAX_VLAN >> 3);
+ }
}
static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd,
--
1.8.5.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN
2014-03-26 10:29 [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN Amos Kong
@ 2014-03-26 10:55 ` Michael S. Tsirkin
2014-03-26 11:07 ` Amos Kong
2014-03-26 10:55 ` Michael S. Tsirkin
2014-03-26 13:39 ` Vlad Yasevich
2 siblings, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2014-03-26 10:55 UTC (permalink / raw)
To: Amos Kong; +Cc: vyasevic, aliguori, qemu-devel, qemu-stable, stefanha, sf
On Wed, Mar 26, 2014 at 06:29:52PM +0800, Amos Kong wrote:
> From: Stefan Fritsch <sf@sfritsch.de>
>
> If VIRTIO_NET_F_CTRL_VLAN is not negotiated, do not filter out all
> VLAN-tagged packets but send them to the guest.
>
> This fixes VLANs with OpenBSD guests (and probably NetBSD, too, because
> the OpenBSD driver started as a port from NetBSD).
>
> Signed-off-by: Stefan Fritsch <sf@sfritsch.de>
> Signed-off-by: Amos Kong <akong@redhat.com>
I think this is also -stable material, isn't it?
> ---
> V2: it's not good to check guest features at reset time,
> so reset vlan table in setting features
> ---
> hw/net/virtio-net.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 43b4eda..439477b 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -530,6 +530,12 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features)
> }
> vhost_net_ack_features(tap_get_vhost_net(nc->peer), features);
> }
> +
> + if ((1 << VIRTIO_NET_F_CTRL_VLAN) & features) {
> + memset(n->vlans, 0, MAX_VLAN >> 3);
> + } else {
> + memset(n->vlans, 0xff, MAX_VLAN >> 3);
> + }
> }
>
> static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd,
> --
> 1.8.5.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN
2014-03-26 10:29 [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN Amos Kong
2014-03-26 10:55 ` Michael S. Tsirkin
@ 2014-03-26 10:55 ` Michael S. Tsirkin
2014-03-26 13:39 ` Vlad Yasevich
2 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2014-03-26 10:55 UTC (permalink / raw)
To: Amos Kong; +Cc: vyasevic, aliguori, qemu-devel, qemu-stable, stefanha, sf
On Wed, Mar 26, 2014 at 06:29:52PM +0800, Amos Kong wrote:
> From: Stefan Fritsch <sf@sfritsch.de>
>
> If VIRTIO_NET_F_CTRL_VLAN is not negotiated, do not filter out all
> VLAN-tagged packets but send them to the guest.
>
> This fixes VLANs with OpenBSD guests (and probably NetBSD, too, because
> the OpenBSD driver started as a port from NetBSD).
>
> Signed-off-by: Stefan Fritsch <sf@sfritsch.de>
> Signed-off-by: Amos Kong <akong@redhat.com>
I think this is also -stable material.
> ---
> V2: it's not good to check guest features at reset time,
> so reset vlan table in setting features
> ---
> hw/net/virtio-net.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 43b4eda..439477b 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -530,6 +530,12 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features)
> }
> vhost_net_ack_features(tap_get_vhost_net(nc->peer), features);
> }
> +
> + if ((1 << VIRTIO_NET_F_CTRL_VLAN) & features) {
> + memset(n->vlans, 0, MAX_VLAN >> 3);
> + } else {
> + memset(n->vlans, 0xff, MAX_VLAN >> 3);
> + }
> }
>
> static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd,
> --
> 1.8.5.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN
2014-03-26 10:55 ` Michael S. Tsirkin
@ 2014-03-26 11:07 ` Amos Kong
0 siblings, 0 replies; 5+ messages in thread
From: Amos Kong @ 2014-03-26 11:07 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: vyasevic, aliguori, qemu-devel, qemu-stable, stefanha, sf
On Wed, Mar 26, 2014 at 12:55:18PM +0200, Michael S. Tsirkin wrote:
> On Wed, Mar 26, 2014 at 06:29:52PM +0800, Amos Kong wrote:
> > From: Stefan Fritsch <sf@sfritsch.de>
> >
> > If VIRTIO_NET_F_CTRL_VLAN is not negotiated, do not filter out all
> > VLAN-tagged packets but send them to the guest.
> >
> > This fixes VLANs with OpenBSD guests (and probably NetBSD, too, because
> > the OpenBSD driver started as a port from NetBSD).
> >
> > Signed-off-by: Stefan Fritsch <sf@sfritsch.de>
> > Signed-off-by: Amos Kong <akong@redhat.com>
>
> I think this is also -stable material, isn't it?
Yes, it is.
> > ---
> > V2: it's not good to check guest features at reset time,
> > so reset vlan table in setting features
> > ---
> > hw/net/virtio-net.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> > index 43b4eda..439477b 100644
> > --- a/hw/net/virtio-net.c
> > +++ b/hw/net/virtio-net.c
> > @@ -530,6 +530,12 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features)
> > }
> > vhost_net_ack_features(tap_get_vhost_net(nc->peer), features);
> > }
> > +
> > + if ((1 << VIRTIO_NET_F_CTRL_VLAN) & features) {
> > + memset(n->vlans, 0, MAX_VLAN >> 3);
> > + } else {
> > + memset(n->vlans, 0xff, MAX_VLAN >> 3);
> > + }
> > }
> >
> > static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd,
> > --
> > 1.8.5.3
--
Amos.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN
2014-03-26 10:29 [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN Amos Kong
2014-03-26 10:55 ` Michael S. Tsirkin
2014-03-26 10:55 ` Michael S. Tsirkin
@ 2014-03-26 13:39 ` Vlad Yasevich
2 siblings, 0 replies; 5+ messages in thread
From: Vlad Yasevich @ 2014-03-26 13:39 UTC (permalink / raw)
To: Amos Kong, qemu-devel; +Cc: sf, stefanha, aliguori, mst
On 03/26/2014 06:29 AM, Amos Kong wrote:
> From: Stefan Fritsch <sf@sfritsch.de>
>
> If VIRTIO_NET_F_CTRL_VLAN is not negotiated, do not filter out all
> VLAN-tagged packets but send them to the guest.
>
> This fixes VLANs with OpenBSD guests (and probably NetBSD, too, because
> the OpenBSD driver started as a port from NetBSD).
>
> Signed-off-by: Stefan Fritsch <sf@sfritsch.de>
> Signed-off-by: Amos Kong <akong@redhat.com>
> ---
> V2: it's not good to check guest features at reset time,
> so reset vlan table in setting features
> ---
> hw/net/virtio-net.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 43b4eda..439477b 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -530,6 +530,12 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features)
> }
> vhost_net_ack_features(tap_get_vhost_net(nc->peer), features);
> }
> +
> + if ((1 << VIRTIO_NET_F_CTRL_VLAN) & features) {
> + memset(n->vlans, 0, MAX_VLAN >> 3);
> + } else {
> + memset(n->vlans, 0xff, MAX_VLAN >> 3);
> + }
> }
>
> static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd,
>
Reviewed-by: Vlad Yasevich <vyasevic@redhat.com>
-vlad
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-26 13:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-26 10:29 [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs without F_CTRL_VLAN Amos Kong
2014-03-26 10:55 ` Michael S. Tsirkin
2014-03-26 11:07 ` Amos Kong
2014-03-26 10:55 ` Michael S. Tsirkin
2014-03-26 13:39 ` Vlad Yasevich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).