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

Commit 47d74275 authored by Tejun Heo's avatar Tejun Heo Committed by David S. Miller
Browse files

percpu: add __percpu sparse annotations to net drivers 



Add __percpu sparse annotations to net drivers.

These annotations are to make sparse consider percpu variables to be
in a different address space and warn if accessed without going
through percpu accessors.  This patch doesn't affect normal builds.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d720c3e

drivers/net/chelsio/sge.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ struct sge { 
	struct sk_buff	*espibug_skb[MAX_NPORTS];

	u32		sge_control;	/* shadow value of sge control reg */

	struct sge_intr_counts stats;

	struct sge_port_stats *port_stats[MAX_NPORTS];

	struct sge_port_stats __percpu *port_stats[MAX_NPORTS];

	struct sched	*tx_sched;

	struct cmdQ cmdQ[SGE_CMDQ_N] ____cacheline_aligned_in_smp;

};

drivers/net/loopback.c

+9 −7
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ struct pcpu_lstats { 
static netdev_tx_t loopback_xmit(struct sk_buff *skb,

				 struct net_device *dev)

{

	struct pcpu_lstats *pcpu_lstats, *lb_stats;

	struct pcpu_lstats __percpu *pcpu_lstats;

	struct pcpu_lstats *lb_stats;

	int len;



	skb_orphan(skb);
@@ -80,7 +81,7 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb, 
	skb->protocol = eth_type_trans(skb, dev);



	/* it's OK to use per_cpu_ptr() because BHs are off */

	pcpu_lstats = dev->ml_priv;

	pcpu_lstats = (void __percpu __force *)dev->ml_priv;

	lb_stats = this_cpu_ptr(pcpu_lstats);



	len = skb->len;
@@ -95,14 +96,14 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb, 


static struct net_device_stats *loopback_get_stats(struct net_device *dev)

{

	const struct pcpu_lstats *pcpu_lstats;

	const struct pcpu_lstats __percpu *pcpu_lstats;

	struct net_device_stats *stats = &dev->stats;

	unsigned long bytes = 0;

	unsigned long packets = 0;

	unsigned long drops = 0;

	int i;



	pcpu_lstats = dev->ml_priv;

	pcpu_lstats = (void __percpu __force *)dev->ml_priv;

	for_each_possible_cpu(i) {

		const struct pcpu_lstats *lb_stats;
@@ -135,19 +136,20 @@ static const struct ethtool_ops loopback_ethtool_ops = { 


static int loopback_dev_init(struct net_device *dev)

{

	struct pcpu_lstats *lstats;

	struct pcpu_lstats __percpu *lstats;



	lstats = alloc_percpu(struct pcpu_lstats);

	if (!lstats)

		return -ENOMEM;



	dev->ml_priv = lstats;

	dev->ml_priv = (void __force *)lstats;

	return 0;

}



static void loopback_dev_free(struct net_device *dev)

{

	struct pcpu_lstats *lstats = dev->ml_priv;

	struct pcpu_lstats __percpu *lstats =

		(void __percpu __force *)dev->ml_priv;



	free_percpu(lstats);

	free_netdev(dev);

drivers/net/veth.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct veth_net_stats { 


struct veth_priv {

	struct net_device *peer;

	struct veth_net_stats *stats;

	struct veth_net_stats __percpu *stats;

	unsigned ip_summed;

};
@@ -263,7 +263,7 @@ static int veth_change_mtu(struct net_device *dev, int new_mtu) 


static int veth_dev_init(struct net_device *dev)

{

	struct veth_net_stats *stats;

	struct veth_net_stats __percpu *stats;

	struct veth_priv *priv;



	stats = alloc_percpu(struct veth_net_stats);

include/linux/if_macvlan.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct macvlan_dev { 
	struct hlist_node	hlist;

	struct macvlan_port	*port;

	struct net_device	*lowerdev;

	struct macvlan_rx_stats *rx_stats;

	struct macvlan_rx_stats __percpu *rx_stats;

	enum macvlan_mode	mode;

	int (*receive)(struct sk_buff *skb);

	int (*forward)(struct net_device *dev, struct sk_buff *skb);