ipv6: do not call ndisc_send_rs() with write lock

Because vxlan module will call ip6_dst_lookup() in TX path, which will hold write lock. So we have to release this write lock before calling ndisc_send_rs(), otherwise could deadlock.

Cong Wang committed 13 years ago

Commit caf92bc1 parent 034dfc51 file · +7 −3Browse files

Unified · Split

net/ipv6/addrconf.c+7−3

 static void addrconf_rs_timer(unsigned long data)
 {
 	struct inet6_dev *idev = (struct inet6_dev *)data;
+	struct net_device *dev = idev->dev;
 	struct in6_addr lladdr;
 	write_lock(&idev->lock);
 		goto out;
 	if (idev->rs_probes++ < idev->cnf.rtr_solicits) {
-		if (!__ipv6_get_lladdr(idev, &lladdr, IFA_F_TENTATIVE))
+		write_unlock(&idev->lock);
-			ndisc_send_rs(idev->dev, &lladdr,
+		if (!ipv6_get_lladdr(dev, &lladdr, IFA_F_TENTATIVE))
+			ndisc_send_rs(dev, &lladdr,
 				      &in6addr_linklocal_allrouters);
 		else
-			goto out;
+			goto put;
+		write_lock(&idev->lock);
 		/* The wait after the last probe can be shorter */
 		addrconf_mod_rs_timer(idev, (idev->rs_probes ==
 					     idev->cnf.rtr_solicits) ?
 out:
 	write_unlock(&idev->lock);
+put:
 	in6_dev_put(idev);
 }