Skip to content

Commit

Permalink
vsockmon: use standard dev_lstats_add() and dev_lstats_read()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Nov 8, 2019
1 parent b4fba47 commit 4f77eb0
Showing 1 changed file with 2 additions and 29 deletions.
31 changes: 2 additions & 29 deletions drivers/net/vsockmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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;
}

Expand Down

0 comments on commit 4f77eb0

Please sign in to comment.