net: wireless: sd8797: Marvell sd8797 Wi-Fi driver
[linux-2.6.git] / drivers / net / virtio_net.c
index b6d4028..0c7321c 100644 (file)
@@ -40,6 +40,15 @@ module_param(gso, bool, 0444);
 
 #define VIRTNET_SEND_COMMAND_SG_MAX    2
 
+struct virtnet_stats {
+       struct u64_stats_sync syncp;
+       u64 tx_bytes;
+       u64 tx_packets;
+
+       u64 rx_bytes;
+       u64 rx_packets;
+};
+
 struct virtnet_info {
        struct virtio_device *vdev;
        struct virtqueue *rvq, *svq, *cvq;
@@ -56,6 +65,9 @@ struct virtnet_info {
        /* Host will merge rx buffers for big packets (shake it! shake it!) */
        bool mergeable_rx_bufs;
 
+       /* Active statistics */
+       struct virtnet_stats __percpu *stats;
+
        /* Work struct for refilling if we run low on memory. */
        struct delayed_work refill;
 
@@ -209,7 +221,6 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
                        skb->dev->stats.rx_length_errors++;
                        return -EINVAL;
                }
-
                page = virtqueue_get_buf(vi->rvq, &len);
                if (!page) {
                        pr_debug("%s: rx error: %d buffers missing\n",
@@ -217,6 +228,7 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
                        skb->dev->stats.rx_length_errors++;
                        return -EINVAL;
                }
+
                if (len > PAGE_SIZE)
                        len = PAGE_SIZE;
 
@@ -230,6 +242,7 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
 static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
 {
        struct virtnet_info *vi = netdev_priv(dev);
+       struct virtnet_stats __percpu *stats = this_cpu_ptr(vi->stats);
        struct sk_buff *skb;
        struct page *page;
        struct skb_vnet_hdr *hdr;
@@ -265,8 +278,11 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
 
        hdr = skb_vnet_hdr(skb);
        skb->truesize += skb->data_len;
-       dev->stats.rx_bytes += skb->len;
-       dev->stats.rx_packets++;
+
+       u64_stats_update_begin(&stats->syncp);
+       stats->rx_bytes += skb->len;
+       stats->rx_packets++;
+       u64_stats_update_end(&stats->syncp);
 
        if (hdr->hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) {
                pr_debug("Needs csum!\n");
@@ -274,6 +290,8 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
                                          hdr->hdr.csum_start,
                                          hdr->hdr.csum_offset))
                        goto frame_err;
+       } else if (hdr->hdr.flags & VIRTIO_NET_HDR_F_DATA_VALID) {
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
        }
 
        skb->protocol = eth_type_trans(skb, dev);
@@ -446,6 +464,20 @@ static void skb_recv_done(struct virtqueue *rvq)
        }
 }
 
