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

Commit 6463ace2 authored by Li RongQing's avatar Li RongQing Committed by Sasha Levin
Browse files

net: move definition of pcpu_lstats to header file 



[ Upstream commit 52bb6677d530d37055092d86b4eab69dce6c166a ]

pcpu_lstats is defined in several files, so unify them as one
and move to header file

Signed-off-by: default avatarZhang Yu <zhangyu31@baidu.com>
Signed-off-by: default avatarLi RongQing <lirongqing@baidu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: 1ca1ba465e55 ("geneve: make sure to pull inner header in geneve_rx()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 575689f4

drivers/net/loopback.c

+0 −6
Original line number Diff line number Diff line
@@ -59,12 +59,6 @@ 
#include <net/net_namespace.h>

#include <linux/u64_stats_sync.h>



struct pcpu_lstats {

	u64			packets;

	u64			bytes;

	struct u64_stats_sync	syncp;

};



/* The higher levels take care of making this non-reentrant (it's

 * called with bh's disabled).

 */

drivers/net/nlmon.c

+0 −6
Original line number Diff line number Diff line
@@ -6,12 +6,6 @@ 
#include <linux/if_arp.h>

#include <net/rtnetlink.h>



struct pcpu_lstats {

	u64 packets;

	u64 bytes;

	struct u64_stats_sync syncp;

};



static netdev_tx_t nlmon_xmit(struct sk_buff *skb, struct net_device *dev)

{

	int len = skb->len;

drivers/net/vsockmon.c

+4 −10
Original line number Diff line number Diff line
@@ -11,12 +11,6 @@ 
#define DEFAULT_MTU (VIRTIO_VSOCK_MAX_PKT_BUF_SIZE + \

		     sizeof(struct af_vsockmon_hdr))



struct pcpu_lstats {

	u64 rx_packets;

	u64 rx_bytes;

	struct u64_stats_sync syncp;

};



static int vsockmon_dev_init(struct net_device *dev)

{

	dev->lstats = netdev_alloc_pcpu_stats(struct pcpu_lstats);
@@ -56,8 +50,8 @@ static netdev_tx_t vsockmon_xmit(struct sk_buff *skb, struct net_device *dev) 
	struct pcpu_lstats *stats = this_cpu_ptr(dev->lstats);



	u64_stats_update_begin(&stats->syncp);

	stats->rx_bytes += len;

	stats->rx_packets++;

	stats->bytes += len;

	stats->packets++;

	u64_stats_update_end(&stats->syncp);



	dev_kfree_skb(skb);
@@ -80,8 +74,8 @@ vsockmon_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) 


		do {

			start = u64_stats_fetch_begin_irq(&vstats->syncp);

			tbytes = vstats->rx_bytes;

			tpackets = vstats->rx_packets;

			tbytes = vstats->bytes;

			tpackets = vstats->packets;

		} while (u64_stats_fetch_retry_irq(&vstats->syncp, start));



		packets += tpackets;

include/linux/netdevice.h

+6 −0
Original line number Diff line number Diff line
@@ -2383,6 +2383,12 @@ struct pcpu_sw_netstats { 
	struct u64_stats_sync   syncp;

};



struct pcpu_lstats {

	u64 packets;

	u64 bytes;

	struct u64_stats_sync syncp;

};



#define __netdev_alloc_pcpu_stats(type, gfp)				\

({									\

	typeof(type) __percpu *pcpu_stats = alloc_percpu_gfp(type, gfp);\