Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92eb1d47 authored by Jesse Gross's avatar Jesse Gross
Browse files

openvswitch: 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: default avatarJustin Pettit <jpettit@nicira.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 39c7caeb

net/openvswitch/vport-netdev.c

+10 −4
Original line number Diff line number Diff line
@@ -114,6 +114,15 @@ static struct vport *netdev_create(const struct vport_parms *parms) 
	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);
@@ -122,10 +131,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);

}



const char *ovs_netdev_get_name(const struct vport *vport)

net/openvswitch/vport-netdev.h

+3 −0
Original line number Diff line number Diff line
@@ -20,12 +20,15 @@ 
#define VPORT_NETDEV_H 1



#include <linux/netdevice.h>

#include <linux/rcupdate.h>



#include "vport.h"



struct vport *ovs_netdev_get_vport(struct net_device *dev);



struct netdev_vport {

	struct rcu_head rcu;



	struct net_device *dev;

};