+static void virtnet_napi_enable(struct virtnet_info *vi)
+{
+       napi_enable(&vi->napi);
+
+       /* If all buffers were filled by other side before we napi_enabled, we
+        * won't get another interrupt, so process any outstanding packets
+        * now.  virtnet_poll wants re-enable the queue, so we disable here.
+        * We synchronize against interrupts via NAPI_STATE_SCHED */
+       if (napi_schedule_prep(&vi->napi)) {
+               virtqueue_disable_cb(vi->rvq);
+               __napi_schedule(&vi->napi);
+       }
+}
+
 static void refill_work(struct work_struct *work)
 {
        struct virtnet_info *vi;
@@ -454,7 +486,7 @@ static void refill_work(struct work_struct *work)
        vi = container_of(work, struct virtnet_info, refill.work);
        napi_disable(&vi->napi);
        still_empty = !try_fill_recv(vi, GFP_KERNEL);
-       napi_enable(&vi->napi);
+       virtnet_napi_enable(vi);
 
        /* In theory, this can happen: if we don't get any buffers in
         * we will *never* try to fill again. */
@@ -499,11 +531,16 @@ static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
 {
        struct sk_buff *skb;
        unsigned int len, tot_sgs = 0;
+       struct virtnet_stats __percpu *stats = this_cpu_ptr(vi->stats);
 
        while ((skb = virtqueue_get_buf(vi->svq, &len)) != NULL) {
                pr_debug("Sent skb %p\n", skb);
-               vi->dev->stats.tx_bytes += skb->len;
-               vi->dev->stats.tx_packets++;
+
+               u64_stats_update_begin(&stats->syncp);
+               stats->tx_bytes += skb->len;
+               stats->tx_packets++;
+               u64_stats_update_end(&stats->syncp);
+
                tot_sgs += skb_vnet_hdr(skb)->num_sg;
                dev_kfree_skb_any(skb);
        }
@@ -519,7 +556,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
 
        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                hdr->hdr.flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
-               hdr->hdr.csum_start = skb->csum_start - skb_headroom(skb);
+               hdr->hdr.csum_start = skb_checksum_start_offset(skb);
                hdr->hdr.csum_offset = skb->csum_offset;
        } else {
                hdr->hdr.flags = 0;
@@ -595,7 +632,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
         * before it gets out of hand.  Naturally, this wastes entries. */
        if (capacity < 2+MAX_SKB_FRAGS) {
                netif_stop_queue(dev);
-               if (unlikely(!virtqueue_enable_cb(vi->svq))) {
+               if (unlikely(!virtqueue_enable_cb_delayed(vi->svq))) {
                        /* More just got used, free them then recheck. */
                        capacity += free_old_xmit_skbs(vi);
                        if (capacity >= 2+MAX_SKB_FRAGS) {
@@ -625,6 +662,40 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
        return 0;
 }
 
+static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
+                                              struct rtnl_link_stats64 *tot)
+{
+       struct virtnet_info *vi = netdev_priv(dev);
+       int cpu;
+       unsigned int start;
+
+       for_each_possible_cpu(cpu) {
+               struct virtnet_stats __percpu *stats
+                       = per_cpu_ptr(vi->stats, cpu);
+               u64 tpackets, tbytes, rpackets, rbytes;
+
+               do {
+                       start = u64_stats_fetch_begin(&stats->syncp);
+                       tpackets = stats->tx_packets;
+                       tbytes   = stats->tx_bytes;
+                       rpackets = stats->rx_packets;
+                       rbytes   = stats->rx_bytes;
+               } while (u64_stats_fetch_retry(&stats->syncp, start));
+
+               tot->rx_packets += rpackets;
+               tot->tx_packets += tpackets;
+               tot->rx_bytes   += rbytes;
+               tot->tx_bytes   += tbytes;
+       }
+
+       tot->tx_dropped = dev->stats.tx_dropped;
+       tot->rx_dropped = dev->stats.rx_dropped;
+       tot->rx_length_errors = dev->stats.rx_length_errors;
+       tot->rx_frame_errors = dev->stats.rx_frame_errors;
+
+       return tot;
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void virtnet_netpoll(struct net_device *dev)
 {
@@ -638,16 +709,7 @@ static int virtnet_open(struct net_device *dev)
 {
        struct virtnet_info *vi = netdev_priv(dev);
 
-       napi_enable(&vi->napi);
-
-       /* If all buffers were filled by other side before we napi_enabled, we
-        * won't get another interrupt, so process any outstanding packets
-        * now.  virtnet_poll wants re-enable the queue, so we disable here.
-        * We synchronize against interrupts via NAPI_STATE_SCHED */
-       if (napi_schedule_prep(&vi->napi)) {
-               virtqueue_disable_cb(vi->rvq);
-               __napi_schedule(&vi->napi);
-       }
+       virtnet_napi_enable(vi);
        return 0;
 }
 
@@ -705,17 +767,6 @@ static int virtnet_close(struct net_device *dev)
        return 0;
 }
 
-static int virtnet_set_tx_csum(struct net_device *dev, u32 data)
-{
-       struct virtnet_info *vi = netdev_priv(dev);
-       struct virtio_device *vdev = vi->vdev;
-
-       if (data && !virtio_has_feature(vdev, VIRTIO_NET_F_CSUM))
-               return -ENOSYS;
-
-       return ethtool_op_set_tx_hw_csum(dev, data);
-}
-
 static void virtnet_set_rx_mode(struct net_device *dev)
 {
        struct virtnet_info *vi = netdev_priv(dev);
@@ -817,10 +868,6 @@ static void virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
 }
 
 static const struct ethtool_ops virtnet_ethtool_ops = {
-       .set_tx_csum = virtnet_set_tx_csum,
-       .set_sg = ethtool_op_set_sg,
-       .set_tso = ethtool_op_set_tso,
-       .set_ufo = ethtool_op_set_ufo,
        .get_link = ethtool_op_get_link,
 };
 
@@ -843,6 +890,7 @@ static const struct net_device_ops virtnet_netdev = {
        .ndo_set_mac_address = virtnet_set_mac_address,
        .ndo_set_rx_mode     = virtnet_set_rx_mode,
        .ndo_change_mtu      = virtnet_change_mtu,
+       .ndo_get_stats64     = virtnet_stats,
        .ndo_vlan_rx_add_vid = virtnet_vlan_rx_add_vid,
        .ndo_vlan_rx_kill_vid = virtnet_vlan_rx_kill_vid,
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -903,26 +951,34 @@ static int virtnet_probe(struct virtio_device *vdev)
        /* Set up network device as normal. */
        dev->netdev_ops = &virtnet_netdev;
        dev->features = NETIF_F_HIGHDMA;
+
        SET_ETHTOOL_OPS(dev, &virtnet_ethtool_ops);
        SET_NETDEV_DEV(dev, &vdev->dev);
 
        /* Do we support "hardware" checksums? */
-       if (csum && virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
+       if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
                /* This opens up the world of extra features. */
-               dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
-               if (gso && virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
-                       dev->features |= NETIF_F_TSO | NETIF_F_UFO
+               dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
+               if (csum)
+                       dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
+
+               if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
+                       dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO
                                | NETIF_F_TSO_ECN | NETIF_F_TSO6;
                }
                /* Individual feature bits: what can host handle? */
-               if (gso && virtio_has_feature(vdev, VIRTIO_NET_F_HOST_TSO4))
-                       dev->features |= NETIF_F_TSO;
-               if (gso && virtio_has_feature(vdev, VIRTIO_NET_F_HOST_TSO6))
-                       dev->features |= NETIF_F_TSO6;
-               if (gso && virtio_has_feature(vdev, VIRTIO_NET_F_HOST_ECN))
-                       dev->features |= NETIF_F_TSO_ECN;
-               if (gso && virtio_has_feature(vdev, VIRTIO_NET_F_HOST_UFO))
-                       dev->features |= NETIF_F_UFO;
+               if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_TSO4))
+                       dev->hw_features |= NETIF_F_TSO;
+               if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_TSO6))
+                       dev->hw_features |= NETIF_F_TSO6;
+               if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_ECN))
+                       dev->hw_features |= NETIF_F_TSO_ECN;
+               if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_UFO))
+                       dev->hw_features |= NETIF_F_UFO;
+
+               if (gso)
+                       dev->features |= dev->hw_features & (NETIF_F_ALL_TSO|NETIF_F_UFO);
+               /* (!csum && gso) case will be fixed by register_netdev() */
        }
 
        /* Configuration may specify what MAC to use.  Otherwise random. */
