From d4a05c76e317a01fa1341605150ffec77b444b0b Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Wed, 28 Nov 2012 12:15:49 -0800 Subject: [PATCH] datapath: Use RCU callback when detaching netdevices. Currently, each time a device is detached from an OVS datapath we call synchronize RCU before freeing associated data structures. However, if a bridge is deleted (which detaches all ports) when many devices are connected then there can be a long delay. This switches to use call_rcu() to group the cost together. Reported-by: Justin Pettit Signed-off-by: Jesse Gross --- datapath/vport-netdev.c | 14 ++++++++++---- datapath/vport-netdev.h | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c index f1ecfdbfe..5f437d343 100644 --- a/datapath/vport-netdev.c +++ b/datapath/vport-netdev.c @@ -173,6 +173,15 @@ error: return ERR_PTR(err); } +static void free_port_rcu(struct rcu_head *rcu) +{ + struct netdev_vport *netdev_vport = container_of(rcu, + struct netdev_vport, rcu); + + dev_put(netdev_vport->dev); + ovs_vport_free(vport_from_priv(netdev_vport)); +} + static void netdev_destroy(struct vport *vport) { struct netdev_vport *netdev_vport = netdev_vport_priv(vport); @@ -181,10 +190,7 @@ static void netdev_destroy(struct vport *vport) netdev_rx_handler_unregister(netdev_vport->dev); dev_set_promiscuity(netdev_vport->dev, -1); - synchronize_rcu(); - - dev_put(netdev_vport->dev); - ovs_vport_free(vport); + call_rcu(&netdev_vport->rcu, free_port_rcu); } int ovs_netdev_set_addr(struct vport *vport, const unsigned char *addr) diff --git a/datapath/vport-netdev.h b/datapath/vport-netdev.h index c9cf5e509..b4f455dd3 100644 --- a/datapath/vport-netdev.h +++ b/datapath/vport-netdev.h @@ -20,12 +20,15 @@ #define VPORT_NETDEV_H 1 #include +#include #include "vport.h" struct vport *ovs_netdev_get_vport(struct net_device *dev); struct netdev_vport { + struct rcu_head rcu; + struct net_device *dev; }; -- 2.20.1