Skip to content

Commit f0ee5d2

Browse files
Florian WestphalNipaLocal
authored andcommitted
net: core: fix lockdep splat on device unregister
Since blamed commit, unregister_netdevice_many_notify() takes the netdev mutex if the device needs it. If the device list is too long, this will lock more device mutexes than lockdep can handle: unshare -n \ bash -c 'for i in $(seq 1 100);do ip link add foo$i type dummy;done' BUG: MAX_LOCK_DEPTH too low! turning off the locking correctness validator. depth: 48 max: 48! 48 locks held by kworker/u16:1/69: #0: ..148 ((wq_completion)netns){+.+.}-{0:0}, at: process_one_work kernel-patches#1: ..d40 (net_cleanup_work){+.+.}-{0:0}, at: process_one_work kernel-patches#2: ..bd0 (pernet_ops_rwsem){++++}-{4:4}, at: cleanup_net kernel-patches#3: ..aa8 (rtnl_mutex){+.+.}-{4:4}, at: default_device_exit_batch kernel-patches#4: ..cb0 (&dev_instance_lock_key#3){+.+.}-{4:4}, at: unregister_netdevice_many_notify [..] Add a helper to close and then unlock a list of net_devices. Devices that are not up have to be skipped - netif_close_many always removes them from the list without any other actions taken, so they'd remain in locked state. Close devices whenever we've used up half of the tracking slots or we processed entire list without hitting the limit. Fixes: 7e4d784 ("net: hold netdev instance lock during rtnetlink operations") Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: NipaLocal <nipa@local>
1 parent 5faa5e9 commit f0ee5d2

File tree

1 file changed

+35
-5
lines changed

1 file changed

+35
-5
lines changed

net/core/dev.c

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12201,6 +12201,35 @@ static void dev_memory_provider_uninstall(struct net_device *dev)
1220112201
}
1220212202
}
1220312203

12204+
/* devices must be UP and netdev_lock()'d */
12205+
static void netif_close_many_and_unlock(struct list_head *close_head)
12206+
{
12207+
struct net_device *dev, *tmp;
12208+
12209+
netif_close_many(close_head, false);
12210+
12211+
/* ... now unlock them */
12212+
list_for_each_entry_safe(dev, tmp, close_head, close_list) {
12213+
netdev_unlock(dev);
12214+
list_del_init(&dev->close_list);
12215+
}
12216+
}
12217+
12218+
static void netif_close_many_and_unlock_cond(struct list_head *close_head)
12219+
{
12220+
#ifdef CONFIG_LOCKDEP
12221+
/* We can only track up to MAX_LOCK_DEPTH locks per task.
12222+
*
12223+
* Reserve half the available slots for additional locks possibly
12224+
* taken by notifiers and (soft)irqs.
12225+
*/
12226+
unsigned int limit = MAX_LOCK_DEPTH / 2;
12227+
12228+
if (lockdep_depth(current) > limit)
12229+
netif_close_many_and_unlock(close_head);
12230+
#endif
12231+
}
12232+
1220412233
void unregister_netdevice_many_notify(struct list_head *head,
1220512234
u32 portid, const struct nlmsghdr *nlh)
1220612235
{
@@ -12233,17 +12262,18 @@ void unregister_netdevice_many_notify(struct list_head *head,
1223312262

1223412263
/* If device is running, close it first. Start with ops locked... */
1223512264
list_for_each_entry(dev, head, unreg_list) {
12265+
if (!(dev->flags & IFF_UP))
12266+
continue;
1223612267
if (netdev_need_ops_lock(dev)) {
1223712268
list_add_tail(&dev->close_list, &close_head);
1223812269
netdev_lock(dev);
1223912270
}
12271+
netif_close_many_and_unlock_cond(&close_head);
1224012272
}
12241-
netif_close_many(&close_head, true);
12242-
/* ... now unlock them and go over the rest. */
12273+
netif_close_many_and_unlock(&close_head);
12274+
/* ... now go over the rest. */
1224312275
list_for_each_entry(dev, head, unreg_list) {
12244-
if (netdev_need_ops_lock(dev))
12245-
netdev_unlock(dev);
12246-
else
12276+
if (!netdev_need_ops_lock(dev))
1224712277
list_add_tail(&dev->close_list, &close_head);
1224812278
}
1224912279
netif_close_many(&close_head, true);

0 commit comments

Comments
 (0)