Skip to content

Commit

Permalink
net: inline rollback_registered_many()
Browse files Browse the repository at this point in the history
Similar to the change for rollback_registered() -
rollback_registered_many() was a part of unregister_netdevice_many()
minus the net_set_todo(), which is no longer needed.

Functionally this patch moves the list_empty() check back after:

	BUG_ON(dev_boot_phase);
	ASSERT_RTNL();

but I can't find any reason why that would be an issue.

Reviewed-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jakub Kicinski committed Jan 21, 2021
1 parent bcfe2f1 commit 0cbe1e5
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -5709,7 +5709,7 @@ static void flush_all_backlogs(void)
}

/* we can have in flight packet[s] on the cpus we are not flushing,
* synchronize_net() in rollback_registered_many() will take care of
* synchronize_net() in unregister_netdevice_many() will take care of
* them
*/
for_each_cpu(cpu, &flush_cpus)
Expand Down Expand Up @@ -10610,8 +10610,6 @@ void synchronize_net(void)
}
EXPORT_SYMBOL(synchronize_net);

static void rollback_registered_many(struct list_head *head);

/**
* unregister_netdevice_queue - remove device from the kernel
* @dev: device
Expand All @@ -10635,8 +10633,7 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)
LIST_HEAD(single);

list_add(&dev->unreg_list, &single);
rollback_registered_many(&single);
list_del(&single);
unregister_netdevice_many(&single);
}
}
EXPORT_SYMBOL(unregister_netdevice_queue);
Expand All @@ -10649,22 +10646,16 @@ EXPORT_SYMBOL(unregister_netdevice_queue);
* we force a list_del() to make sure stack wont be corrupted later.
*/
void unregister_netdevice_many(struct list_head *head)
{
if (!list_empty(head)) {
rollback_registered_many(head);
list_del(head);
}
}
EXPORT_SYMBOL(unregister_netdevice_many);

static void rollback_registered_many(struct list_head *head)
{
struct net_device *dev, *tmp;
LIST_HEAD(close_head);

BUG_ON(dev_boot_phase);
ASSERT_RTNL();

if (list_empty(head))
return;

list_for_each_entry_safe(dev, tmp, head, unreg_list) {
/* Some devices call without registering
* for initialization unwind. Remove those
Expand Down Expand Up @@ -10748,7 +10739,10 @@ static void rollback_registered_many(struct list_head *head)
dev_put(dev);
net_set_todo(dev);
}

list_del(head);
}
EXPORT_SYMBOL(unregister_netdevice_many);

/**
* unregister_netdev - remove device from the kernel
Expand Down

0 comments on commit 0cbe1e5

Please sign in to comment.