mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-04 18:09:57 +00:00
Code Issues Releases Wiki Activity

staging: octeon: drop atomic usage from rx counters

Browse source 
We have only one NAPI poll running at a time, so virtual port rx counters
can be updated normally.

Update of rx_dropped can still race with the gathering of statistics,
but full accuracy is not required there.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2016-02-19 22:47:12 +02:00 committed by Greg Kroah-Hartman
parent a89e28e3e2
commit dcf24f77e4
2 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/staging/octeon/ethernet-rx.c
View file

@ -26,8 +26,6 @@
#include <net/xfrm.h>
#endif /* CONFIG_XFRM */
#include <linux/atomic.h>
#include <asm/octeon/octeon.h>
#include "ethernet-defines.h"
@ -364,17 +362,8 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
/* Increment RX stats for virtual ports */
if (port >= CVMX_PIP_NUM_INPUT_PORTS) {
#ifdef CONFIG_64BIT
atomic64_add(1,
(atomic64_t *)&priv->stats.rx_packets);
atomic64_add(skb->len,
(atomic64_t *)&priv->stats.rx_bytes);
#else
atomic_add(1,
(atomic_t *)&priv->stats.rx_packets);
atomic_add(skb->len,
(atomic_t *)&priv->stats.rx_bytes);
#endif
priv->stats.rx_packets++;
priv->stats.rx_bytes += skb->len;
}
netif_receive_skb(skb);
} else {
@ -383,13 +372,7 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
printk_ratelimited("%s: Device not up, packet dropped\n",
dev->name);
*/
#ifdef CONFIG_64BIT
atomic64_add(1,
(atomic64_t *)&priv->stats.rx_dropped);
#else
atomic_add(1,
(atomic_t *)&priv->stats.rx_dropped);
#endif
priv->stats.rx_dropped++;
dev_kfree_skb_irq(skb);
}
} else {

13
drivers/staging/octeon/ethernet.c
View file

@ -226,18 +226,7 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
priv->stats.multicast += rx_status.multicast_packets;
priv->stats.rx_crc_errors += rx_status.inb_errors;
priv->stats.rx_frame_errors += rx_status.fcs_align_err_packets;
/*
* The drop counter must be incremented atomically
* since the RX tasklet also increments it.
*/
#ifdef CONFIG_64BIT
atomic64_add(rx_status.dropped_packets,
(atomic64_t *)&priv->stats.rx_dropped);
#else
atomic_add(rx_status.dropped_packets,
(atomic_t *)&priv->stats.rx_dropped);
#endif
priv->stats.rx_dropped += rx_status.dropped_packets;
}
return &priv->stats;