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

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

Merge branch 'netdev_lockdep_set_classes' 



Eric Dumazet says:

====================
net: better lockdep annotations

Introduction of qdisc->running seqcount added lockdep false positives.

While chasing the bug, it came to me that we had a lot of copies of the
same stuff in virtual drivers.

This patch series has the qdisc->running fix (considers that a trylock
is attempted in lockdep terminology), and adds a generic helper so
that we no longer have to patch many virtual drivers when a new per-device
or per-qdisc lock is added.

Thanks to David Ahern for reporting the issue and testing my patches :)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5362855a 0d7dd798

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/ipvlan/ipvlan_main.c

+1 −21
Original line number Diff line number Diff line
@@ -80,13 +80,6 @@ static void ipvlan_port_destroy(struct net_device *dev) 
	kfree_rcu(port, rcu);

}



/* ipvlan network devices have devices nesting below it and are a special

 * "super class" of normal network devices; split their locks off into a

 * separate class since they always nest.

 */

static struct lock_class_key ipvlan_netdev_xmit_lock_key;

static struct lock_class_key ipvlan_netdev_addr_lock_key;



#define IPVLAN_FEATURES \

	(NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \

	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \
@@ -96,19 +89,6 @@ static struct lock_class_key ipvlan_netdev_addr_lock_key; 
#define IPVLAN_STATE_MASK \

	((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))



static void ipvlan_set_lockdep_class_one(struct net_device *dev,

					 struct netdev_queue *txq,

					 void *_unused)

{

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

}



static void ipvlan_set_lockdep_class(struct net_device *dev)

{

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

	netdev_for_each_tx_queue(dev, ipvlan_set_lockdep_class_one, NULL);

}



static int ipvlan_init(struct net_device *dev)

{

	struct ipvl_dev *ipvlan = netdev_priv(dev);
@@ -123,7 +103,7 @@ static int ipvlan_init(struct net_device *dev) 
	dev->gso_max_segs = phy_dev->gso_max_segs;

	dev->hard_header_len = phy_dev->hard_header_len;



	ipvlan_set_lockdep_class(dev);

	netdev_lockdep_set_classes(dev);



	ipvlan->pcpu_stats = alloc_percpu(struct ipvl_pcpu_stats);

	if (!ipvlan->pcpu_stats)

drivers/net/macvlan.c

+1 −10
Original line number Diff line number Diff line
@@ -788,7 +788,6 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu) 
 * "super class" of normal network devices; split their locks off into a

 * separate class since they always nest.

 */

static struct lock_class_key macvlan_netdev_xmit_lock_key;

static struct lock_class_key macvlan_netdev_addr_lock_key;



#define ALWAYS_ON_FEATURES \
@@ -809,20 +808,12 @@ static int macvlan_get_nest_level(struct net_device *dev) 
	return ((struct macvlan_dev *)netdev_priv(dev))->nest_level;

}



static void macvlan_set_lockdep_class_one(struct net_device *dev,

					  struct netdev_queue *txq,

					  void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock,

			  &macvlan_netdev_xmit_lock_key);

}



static void macvlan_set_lockdep_class(struct net_device *dev)

{

	netdev_lockdep_set_classes(dev);

	lockdep_set_class_and_subclass(&dev->addr_list_lock,

				       &macvlan_netdev_addr_lock_key,

				       macvlan_get_nest_level(dev));

	netdev_for_each_tx_queue(dev, macvlan_set_lockdep_class_one, NULL);

}



static int macvlan_init(struct net_device *dev)

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;