openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hv_netvsc: synchronize netvsc_change_mtu()/netvsc_set_channels() with netvsc_remove() 

When netvsc device is removed during mtu change or channels setup we get
into troubles as both paths are trying to remove the device. Synchronize
them with start_remove flag and rtnl lock.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vitaly Kuznetsov 2016-05-13 13:55:24 +02:00 committed by David S. Miller
parent 0a1275ca51
commit 6da7225f5a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/hyperv/netvsc_drv.c
View File

@ -759,7 +759,7 @@ static int netvsc_set_channels(struct net_device *net,
int ret = 0;
bool recovering = false;
if (!nvdev || nvdev->destroy)
if (net_device_ctx->start_remove || !nvdev || nvdev->destroy)
return -ENODEV;
num_chn = nvdev->num_chn;
@ -907,7 +907,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
u32 num_chn;
int ret = 0;
if (nvdev == NULL || nvdev->destroy)
if (ndevctx->start_remove || !nvdev || nvdev->destroy)
return -ENODEV;
if (nvdev->nvsp_version >= NVSP_PROTOCOL_VERSION_2)
@ -1445,7 +1445,12 @@ static int netvsc_remove(struct hv_device *dev)
ndev_ctx = netdev_priv(net);
net_device = ndev_ctx->nvdev;
/* Avoid racing with netvsc_change_mtu()/netvsc_set_channels()
* removing the device.
*/
rtnl_lock();
ndev_ctx->start_remove = true;
rtnl_unlock();
cancel_delayed_work_sync(&ndev_ctx->dwork);
cancel_work_sync(&ndev_ctx->work);