From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Np0eX-0002cC-S2 for qemu-devel@nongnu.org; Tue, 09 Mar 2010 09:43:21 -0500 Received: from [199.232.76.173] (port=60763 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Np0eX-0002bz-9M for qemu-devel@nongnu.org; Tue, 09 Mar 2010 09:43:21 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Np0eU-0000TL-VS for qemu-devel@nongnu.org; Tue, 09 Mar 2010 09:43:20 -0500 Received: from fg-out-1718.google.com ([72.14.220.156]:60937) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Np0eU-0000TE-KU for qemu-devel@nongnu.org; Tue, 09 Mar 2010 09:43:18 -0500 Received: by fg-out-1718.google.com with SMTP id 19so1001134fgg.10 for ; Tue, 09 Mar 2010 06:43:17 -0800 (PST) Message-ID: <4B965E80.3020902@codemonkey.ws> Date: Tue, 09 Mar 2010 08:43:12 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH RFC] net: add a flag to disable mac/vlan filtering References: <20100309131544.GA15319@redhat.com> In-Reply-To: <20100309131544.GA15319@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org, Alex Williamson , Andreas Plesner Jacobsen On 03/09/2010 07:15 AM, Michael S. Tsirkin wrote: > New bridge in linux 2.6.34 adds IGMP snooping support, > after which bridge should not normally flood any packets. > While we still need mac table to arm forwarding tables > after migration, we can thus ignore it for rx datapath. > > For vlan, it's possible to do filtering down the > stack simply by using bridge per guest and binding said bridge > to vlan device, which some people do. > > Since qemu has no easy way to check IGMP snooping > support in bridge or how it's connected, add options > to disable rx filtering, so that management can set it > as appropriate. > Use these options to optimise virtio-net rx path. > We still ask guest for the list of vlans/macs for > migration. > > Signed-off-by: Michael S. Tsirkin > Can't this be achieved by just disabling the feature bits? IOW, ctrl_vq=0,ctrl_vlan=0? Regards, Anthony Liguori > Cc: Alex Williamson > Cc: Andreas Plesner Jacobsen > --- > hw/virtio-net.c | 10 +++++++++- > net.h | 12 +++++++++++- > 2 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/hw/virtio-net.c b/hw/virtio-net.c > index 5c0093e..01b45ed 100644 > --- a/hw/virtio-net.c > +++ b/hw/virtio-net.c > @@ -47,6 +47,7 @@ typedef struct VirtIONet > uint8_t nomulti; > uint8_t nouni; > uint8_t nobcast; > + uint32_t filtering; > struct { > int in_use; > int first_multi; > @@ -475,12 +476,17 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size) > ptr += sizeof(struct virtio_net_hdr); > } > > - if (!memcmp(&ptr[12], vlan, sizeof(vlan))) { > + if ((n->filtering& (0x1<< NICCONF_F_VLAN_FILTERING))&& > + !memcmp(&ptr[12], vlan, sizeof(vlan))) { > int vid = be16_to_cpup((uint16_t *)(ptr + 14))& 0xfff; > if (!(n->vlans[vid>> 5]& (1U<< (vid& 0x1f)))) > return 0; > } > > + if (!(n->filtering& (0x1<< NICCONF_F_MAC_FILTERING))) { > + return 1; > + } > + > if (ptr[0]& 1) { // multicast > if (!memcmp(ptr, bcast, sizeof(bcast))) { > return !n->nobcast; > @@ -863,6 +869,8 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf) > > n->mac_table.macs = qemu_mallocz(MAC_TABLE_ENTRIES * ETH_ALEN); > > + n->filtering = conf->filtering; > + > n->vlans = qemu_mallocz(MAX_VLAN>> 3); > > register_savevm("virtio-net", virtio_net_id++, VIRTIO_NET_VM_VERSION, > diff --git a/net.h b/net.h > index 33a1eaf..459ede5 100644 > --- a/net.h > +++ b/net.h > @@ -18,12 +18,22 @@ typedef struct NICConf { > MACAddr macaddr; > VLANState *vlan; > VLANClientState *peer; > + uint32_t filtering; > } NICConf; > > +enum { > + NICCONF_F_MAC_FILTERING = 0, > + NICCONF_F_VLAN_FILTERING = 1 > +}; > + > #define DEFINE_NIC_PROPERTIES(_state, _conf) \ > DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \ > DEFINE_PROP_VLAN("vlan", _state, _conf.vlan), \ > - DEFINE_PROP_NETDEV("netdev", _state, _conf.peer) > + DEFINE_PROP_NETDEV("netdev", _state, _conf.peer), \ > + DEFINE_PROP_BIT("mac_filtering", _state, _conf.filtering, \ > + NICCONF_F_MAC_FILTERING, true) \ > + DEFINE_PROP_BIT("vlan_filtering", _state, _conf.filtering, \ > + NICCONF_F_VLAN_FILTERING, true) \ > > /* VLANs support */ > >