Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcf24f77 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon: drop atomic usage from rx counters 



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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a89e28e3

drivers/staging/octeon/ethernet-rx.c

+3 −20
Original line number Diff line number Diff line
@@ -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 {

drivers/staging/octeon/ethernet.c

+1 −12
Original line number Diff line number Diff line
@@ -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;