@@ -940,6 +996,11 @@ static int virtnet_probe(struct virtio_device *vdev)
        vi->vdev = vdev;
        vdev->priv = vi;
        vi->pages = NULL;
+       vi->stats = alloc_percpu(struct virtnet_stats);
+       err = -ENOMEM;
+       if (vi->stats == NULL)
+               goto free;
+
        INIT_DELAYED_WORK(&vi->refill, refill_work);
        sg_init_table(vi->rx_sg, ARRAY_SIZE(vi->rx_sg));
        sg_init_table(vi->tx_sg, ARRAY_SIZE(vi->tx_sg));
@@ -959,7 +1020,7 @@ static int virtnet_probe(struct virtio_device *vdev)
 
        err = vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names);
        if (err)
-               goto free;
+               goto free_stats;
 
        vi->rvq = vqs[0];
        vi->svq = vqs[1];
@@ -1004,6 +1065,8 @@ unregister:
        cancel_delayed_work_sync(&vi->refill);
 free_vqs:
        vdev->config->del_vqs(vdev);
+free_stats:
+       free_percpu(vi->stats);
 free:
        free_netdev(dev);
        return err;
@@ -1050,6 +1113,7 @@ static void __devexit virtnet_remove(struct virtio_device *vdev)
        while (vi->pages)
                __free_pages(get_a_page(vi, GFP_KERNEL), 0);
 
+       free_percpu(vi->stats);
        free_netdev(vi->dev);
 }