Commit 9b5e383c authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: Introduce unregister_netdevice_many()

Introduce rollback_registered_many() and unregister_netdevice_many()

rollback_registered_many() is able to perform necessary steps at device dismantle
time, factorizing two expensive synchronize_net() calls.
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44a0873d
...@@ -1119,6 +1119,7 @@ extern int dev_queue_xmit(struct sk_buff *skb); ...@@ -1119,6 +1119,7 @@ extern int dev_queue_xmit(struct sk_buff *skb);
extern int register_netdevice(struct net_device *dev); extern int register_netdevice(struct net_device *dev);
extern void unregister_netdevice_queue(struct net_device *dev, extern void unregister_netdevice_queue(struct net_device *dev,
struct list_head *head); struct list_head *head);
extern void unregister_netdevice_many(struct list_head *head);
static inline void unregister_netdevice(struct net_device *dev) static inline void unregister_netdevice(struct net_device *dev)
{ {
unregister_netdevice_queue(dev, NULL); unregister_netdevice_queue(dev, NULL);
......
...@@ -4637,59 +4637,76 @@ static void net_set_todo(struct net_device *dev) ...@@ -4637,59 +4637,76 @@ static void net_set_todo(struct net_device *dev)
list_add_tail(&dev->todo_list, &net_todo_list); list_add_tail(&dev->todo_list, &net_todo_list);
} }
static void rollback_registered(struct net_device *dev) static void rollback_registered_many(struct list_head *head)
{ {
struct net_device *dev;
BUG_ON(dev_boot_phase); BUG_ON(dev_boot_phase);
ASSERT_RTNL(); ASSERT_RTNL();
/* Some devices call without registering for initialization unwind. */ list_for_each_entry(dev, head, unreg_list) {
if (dev->reg_state == NETREG_UNINITIALIZED) { /* Some devices call without registering
printk(KERN_DEBUG "unregister_netdevice: device %s/%p never " * for initialization unwind.
"was registered\n", dev->name, dev); */
if (dev->reg_state == NETREG_UNINITIALIZED) {
pr_debug("unregister_netdevice: device %s/%p never "
"was registered\n", dev->name, dev);
WARN_ON(1); WARN_ON(1);
return; return;
} }
BUG_ON(dev->reg_state != NETREG_REGISTERED); BUG_ON(dev->reg_state != NETREG_REGISTERED);
/* If device is running, close it first. */ /* If device is running, close it first. */
dev_close(dev); dev_close(dev);
/* And unlink it from device chain. */ /* And unlink it from device chain. */
unlist_netdevice(dev); unlist_netdevice(dev);
dev->reg_state = NETREG_UNREGISTERING; dev->reg_state = NETREG_UNREGISTERING;
}
synchronize_net(); synchronize_net();
/* Shutdown queueing discipline. */ list_for_each_entry(dev, head, unreg_list) {
dev_shutdown(dev); /* Shutdown queueing discipline. */
dev_shutdown(dev);
/* Notify protocols, that we are about to destroy /* Notify protocols, that we are about to destroy
this device. They should clean all the things. this device. They should clean all the things.
*/ */
call_netdevice_notifiers(NETDEV_UNREGISTER, dev); call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
/* /*
* Flush the unicast and multicast chains * Flush the unicast and multicast chains
*/ */
dev_unicast_flush(dev); dev_unicast_flush(dev);
dev_addr_discard(dev); dev_addr_discard(dev);
if (dev->netdev_ops->ndo_uninit) if (dev->netdev_ops->ndo_uninit)
dev->netdev_ops->ndo_uninit(dev); dev->netdev_ops->ndo_uninit(dev);
/* Notifier chain MUST detach us from master device. */ /* Notifier chain MUST detach us from master device. */
WARN_ON(dev->master); WARN_ON(dev->master);
/* Remove entries from kobject tree */ /* Remove entries from kobject tree */
netdev_unregister_kobject(dev); netdev_unregister_kobject(dev);
}
synchronize_net(); synchronize_net();
dev_put(dev); list_for_each_entry(dev, head, unreg_list)
dev_put(dev);
}
static void rollback_registered(struct net_device *dev)
{
LIST_HEAD(single);
list_add(&dev->unreg_list, &single);
rollback_registered_many(&single);
} }
static void __netdev_init_queue_locks_one(struct net_device *dev, static void __netdev_init_queue_locks_one(struct net_device *dev,
...@@ -5271,6 +5288,22 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head) ...@@ -5271,6 +5288,22 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)
} }
EXPORT_SYMBOL(unregister_netdevice_queue); EXPORT_SYMBOL(unregister_netdevice_queue);
/**
* unregister_netdevice_many - unregister many devices
* @head: list of devices
*
*/
void unregister_netdevice_many(struct list_head *head)
{
struct net_device *dev;
if (!list_empty(head)) {
rollback_registered_many(head);
list_for_each_entry(dev, head, unreg_list)
net_set_todo(dev);
}
}
/** /**
* unregister_netdev - remove device from the kernel * unregister_netdev - remove device from the kernel
* @dev: device * @dev: device
......
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