UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "ipv6: Handle race in addrconf_dad_work" 

This reverts commit a3ce2a21bb.

Eric reported tests failings with commit. After digging into it,
the bottom line is that the DAD sequence is not to be messed with.
There are too many cases that are expected to proceed regardless
of whether a device is up.

Revert the patch and I will send a different solution for the
problem Rajendra reported.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2019-10-03 14:46:15 -07:00 committed by David S. Miller
parent 7a512eb865
commit 8ae72cbf62
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/ipv6/addrconf.c
View File

@ -4032,12 +4032,6 @@ static void addrconf_dad_work(struct work_struct *w)
rtnl_lock(); rtnl_lock();
/* check if device was taken down before this delayed work
* function could be canceled
*/
if (idev->dead || !(idev->if_flags & IF_READY))
goto out;
spin_lock_bh(&ifp->lock); spin_lock_bh(&ifp->lock);
if (ifp->state == INET6_IFADDR_STATE_PREDAD) { if (ifp->state == INET6_IFADDR_STATE_PREDAD) {
action = DAD_BEGIN; action = DAD_BEGIN;
@ -4083,6 +4077,11 @@ static void addrconf_dad_work(struct work_struct *w)
goto out; goto out;
write_lock_bh(&idev->lock); write_lock_bh(&idev->lock);
if (idev->dead || !(idev->if_flags & IF_READY)) {
write_unlock_bh(&idev->lock);
goto out;
}
spin_lock(&ifp->lock); spin_lock(&ifp->lock);
if (ifp->state == INET6_IFADDR_STATE_DEAD) { if (ifp->state == INET6_IFADDR_STATE_DEAD) {
spin_unlock(&ifp->lock); spin_unlock(&ifp->lock);