leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: move net_set_todo inside rollback_registered()

Browse Source 
Commit 93ee31f14f ("[NET]: Fix free_netdev on register_netdev
failure.") moved net_set_todo() outside of rollback_registered()
so that rollback_registered() can be used in the failure path of
register_netdevice() but without risking a double free.

Since commit cf124db566 ("net: Fix inconsistent teardown and
release of private netdev state."), however, we have a better
way of handling that condition, since destructors don't call
free_netdev() directly.

After the change in commit c269a24ce0 ("net: make free_netdev()
more lenient with unregistering devices") we can now move
net_set_todo() back.

Reviewed-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2021-01-19 12:25:18 -08:00
parent 5ff96aec72
commit 2014beea7e
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/core/dev.c
View File

@@ -9546,8 +9546,10 @@ static void rollback_registered_many(struct list_head *head)
synchronize_net(); synchronize_net();
list_for_each_entry(dev, head, unreg_list) list_for_each_entry(dev, head, unreg_list) {
dev_put(dev); dev_put(dev);
net_set_todo(dev);
}
} }
static void rollback_registered(struct net_device *dev) static void rollback_registered(struct net_device *dev)
@@ -10109,7 +10111,6 @@ int register_netdevice(struct net_device *dev)
/* Expect explicit free_netdev() on failure */ /* Expect explicit free_netdev() on failure */
dev->needs_free_netdev = false; dev->needs_free_netdev = false;
rollback_registered(dev); rollback_registered(dev);
net_set_todo(dev);
goto out; goto out;
} }
/* /*
@@ -10732,8 +10733,6 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)
list_move_tail(&dev->unreg_list, head); list_move_tail(&dev->unreg_list, head);
} else { } else {
rollback_registered(dev); rollback_registered(dev);
/* Finish processing unregister after unlock */
net_set_todo(dev);
} }
} }
EXPORT_SYMBOL(unregister_netdevice_queue); EXPORT_SYMBOL(unregister_netdevice_queue);
@@ -10747,12 +10746,8 @@ EXPORT_SYMBOL(unregister_netdevice_queue);
*/ */
void unregister_netdevice_many(struct list_head *head) void unregister_netdevice_many(struct list_head *head)
{ {
struct net_device *dev;
if (!list_empty(head)) { if (!list_empty(head)) {
rollback_registered_many(head); rollback_registered_many(head);
list_for_each_entry(dev, head, unreg_list)
net_set_todo(dev);
list_del(head); list_del(head);
} }
} }