sfc: Implement adaptive IRQ moderation

[safe/jmp/linux-2.6] / drivers / net / virtio_net.c

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 1abea9d..a6f1e19 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -37,7 +37,7 @@ module_param(gso, bool, 0444);
 #define MAX_PACKET_LEN (ETH_HLEN + VLAN_HLEN + ETH_DATA_LEN)
 #define GOOD_COPY_LEN  128
 
-#define VIRTNET_SEND_COMMAND_SG_MAX    1
+#define VIRTNET_SEND_COMMAND_SG_MAX    2
 
 struct virtnet_info
 {
@@ -565,6 +565,22 @@ stop_queue:
        goto done;
 }
 
+static int virtnet_set_mac_address(struct net_device *dev, void *p)
+{
+       struct virtnet_info *vi = netdev_priv(dev);
+       struct virtio_device *vdev = vi->vdev;
+       int ret;
+
+       ret = eth_mac_addr(dev, p);
+       if (ret)
+               return ret;
+
+       vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),
+                         dev->dev_addr, dev->addr_len);
+
+       return 0;
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void virtnet_netpoll(struct net_device *dev)
 {
@@ -661,31 +677,94 @@ static int virtnet_set_tx_csum(struct net_device *dev, u32 data)
 static void virtnet_set_rx_mode(struct net_device *dev)
 {
        struct virtnet_info *vi = netdev_priv(dev);
-       struct scatterlist sg;
+       struct scatterlist sg[2];
        u8 promisc, allmulti;
+       struct virtio_net_ctrl_mac *mac_data;
+       struct dev_addr_list *addr;
+       void *buf;
+       int i;
 
        /* We can't dynamicaly set ndo_set_rx_mode, so return gracefully */
        if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX))
                return;
 
-       promisc = ((dev->flags & IFF_PROMISC) != 0 || dev->uc_count > 0);
-       allmulti = ((dev->flags & IFF_ALLMULTI) != 0 || dev->mc_count > 0);
+       promisc = ((dev->flags & IFF_PROMISC) != 0);
+       allmulti = ((dev->flags & IFF_ALLMULTI) != 0);
 
-       sg_set_buf(&sg, &promisc, sizeof(promisc));
+       sg_set_buf(sg, &promisc, sizeof(promisc));
 
        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
                                  VIRTIO_NET_CTRL_RX_PROMISC,
-                                 &sg, 1, 0))
+                                 sg, 1, 0))
                dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",
                         promisc ? "en" : "dis");
 
-       sg_set_buf(&sg, &allmulti, sizeof(allmulti));
+       sg_set_buf(sg, &allmulti, sizeof(allmulti));
 
        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
                                  VIRTIO_NET_CTRL_RX_ALLMULTI,
-                                 &sg, 1, 0))
+                                 sg, 1, 0))
                dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n",
                         allmulti ? "en" : "dis");
+
+       /* MAC filter - use one buffer for both lists */
+       mac_data = buf = kzalloc(((dev->uc_count + dev->mc_count) * ETH_ALEN) +
+                                (2 * sizeof(mac_data->entries)), GFP_ATOMIC);
+       if (!buf) {
+               dev_warn(&dev->dev, "No memory for MAC address buffer\n");
+               return;
+       }
+
+       /* Store the unicast list and count in the front of the buffer */
+       mac_data->entries = dev->uc_count;
+       addr = dev->uc_list;
+       for (i = 0; i < dev->uc_count; i++, addr = addr->next)
+               memcpy(&mac_data->macs[i][0], addr->da_addr, ETH_ALEN);
+
+       sg_set_buf(&sg[0], mac_data,
+                  sizeof(mac_data->entries) + (dev->uc_count * ETH_ALEN));
+
+       /* multicast list and count fill the end */
+       mac_data = (void *)&mac_data->macs[dev->uc_count][0];
+
+       mac_data->entries = dev->mc_count;
+       addr = dev->mc_list;
+       for (i = 0; i < dev->mc_count; i++, addr = addr->next)
+               memcpy(&mac_data->macs[i][0], addr->da_addr, ETH_ALEN);
+
+       sg_set_buf(&sg[1], mac_data,
+                  sizeof(mac_data->entries) + (dev->mc_count * ETH_ALEN));
+
+       if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
+                                 VIRTIO_NET_CTRL_MAC_TABLE_SET,
+                                 sg, 2, 0))
+               dev_warn(&dev->dev, "Failed to set MAC fitler table.\n");
+
+       kfree(buf);
+}
+
+static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
+{
+       struct virtnet_info *vi = netdev_priv(dev);
+       struct scatterlist sg;
+
+       sg_set_buf(&sg, &vid, sizeof(vid));
+
+       if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
+                                 VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0))
+               dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid);
+}
+
+static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
+{
+       struct virtnet_info *vi = netdev_priv(dev);
+       struct scatterlist sg;
+
+       sg_set_buf(&sg, &vid, sizeof(vid));
+
+       if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
+                                 VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0))
+               dev_warn(&dev->dev, "Failed to kill VLAN ID %d.\n", vid);
 }
 
 static struct ethtool_ops virtnet_ethtool_ops = {
@@ -711,9 +790,11 @@ static const struct net_device_ops virtnet_netdev = {
        .ndo_stop            = virtnet_close,
        .ndo_start_xmit      = start_xmit,
        .ndo_validate_addr   = eth_validate_addr,
-       .ndo_set_mac_address = eth_mac_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,
 #endif
@@ -795,8 +876,11 @@ static int virtnet_probe(struct virtio_device *vdev)
                vdev->config->get(vdev,
                                  offsetof(struct virtio_net_config, mac),
                                  dev->dev_addr, dev->addr_len);
-       } else
+       } else {
                random_ether_addr(dev->dev_addr);
+               vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),
+                                 dev->dev_addr, dev->addr_len);
+       }
 
        /* Set up our device-specific information */
        vi = netdev_priv(dev);
@@ -838,6 +922,9 @@ static int virtnet_probe(struct virtio_device *vdev)
                        err = PTR_ERR(vi->svq);
                        goto free_send;
                }
+
+               if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
+                       dev->features |= NETIF_F_HW_VLAN_FILTER;
        }
 
        /* Initialize our empty receive and send queues. */
@@ -866,6 +953,7 @@ static int virtnet_probe(struct virtio_device *vdev)
 
        vi->status = VIRTIO_NET_S_LINK_UP;
        virtnet_update_status(vi);
+       netif_carrier_on(dev);
 
        pr_debug("virtnet: registered device %s\n", dev->name);
        return 0;
@@ -928,7 +1016,7 @@ static unsigned int features[] = {
        VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6,
        VIRTIO_NET_F_GUEST_ECN, /* We don't yet handle UFO input. */
        VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ,
-       VIRTIO_NET_F_CTRL_RX,
+       VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN,
        VIRTIO_F_NOTIFY_ON_EMPTY,
 };