[PATCH] veth: use batched device unregister
From: Eric Dumazet <hidden>
Date: 2011-05-09 04:44:40
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
veth devices dont use the batched device unregisters yet. Since veth are a pair of devices, it makes sense to use a batch of two unregisters, this roughly divide dismantle time by two. Reported-by: Alex Bligh <redacted> Signed-off-by: Eric Dumazet <redacted> Cc: Jesse Gross <redacted> Cc: Paul E. McKenney <redacted> Cc: Ben Greear <redacted> --- drivers/net/veth.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 3b99f64..77c4679 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c@@ -451,8 +451,16 @@ static void veth_dellink(struct net_device *dev, struct list_head *head) priv = netdev_priv(dev); peer = priv->peer; - unregister_netdevice_queue(dev, head); - unregister_netdevice_queue(peer, head); + if (head == NULL) { + LIST_HEAD(list); + /* make a batch of two devices to speedup unregister */ + unregister_netdevice_queue(dev, &list); + unregister_netdevice_queue(peer, &list); + unregister_netdevice_many(&list); + } else { + unregister_netdevice_queue(dev, head); + unregister_netdevice_queue(peer, head); + } } static const struct nla_policy veth_policy[VETH_INFO_MAX + 1];