Skip to content

Commit 0e26977

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 08f0471 commit 0e26977

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
@@ -12186,6 +12186,35 @@ static void dev_memory_provider_uninstall(struct net_device *dev)
1218612186
}
1218712187
}
1218812188

12189+
/* devices must be UP and netdev_lock()'d */
12190+
static void netif_close_many_and_unlock(struct list_head *close_head)
12191+
{
12192+
struct net_device *dev, *tmp;
12193+
12194+
netif_close_many(close_head, false);
12195+
12196+
/* ... now unlock them */
12197+
list_for_each_entry_safe(dev, tmp, close_head, close_list) {
12198+
netdev_unlock(dev);
12199+
list_del_init(&dev->close_list);
12200+
}
12201+
}
12202+
12203+
static void netif_close_many_and_unlock_cond(struct list_head *close_head)
12204+
{
12205+
#ifdef CONFIG_LOCKDEP
12206+
/* We can only track up to MAX_LOCK_DEPTH locks per task.
12207+
*
12208+
* Reserve half the available slots for additional locks possibly
12209+
* taken by notifiers and (soft)irqs.
12210+
*/
12211+
unsigned int limit = MAX_LOCK_DEPTH / 2;
12212+
12213+
if (lockdep_depth(current) > limit)
12214+
netif_close_many_and_unlock(close_head);
12215+
#endif
12216+
}
12217+
1218912218
void unregister_netdevice_many_notify(struct list_head *head,
1219012219
u32 portid, const struct nlmsghdr *nlh)
1219112220
{
@@ -12218,17 +12247,18 @@ void unregister_netdevice_many_notify(struct list_head *head,
1221812247

1221912248
/* If device is running, close it first. Start with ops locked... */
1222012249
list_for_each_entry(dev, head, unreg_list) {
12250+
if (!(dev->flags & IFF_UP))
12251+
continue;
1222112252
if (netdev_need_ops_lock(dev)) {
1222212253
list_add_tail(&dev->close_list, &close_head);
1222312254
netdev_lock(dev);
1222412255
}
12256+
netif_close_many_and_unlock_cond(&close_head);
1222512257
}
12226-
netif_close_many(&close_head, true);
12227-
/* ... now unlock them and go over the rest. */
12258+
netif_close_many_and_unlock(&close_head);
12259+
/* ... now go over the rest. */
1222812260
list_for_each_entry(dev, head, unreg_list) {
12229-
if (netdev_need_ops_lock(dev))
12230-
netdev_unlock(dev);
12231-
else
12261+
if (!netdev_need_ops_lock(dev))
1223212262
list_add_tail(&dev->close_list, &close_head);
1223312263
}
1223412264
netif_close_many(&close_head, true);

0 commit comments

Comments
 (0)