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

Commit d3fff6c4 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: add netdev_lockdep_set_classes() helper 



It is time to add netdev_lockdep_set_classes() helper
so that lockdep annotations per device type are easier to manage.

This removes a lot of copies and missing annotations.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52fbb290

drivers/net/bonding/bond_main.c

+1 −23
Original line number Diff line number Diff line
@@ -4607,28 +4607,6 @@ static int bond_check_params(struct bond_params *params) 
	return 0;

}



static struct lock_class_key bonding_netdev_xmit_lock_key;

static struct lock_class_key bonding_netdev_addr_lock_key;

static struct lock_class_key bonding_tx_busylock_key;

static struct lock_class_key bonding_qdisc_running_key;



static void bond_set_lockdep_class_one(struct net_device *dev,

				       struct netdev_queue *txq,

				       void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock,

			  &bonding_netdev_xmit_lock_key);

}



static void bond_set_lockdep_class(struct net_device *dev)

{

	lockdep_set_class(&dev->addr_list_lock,

			  &bonding_netdev_addr_lock_key);

	netdev_for_each_tx_queue(dev, bond_set_lockdep_class_one, NULL);

	dev->qdisc_tx_busylock = &bonding_tx_busylock_key;

	dev->qdisc_running_key = &bonding_qdisc_running_key;

}



/* Called from registration process */

static int bond_init(struct net_device *bond_dev)

{
@@ -4641,7 +4619,7 @@ static int bond_init(struct net_device *bond_dev) 
	if (!bond->wq)

		return -ENOMEM;



	bond_set_lockdep_class(bond_dev);

	netdev_lockdep_set_classes(bond_dev);



	list_add_tail(&bond->bond_list, &bn->dev_list);

drivers/net/ppp/ppp_generic.c

+1 −5
Original line number Diff line number Diff line
@@ -1312,13 +1312,9 @@ ppp_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats64) 
	return stats64;

}



static struct lock_class_key ppp_tx_busylock;

static struct lock_class_key ppp_qdisc_running_key;



static int ppp_dev_init(struct net_device *dev)

{

	dev->qdisc_tx_busylock = &ppp_tx_busylock;

	dev->qdisc_running_key = &ppp_qdisc_running_key;

	netdev_lockdep_set_classes(dev);

	return 0;

}

drivers/net/team/team.c

+1 −20
Original line number Diff line number Diff line
@@ -1574,25 +1574,6 @@ static const struct team_option team_options[] = { 
	},

};



static struct lock_class_key team_netdev_xmit_lock_key;

static struct lock_class_key team_netdev_addr_lock_key;

static struct lock_class_key team_tx_busylock_key;

static struct lock_class_key team_qdisc_running_key;



static void team_set_lockdep_class_one(struct net_device *dev,

				       struct netdev_queue *txq,

				       void *unused)

{

	lockdep_set_class(&txq->_xmit_lock, &team_netdev_xmit_lock_key);

}



static void team_set_lockdep_class(struct net_device *dev)

{

	lockdep_set_class(&dev->addr_list_lock, &team_netdev_addr_lock_key);

	netdev_for_each_tx_queue(dev, team_set_lockdep_class_one, NULL);

	dev->qdisc_tx_busylock = &team_tx_busylock_key;

	dev->qdisc_running_key = &team_qdisc_running_key;

}



static int team_init(struct net_device *dev)

{
@@ -1628,7 +1609,7 @@ static int team_init(struct net_device *dev) 
		goto err_options_register;

	netif_carrier_off(dev);



	team_set_lockdep_class(dev);

	netdev_lockdep_set_classes(dev);



	return 0;

include/linux/netdevice.h

+17 −0
Original line number Diff line number Diff line
@@ -1946,6 +1946,23 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev, 
		f(dev, &dev->_tx[i], arg);

}



#define netdev_lockdep_set_classes(dev)				\

{								\

	static struct lock_class_key qdisc_tx_busylock_key;	\

	static struct lock_class_key qdisc_running_key;		\

	static struct lock_class_key qdisc_xmit_lock_key;	\

	static struct lock_class_key dev_addr_list_lock_key;	\

	unsigned int i;						\

								\

	(dev)->qdisc_tx_busylock = &qdisc_tx_busylock_key;	\

	(dev)->qdisc_running_key = &qdisc_running_key;		\

	lockdep_set_class(&(dev)->addr_list_lock,		\

			  &dev_addr_list_lock_key); 		\

	for (i = 0; i < (dev)->num_tx_queues; i++)		\

		lockdep_set_class(&(dev)->_tx[i]._xmit_lock,	\

				  &qdisc_xmit_lock_key);	\

}



struct netdev_queue *netdev_pick_tx(struct net_device *dev,

				    struct sk_buff *skb,

				    void *accel_priv);

net/bluetooth/6lowpan.c

+1 −14
Original line number Diff line number Diff line
@@ -627,22 +627,9 @@ static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev) 
	return err < 0 ? NET_XMIT_DROP : err;

}



static struct lock_class_key bt_tx_busylock;

static struct lock_class_key bt_netdev_xmit_lock_key;

static struct lock_class_key bt_qdisc_running_key;



static void bt_set_lockdep_class_one(struct net_device *dev,

				     struct netdev_queue *txq,

				     void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock, &bt_netdev_xmit_lock_key);

}



static int bt_dev_init(struct net_device *dev)

{

	netdev_for_each_tx_queue(dev, bt_set_lockdep_class_one, NULL);

	dev->qdisc_tx_busylock = &bt_tx_busylock;

	dev->qdisc_running_key = &bt_qdisc_running_key;

	netdev_lockdep_set_classes(dev);



	return 0;

}