xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: inline rollback_registered_many()

Browse Source 
commit 0cbe1e57a7b93517100b0eb63d8e445cfbeb630c upstream.

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>
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jakub Kicinski
2022-07-15 19:26:32 +03:00
committed by Greg Kroah-Hartman
parent bf2f3d1970
commit 4f900c37f1
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
net/core/dev.c
View File

@@ -5750,7 +5750,7 @@ static void flush_all_backlogs(void)
} }
/* we can have in flight packet[s] on the cpus we are not flushing, /* 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 * them
*/ */
for_each_cpu(cpu, &flush_cpus) for_each_cpu(cpu, &flush_cpus)
@@ -10633,8 +10633,6 @@ void synchronize_net(void)
} }
EXPORT_SYMBOL(synchronize_net); EXPORT_SYMBOL(synchronize_net);
static void rollback_registered_many(struct list_head *head);
/** /**
* unregister_netdevice_queue - remove device from the kernel * unregister_netdevice_queue - remove device from the kernel
* @dev: device * @dev: device
@@ -10658,8 +10656,7 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)
LIST_HEAD(single); LIST_HEAD(single);
list_add(&dev->unreg_list, &single); list_add(&dev->unreg_list, &single);
rollback_registered_many(&single); unregister_netdevice_many(&single);
list_del(&single);
} }
} }
EXPORT_SYMBOL(unregister_netdevice_queue); EXPORT_SYMBOL(unregister_netdevice_queue);
@@ -10672,15 +10669,6 @@ EXPORT_SYMBOL(unregister_netdevice_queue);
* we force a list_del() to make sure stack wont be corrupted later. * we force a list_del() to make sure stack wont be corrupted later.
*/ */
void unregister_netdevice_many(struct list_head *head) 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; struct net_device *dev, *tmp;
LIST_HEAD(close_head); LIST_HEAD(close_head);
@@ -10688,6 +10676,9 @@ static void rollback_registered_many(struct list_head *head)
BUG_ON(dev_boot_phase); BUG_ON(dev_boot_phase);
ASSERT_RTNL(); ASSERT_RTNL();
if (list_empty(head))
return;
list_for_each_entry_safe(dev, tmp, head, unreg_list) { list_for_each_entry_safe(dev, tmp, head, unreg_list) {
/* Some devices call without registering /* Some devices call without registering
* for initialization unwind. Remove those * for initialization unwind. Remove those
@@ -10771,7 +10762,10 @@ static void rollback_registered_many(struct list_head *head)
dev_put(dev); dev_put(dev);
net_set_todo(dev); net_set_todo(dev);
} }
list_del(head);
} }
EXPORT_SYMBOL(unregister_netdevice_many);
/** /**
* unregister_netdev - remove device from the kernel * unregister_netdev - remove device from the kernel