]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
vsockmon: use standard dev_lstats_add() and dev_lstats_read()
authorEric Dumazet <edumazet@google.com>
Fri, 8 Nov 2019 00:27:18 +0000 (16:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Nov 2019 04:03:08 +0000 (20:03 -0800)
This cleanup will ease u64_stats_t adoption in a single location.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vsockmon.c

index 14e324b846171437bca40ce197c8588e20fc036b..e8563acf98e8d8fef019f89d814e28e979b8ba2c 100644 (file)
@@ -47,13 +47,7 @@ static int vsockmon_close(struct net_device *dev)
 
 static netdev_tx_t vsockmon_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       int len = skb->len;
-       struct pcpu_lstats *stats = this_cpu_ptr(dev->lstats);
-
-       u64_stats_update_begin(&stats->syncp);
-       stats->bytes += len;
-       stats->packets++;
-       u64_stats_update_end(&stats->syncp);
+       dev_lstats_add(dev, skb->len);
 
        dev_kfree_skb(skb);
 
@@ -63,30 +57,9 @@ static netdev_tx_t vsockmon_xmit(struct sk_buff *skb, struct net_device *dev)
 static void
 vsockmon_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
 {
-       int i;
-       u64 bytes = 0, packets = 0;
-
-       for_each_possible_cpu(i) {
-               const struct pcpu_lstats *vstats;
-               u64 tbytes, tpackets;
-               unsigned int start;
-
-               vstats = per_cpu_ptr(dev->lstats, i);
+       dev_lstats_read(dev, &stats->rx_packets, &stats->rx_bytes);
 
-               do {
-                       start = u64_stats_fetch_begin_irq(&vstats->syncp);
-                       tbytes = vstats->bytes;
-                       tpackets = vstats->packets;
-               } while (u64_stats_fetch_retry_irq(&vstats->syncp, start));
-
-               packets += tpackets;
-               bytes += tbytes;
-       }
-
-       stats->rx_packets = packets;
        stats->tx_packets = 0;
-
-       stats->rx_bytes = bytes;
        stats->tx_bytes = 0;
 }