netvsc: fix deadlock betwen link status and removal

There is a deadlock possible when canceling the link status
delayed work queue. The removal process is run with RTNL held,
and the link status callback is acquring RTNL.

Resolve the issue by using trylock and rescheduling.
If cancel is in process, that block it from happening.

Fixes: 122a5f6410 ("staging: hv: use delayed_work for netvsc_send_garp()")
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2017-08-24 16:49:16 -07:00 committed by David S. Miller
parent c3d8d60e1e
commit 9b4e946ce1

View File

@ -1269,7 +1269,12 @@ static void netvsc_link_change(struct work_struct *w)
bool notify = false, reschedule = false; bool notify = false, reschedule = false;
unsigned long flags, next_reconfig, delay; unsigned long flags, next_reconfig, delay;
rtnl_lock(); /* if changes are happening, comeback later */
if (!rtnl_trylock()) {
schedule_delayed_work(&ndev_ctx->dwork, LINKCHANGE_INT);
return;
}
net_device = rtnl_dereference(ndev_ctx->nvdev); net_device = rtnl_dereference(ndev_ctx->nvdev);
if (!net_device) if (!net_device)
goto out_unlock; goto out_unlock;