Skip to content

Commit 7f0fddd

Browse files
Florian Westphalkuba-moo
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 #1: ..d40 (net_cleanup_work){+.+.}-{0:0}, at: process_one_work #2: ..bd0 (pernet_ops_rwsem){++++}-{4:4}, at: cleanup_net #3: ..aa8 (rtnl_mutex){+.+.}-{4:4}, at: default_device_exit_batch #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]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent df5a1f4 commit 7f0fddd

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
@@ -12176,6 +12176,35 @@ static void dev_memory_provider_uninstall(struct net_device *dev)
1217612176
}
1217712177
}
1217812178

12179+
/* devices must be UP and netdev_lock()'d */
12180+
static void netif_close_many_and_unlock(struct list_head *close_head)
12181+
{
12182+
struct net_device *dev, *tmp;
12183+
12184+
netif_close_many(close_head, false);
12185+
12186+
/* ... now unlock them */
12187+
list_for_each_entry_safe(dev, tmp, close_head, close_list) {
12188+
netdev_unlock(dev);
12189+
list_del_init(&dev->close_list);
12190+
}
12191+
}
12192+
12193+
static void netif_close_many_and_unlock_cond(struct list_head *close_head)
12194+
{
12195+
#ifdef CONFIG_LOCKDEP
12196+
/* We can only track up to MAX_LOCK_DEPTH locks per task.
12197+
*
12198+
* Reserve half the available slots for additional locks possibly
12199+
* taken by notifiers and (soft)irqs.
12200+
*/
12201+
unsigned int limit = MAX_LOCK_DEPTH / 2;
12202+
12203+
if (lockdep_depth(current) > limit)
12204+
netif_close_many_and_unlock(close_head);
12205+
#endif
12206+
}
12207+
1217912208
void unregister_netdevice_many_notify(struct list_head *head,
1218012209
u32 portid, const struct nlmsghdr *nlh)
1218112210
{
@@ -12208,17 +12237,18 @@ void unregister_netdevice_many_notify(struct list_head *head,
1220812237

1220912238
/* If device is running, close it first. Start with ops locked... */
1221012239
list_for_each_entry(dev, head, unreg_list) {
12240+
if (!(dev->flags & IFF_UP))
12241+
continue;
1221112242
if (netdev_need_ops_lock(dev)) {
1221212243
list_add_tail(&dev->close_list, &close_head);
1221312244
netdev_lock(dev);
1221412245
}
12246+
netif_close_many_and_unlock_cond(&close_head);
1221512247
}
12216-
netif_close_many(&close_head, true);
12217-
/* ... now unlock them and go over the rest. */
12248+
netif_close_many_and_unlock(&close_head);
12249+
/* ... now go over the rest. */
1221812250
list_for_each_entry(dev, head, unreg_list) {
12219-
if (netdev_need_ops_lock(dev))
12220-
netdev_unlock(dev);
12221-
else
12251+
if (!netdev_need_ops_lock(dev))
1222212252
list_add_tail(&dev->close_list, &close_head);
1222312253
}
1222412254
netif_close_many(&close_head, true);

0 commit comments

Comments
 (0)