瀏覽代碼

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: 122a5f6410f4 ("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>
stephen hemminger 8 年之前
父節點
當前提交
9b4e946ce1
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      drivers/net/hyperv/netvsc_drv.c

+ 6 - 1
drivers/net/hyperv/netvsc_drv.c

@@ -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;