Commit ae68db14 authored by Jakub Kicinski's avatar Jakub Kicinski

net: transition netdev reg state earlier in run_todo

In prep for unregistering netdevs out of order move the netdev
state validation and change outside of the loop.

While at it modernize this code and use WARN() instead of
pr_err() + dump_stack().
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarXin Long <lucien.xin@gmail.com>
Link: https://lore.kernel.org/r/20220215225310.3679266-1-kuba@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4d449bdc
...@@ -9906,6 +9906,7 @@ static void netdev_wait_allrefs(struct net_device *dev) ...@@ -9906,6 +9906,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
*/ */
void netdev_run_todo(void) void netdev_run_todo(void)
{ {
struct net_device *dev, *tmp;
struct list_head list; struct list_head list;
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
struct list_head unlink_list; struct list_head unlink_list;
...@@ -9926,24 +9927,23 @@ void netdev_run_todo(void) ...@@ -9926,24 +9927,23 @@ void netdev_run_todo(void)
__rtnl_unlock(); __rtnl_unlock();
/* Wait for rcu callbacks to finish before next phase */ /* Wait for rcu callbacks to finish before next phase */
if (!list_empty(&list)) if (!list_empty(&list))
rcu_barrier(); rcu_barrier();
while (!list_empty(&list)) { list_for_each_entry_safe(dev, tmp, &list, todo_list) {
struct net_device *dev
= list_first_entry(&list, struct net_device, todo_list);
list_del(&dev->todo_list);
if (unlikely(dev->reg_state != NETREG_UNREGISTERING)) { if (unlikely(dev->reg_state != NETREG_UNREGISTERING)) {
pr_err("network todo '%s' but state %d\n", netdev_WARN(dev, "run_todo but not unregistering\n");
dev->name, dev->reg_state); list_del(&dev->todo_list);
dump_stack();
continue; continue;
} }
dev->reg_state = NETREG_UNREGISTERED; dev->reg_state = NETREG_UNREGISTERED;
}
while (!list_empty(&list)) {
dev = list_first_entry(&list, struct net_device, todo_list);
list_del(&dev->todo_list);
netdev_wait_allrefs(dev); netdev_wait_allrefs(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment