diff options
| author | Jesse Gross <jesse@nicira.com> | 2011-02-24 14:16:24 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2011-02-24 17:20:08 -0800 |
| commit | 8338302d5cecb0a082104a8ff09544c2909d4308 (patch) | |
| tree | 63253a3b3e41709ee232bbfd033c98652015dc6c /datapath/vport-internal_dev.c | |
| parent | a02e5331f6064a7b9dd11f1091ab9fcb1bbdadcc (diff) | |
| download | openvswitch-8338302d5cecb0a082104a8ff09544c2909d4308.tar.gz | |
datapath: Don't free vport until all references are gone.
We currently call vport_free() for internal devices after the
device is unregistered. This takes care of callers that use
either RTNL or RCU but not ones that have only a device reference.
In particular, if stats are requested while a datapath is being
unregistered we can try to use the vport data structures which
have already been freed.
Bug #4736
Reported-by: Brad Hall <brad@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'datapath/vport-internal_dev.c')
| -rw-r--r-- | datapath/vport-internal_dev.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c index 0b91b345f..63f3f69ce 100644 --- a/datapath/vport-internal_dev.c +++ b/datapath/vport-internal_dev.c @@ -132,6 +132,14 @@ static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int return -EOPNOTSUPP; } +static void internal_dev_destructor(struct net_device *dev) +{ + struct vport *vport = internal_dev_get_vport(dev); + + vport_free(vport); + free_netdev(dev); +} + #ifdef HAVE_NET_DEVICE_OPS static const struct net_device_ops internal_dev_netdev_ops = { .ndo_open = internal_dev_open, @@ -160,7 +168,7 @@ static void do_setup(struct net_device *netdev) netdev->change_mtu = internal_dev_change_mtu; #endif - netdev->destructor = free_netdev; + netdev->destructor = internal_dev_destructor; SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops); netdev->tx_queue_len = 0; @@ -219,9 +227,8 @@ static int internal_dev_destroy(struct vport *vport) netif_stop_queue(netdev_vport->dev); dev_set_promiscuity(netdev_vport->dev, -1); - unregister_netdevice(netdev_vport->dev); /* unregister_netdevice() waits for an RCU grace period. */ - vport_free(vport); + unregister_netdevice(netdev_vport->dev); return 0; } |