From patchwork Tue Jan 20 16:36:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 19522 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 72B41DDF5C for ; Wed, 21 Jan 2009 03:38:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757104AbZATQiq (ORCPT ); Tue, 20 Jan 2009 11:38:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756769AbZATQip (ORCPT ); Tue, 20 Jan 2009 11:38:45 -0500 Received: from g1t0026.austin.hp.com ([15.216.28.33]:24110 "EHLO g1t0026.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756718AbZATQin (ORCPT ); Tue, 20 Jan 2009 11:38:43 -0500 Received: from g4t0009.houston.hp.com (g4t0009.houston.hp.com [16.234.32.26]) by g1t0026.austin.hp.com (Postfix) with ESMTP id 2FB77C142; Tue, 20 Jan 2009 16:38:43 +0000 (UTC) Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30]) by g4t0009.houston.hp.com (Postfix) with ESMTP id E3B70C0D3; Tue, 20 Jan 2009 16:38:42 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl.fc.hp.com (Postfix) with ESMTP id 977B539C007; Tue, 20 Jan 2009 09:38:42 -0700 (MST) X-Virus-Scanned: Debian amavisd-new at ldl.fc.hp.com Received: from ldl.fc.hp.com ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k0WMh17d+EGM; Tue, 20 Jan 2009 09:38:41 -0700 (MST) Received: from debian.lart (lart.fc.hp.com [15.11.146.31]) by ldl.fc.hp.com (Postfix) with ESMTP id E209C39C001; Tue, 20 Jan 2009 09:38:40 -0700 (MST) From: Alex Williamson Subject: [PATCH 5/5] virtio_net: Add support for VLAN filtering in the hypervisor To: netdev@vger.kernel.org Cc: rusty@rustcorp.com.au, markmc@redhat.com, kvm@vger.kernel.org Date: Tue, 20 Jan 2009 09:36:36 -0700 Message-ID: <20090120163636.10034.5080.stgit@debian.lart> In-Reply-To: <1232357520.5627.15.camel@blaa> References: <1232357520.5627.15.camel@blaa> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org VLAN filtering allows the hypervisor to drop packets from VLANs that we're not a part of, further reducing the number of extraneous packets recieved. This makes use of the VLAN virtqueue command class. The ENABLE command is used both to activate the filter and verify the existence of the functionality on the backend. Signed-off-by: Alex Williamson Acked-by: Mark McLoughlin --- Updated with suggestions from Mark McLoughlin: - VLAN packet length fix split into separate patch - Indenting fix - Lower priority VLAN enabled printk - Renamed VLAN_KILL to VLAN_DEL drivers/net/virtio_net.c | 49 +++++++++++++++++++++++++++++++++++++------- include/linux/virtio_net.h | 15 +++++++++++++ 2 files changed, 56 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index f3849d1..e07019c 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -744,6 +744,28 @@ set_mode: dev->name, allmulti ? "en" : "dis"); } +static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid) +{ + struct virtnet_info *vi = netdev_priv(dev); + u16 id = vid; + + if (virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, + VIRTIO_NET_CTRL_VLAN_ADD, &id, sizeof(id))) + printk(KERN_WARNING "%s: Failed to add VLAN ID %d.\n", + dev->name, id); +} + +static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid) +{ + struct virtnet_info *vi = netdev_priv(dev); + u16 id = vid; + + if (virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, + VIRTIO_NET_CTRL_VLAN_DEL, &id, sizeof(id))) + printk(KERN_WARNING "%s: Failed to kill VLAN ID %d.\n", + dev->name, id); +} + static struct ethtool_ops virtnet_ethtool_ops = { .set_tx_csum = virtnet_set_tx_csum, .set_sg = ethtool_op_set_sg, @@ -762,15 +784,17 @@ static int virtnet_change_mtu(struct net_device *dev, int new_mtu) } static const struct net_device_ops virtnet_netdev = { - .ndo_open = virtnet_open, - .ndo_stop = virtnet_close, - .ndo_start_xmit = start_xmit, - .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = virtnet_set_mac_address, - .ndo_set_rx_mode = virtnet_set_rx_mode, - .ndo_change_mtu = virtnet_change_mtu, + .ndo_open = virtnet_open, + .ndo_stop = virtnet_close, + .ndo_start_xmit = start_xmit, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = virtnet_set_mac_address, + .ndo_set_rx_mode = virtnet_set_rx_mode, + .ndo_change_mtu = virtnet_change_mtu, + .ndo_vlan_rx_add_vid = virnet_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = virnet_vlan_rx_kill_vid, #ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = virtnet_netpoll, + .ndo_poll_controller = virtnet_netpoll, #endif }; @@ -864,6 +888,7 @@ static int virtnet_probe(struct virtio_device *vdev) vi->cvq = NULL; else { unsigned int entries; + u8 vlan_filter = 1; /* * We use a separate stack variable here because the @@ -879,6 +904,14 @@ static int virtnet_probe(struct virtio_device *vdev) "MAC filter table allocation failed.\n"); mac_entries = 0; } + + /* Enable VLAN filtering if supported by the backend */ + if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, + VIRTIO_NET_CTRL_VLAN_ENABLE, + &vlan_filter, sizeof(vlan_filter))) { + printk(KERN_DEBUG "virtio_net: VLAN filter enabled\n"); + dev->features |= NETIF_F_HW_VLAN_FILTER; + } } /* Initialize our empty receive and send queues. */ diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 84086a6..1d7171c 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h @@ -99,4 +99,19 @@ typedef __u8 virtio_net_ctrl_ack; #define VIRTIO_NET_CTRL_MAC_TABLE_ALLOC 0 #define VIRTIO_NET_CTRL_MAC_TABLE_SET 1 +/* + * Control VLAN filtering + * + * The VLAN filter table is controlled via a simple ADD/DEL interface. + * VLAN IDs not added will be dropped. Del is the opposite of add. + * Both commands expect an out entry containing a 2 byte VLAN ID. + * The ENABLE command expects an out entry containing a single byte, + * zero to disable, non-zero to enable. The default state is disabled + * for compatibility. + */ +#define VIRTIO_NET_CTRL_VLAN 2 + #define VIRTIO_NET_CTRL_VLAN_ENABLE 0 + #define VIRTIO_NET_CTRL_VLAN_ADD 1 + #define VIRTIO_NET_CTRL_VLAN_DEL 2 + #endif /* _LINUX_VIRTIO_NET_H */