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

Commit ab92d68f authored by Taehee Yoo's avatar Taehee Yoo Committed by David S. Miller
Browse files

net: core: add generic lockdep keys 



Some interface types could be nested.
(VLAN, BONDING, TEAM, MACSEC, MACVLAN, IPVLAN, VIRT_WIFI, VXLAN, etc..)
These interface types should set lockdep class because, without lockdep
class key, lockdep always warn about unexisting circular locking.

In the current code, these interfaces have their own lockdep class keys and
these manage itself. So that there are so many duplicate code around the
/driver/net and /net/.
This patch adds new generic lockdep keys and some helper functions for it.

This patch does below changes.
a) Add lockdep class keys in struct net_device
   - qdisc_running, xmit, addr_list, qdisc_busylock
   - these keys are used as dynamic lockdep key.
b) When net_device is being allocated, lockdep keys are registered.
   - alloc_netdev_mqs()
c) When net_device is being free'd llockdep keys are unregistered.
   - free_netdev()
d) Add generic lockdep key helper function
   - netdev_register_lockdep_key()
   - netdev_unregister_lockdep_key()
   - netdev_update_lockdep_key()
e) Remove unnecessary generic lockdep macro and functions
f) Remove unnecessary lockdep code of each interfaces.

After this patch, each interface modules don't need to maintain
their lockdep keys.

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5343da4c

drivers/net/bonding/bond_main.c

+0 −1
Original line number Diff line number Diff line
@@ -4769,7 +4769,6 @@ static int bond_init(struct net_device *bond_dev) 
		return -ENOMEM;



	bond->nest_level = SINGLE_DEPTH_NESTING;

	netdev_lockdep_set_classes(bond_dev);



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

drivers/net/ethernet/netronome/nfp/nfp_net_repr.c

+0 −18
Original line number Diff line number Diff line
@@ -299,22 +299,6 @@ static void nfp_repr_clean(struct nfp_repr *repr) 
	nfp_port_free(repr->port);

}



static struct lock_class_key nfp_repr_netdev_xmit_lock_key;

static struct lock_class_key nfp_repr_netdev_addr_lock_key;



static void nfp_repr_set_lockdep_class_one(struct net_device *dev,

					   struct netdev_queue *txq,

					   void *_unused)

{

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

}



static void nfp_repr_set_lockdep_class(struct net_device *dev)

{

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

	netdev_for_each_tx_queue(dev, nfp_repr_set_lockdep_class_one, NULL);

}



int nfp_repr_init(struct nfp_app *app, struct net_device *netdev,

		  u32 cmsg_port_id, struct nfp_port *port,

		  struct net_device *pf_netdev)
@@ -324,8 +308,6 @@ int nfp_repr_init(struct nfp_app *app, struct net_device *netdev, 
	u32 repr_cap = nn->tlv_caps.repr_cap;

	int err;



	nfp_repr_set_lockdep_class(netdev);



	repr->port = port;

	repr->dst = metadata_dst_alloc(0, METADATA_HW_PORT_MUX, GFP_KERNEL);

	if (!repr->dst)

drivers/net/hamradio/bpqether.c

+0 −22
Original line number Diff line number Diff line
@@ -107,27 +107,6 @@ struct bpqdev { 


static LIST_HEAD(bpq_devices);



/*

 * bpqether network devices are paired with ethernet devices below them, so

 * form a special "super class" of normal ethernet devices; split their locks

 * off into a separate class since they always nest.

 */

static struct lock_class_key bpq_netdev_xmit_lock_key;

static struct lock_class_key bpq_netdev_addr_lock_key;



static void bpq_set_lockdep_class_one(struct net_device *dev,

				      struct netdev_queue *txq,

				      void *_unused)

{

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

}



static void bpq_set_lockdep_class(struct net_device *dev)

{

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

	netdev_for_each_tx_queue(dev, bpq_set_lockdep_class_one, NULL);

}



/* ------------------------------------------------------------------------ */
@@ -498,7 +477,6 @@ static int bpq_new_device(struct net_device *edev) 
	err = register_netdevice(ndev);

	if (err)

		goto error;

	bpq_set_lockdep_class(ndev);



	/* List protected by RTNL */

	list_add_rcu(&bpq->bpq_list, &bpq_devices);

drivers/net/hyperv/netvsc_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -2335,8 +2335,6 @@ static int netvsc_probe(struct hv_device *dev, 
		NETIF_F_HW_VLAN_CTAG_RX;

	net->vlan_features = net->features;



	netdev_lockdep_set_classes(net);



	/* MTU range: 68 - 1500 or 65521 */

	net->min_mtu = NETVSC_MTU_MIN;

	if (nvdev->nvsp_version >= NVSP_PROTOCOL_VERSION_2)

drivers/net/ipvlan/ipvlan_main.c

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ 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;



	netdev_lockdep_set_classes(dev);



	ipvlan->pcpu_stats = netdev_alloc_pcpu_stats(struct ipvl_pcpu_stats);

	if (!ipvlan->pcpu_stats)

		return -ENOMEM;