Commit 02da0b61 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'drivers-net-add-sw_netstats_rx_add-helper' 



Fabian Frederick says:

====================
drivers/net: add sw_netstats_rx_add helper

This small patchset creates netstats addition dev_sw_netstats_rx_add()
based on dev_lstats_add() and replaces some open coding
in both drivers/net and net branches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9b9dda5d 560b50cf

drivers/net/bareudp.c

+3 −8
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ struct bareudp_dev { 
static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)

{

	struct metadata_dst *tun_dst = NULL;

	struct pcpu_sw_netstats *stats;

	struct bareudp_dev *bareudp;

	unsigned short family;

	unsigned int len;
@@ -160,13 +159,9 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 


	len = skb->len;

	err = gro_cells_receive(&bareudp->gro_cells, skb);

	if (likely(err == NET_RX_SUCCESS)) {

		stats = this_cpu_ptr(bareudp->dev->tstats);

		u64_stats_update_begin(&stats->syncp);

		stats->rx_packets++;

		stats->rx_bytes += len;

		u64_stats_update_end(&stats->syncp);

	}

	if (likely(err == NET_RX_SUCCESS))

		dev_sw_netstats_rx_add(bareudp->dev, len);



	return 0;

drop:

	/* Consume bad packet */

drivers/net/geneve.c

+3 −8
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs, 
{

	struct genevehdr *gnvh = geneve_hdr(skb);

	struct metadata_dst *tun_dst = NULL;

	struct pcpu_sw_netstats *stats;

	unsigned int len;

	int err = 0;

	void *oiph;
@@ -296,13 +295,9 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs, 


	len = skb->len;

	err = gro_cells_receive(&geneve->gro_cells, skb);

	if (likely(err == NET_RX_SUCCESS)) {

		stats = this_cpu_ptr(geneve->dev->tstats);

		u64_stats_update_begin(&stats->syncp);

		stats->rx_packets++;

		stats->rx_bytes += len;

		u64_stats_update_end(&stats->syncp);

	}

	if (likely(err == NET_RX_SUCCESS))

		dev_sw_netstats_rx_add(geneve->dev, len);



	return;

drop:

	/* Consume bad packet */

drivers/net/gtp.c

+1 −7
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ static bool gtp_check_ms(struct sk_buff *skb, struct pdp_ctx *pctx, 
static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb,

			unsigned int hdrlen, unsigned int role)

{

	struct pcpu_sw_netstats *stats;



	if (!gtp_check_ms(skb, pctx, hdrlen, role)) {

		netdev_dbg(pctx->dev, "No PDP ctx for this MS\n");

		return 1;
@@ -204,11 +202,7 @@ static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb, 


	skb->dev = pctx->dev;



	stats = this_cpu_ptr(pctx->dev->tstats);

	u64_stats_update_begin(&stats->syncp);

	stats->rx_packets++;

	stats->rx_bytes += skb->len;

	u64_stats_update_end(&stats->syncp);

	dev_sw_netstats_rx_add(pctx->dev, skb->len);



	netif_rx(skb);

	return 0;

drivers/net/vxlan.c

+1 −7
Original line number Diff line number Diff line
@@ -1826,7 +1826,6 @@ static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph, 
/* Callback from net/ipv4/udp.c to receive packets */

static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)

{

	struct pcpu_sw_netstats *stats;

	struct vxlan_dev *vxlan;

	struct vxlan_sock *vs;

	struct vxlanhdr unparsed;
@@ -1940,12 +1939,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) 
		goto drop;

	}



	stats = this_cpu_ptr(vxlan->dev->tstats);

	u64_stats_update_begin(&stats->syncp);

	stats->rx_packets++;

	stats->rx_bytes += skb->len;

	u64_stats_update_end(&stats->syncp);



	dev_sw_netstats_rx_add(vxlan->dev, skb->len);

	gro_cells_receive(&vxlan->gro_cells, skb);



	rcu_read_unlock();

include/linux/netdevice.h

+10 −0
Original line number Diff line number Diff line
@@ -2543,6 +2543,16 @@ struct pcpu_lstats { 


void dev_lstats_read(struct net_device *dev, u64 *packets, u64 *bytes);



static inline void dev_sw_netstats_rx_add(struct net_device *dev, unsigned int len)

{

	struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats);



	u64_stats_update_begin(&tstats->syncp);

	tstats->rx_bytes += len;

	tstats->rx_packets++;

	u64_stats_update_end(&tstats->syncp);

}



static inline void dev_lstats_add(struct net_device *dev, unsigned int len)

{

	struct pcpu_lstats *lstats = this_cpu_ptr(dev->lstats);