Commit b4426cf2 authored by stephen hemminger's avatar stephen hemminger Committed by Greg Kroah-Hartman

netvsc: fix deadlock betwen link status and removal


[ Upstream commit 9b4e946c ]

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: 122a5f64 ("staging: hv: use delayed_work for netvsc_send_garp()")
Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f0204b0
...@@ -1270,7 +1270,12 @@ static void netvsc_link_change(struct work_struct *w) ...@@ -1270,7 +1270,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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment