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

net: Introduce unregister_netdevice_many()

Browse Source 
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: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2009-10-27 07:04:19 +00:00 committed by David S. Miller
parent 44a0873d52
commit 9b5e383c11
2 changed files with 72 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/netdevice.h
View File

@ -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);

109
net/core/dev.c
View File

@ -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);
/* If device is running, close it first. */
dev_close(dev);
/* And unlink it from device chain. */
unlist_netdevice(dev);
dev->reg_state = NETREG_UNREGISTERING;
} }
BUG_ON(dev->reg_state != NETREG_REGISTERED); synchronize_net();
/* If device is running, close it first. */ list_for_each_entry(dev, head, unreg_list) {
dev_close(dev); /* Shutdown queueing discipline. */
dev_shutdown(dev);
/* And unlink it from device chain. */
unlist_netdevice(dev);
dev->reg_state = NETREG_UNREGISTERING; /* Notify protocols, that we are about to destroy
this device. They should clean all the things.
*/
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
/*
* Flush the unicast and multicast chains
*/
dev_unicast_flush(dev);
dev_addr_discard(dev);
if (dev->netdev_ops->ndo_uninit)
dev->netdev_ops->ndo_uninit(dev);
/* Notifier chain MUST detach us from master device. */
WARN_ON(dev->master);
/* Remove entries from kobject tree */
netdev_unregister_kobject(dev);
}
synchronize_net(); synchronize_net();
/* Shutdown queueing discipline. */ list_for_each_entry(dev, head, unreg_list)
dev_shutdown(dev); dev_put(dev);
}
static void rollback_registered(struct net_device *dev)
{
LIST_HEAD(single);
/* Notify protocols, that we are about to destroy list_add(&dev->unreg_list, &single);
this device. They should clean all the things. rollback_registered_many(&single);
*/
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
/*
* Flush the unicast and multicast chains
*/
dev_unicast_flush(dev);
dev_addr_discard(dev);
if (dev->netdev_ops->ndo_uninit)
dev->netdev_ops->ndo_uninit(dev);
/* Notifier chain MUST detach us from master device. */
WARN_ON(dev->master);
/* Remove entries from kobject tree */
netdev_unregister_kobject(dev);
synchronize_net();
dev_put(dev);
} }
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)
} }
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