Commit caf92bc4 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller

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.
Reviewed-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 034dfc5d
...@@ -3090,6 +3090,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) ...@@ -3090,6 +3090,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
static void addrconf_rs_timer(unsigned long data) static void addrconf_rs_timer(unsigned long data)
{ {
struct inet6_dev *idev = (struct inet6_dev *)data; struct inet6_dev *idev = (struct inet6_dev *)data;
struct net_device *dev = idev->dev;
struct in6_addr lladdr; struct in6_addr lladdr;
write_lock(&idev->lock); write_lock(&idev->lock);
...@@ -3104,12 +3105,14 @@ static void addrconf_rs_timer(unsigned long data) ...@@ -3104,12 +3105,14 @@ static void addrconf_rs_timer(unsigned long data)
goto out; goto out;
if (idev->rs_probes++ < idev->cnf.rtr_solicits) { 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); &in6addr_linklocal_allrouters);
else else
goto out; goto put;
write_lock(&idev->lock);
/* The wait after the last probe can be shorter */ /* The wait after the last probe can be shorter */
addrconf_mod_rs_timer(idev, (idev->rs_probes == addrconf_mod_rs_timer(idev, (idev->rs_probes ==
idev->cnf.rtr_solicits) ? idev->cnf.rtr_solicits) ?
...@@ -3125,6 +3128,7 @@ static void addrconf_rs_timer(unsigned long data) ...@@ -3125,6 +3128,7 @@ static void addrconf_rs_timer(unsigned long data)
out: out:
write_unlock(&idev->lock); write_unlock(&idev->lock);
put:
in6_dev_put(idev); in6_dev_put(idev);
} }
......
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