Revert "ipv6: Handle race in addrconf_dad_work"
Subsystems (3)
David Ahern
maintainerPATCH 1/1 Revert "ipv6: Handle race in addrconf_dad_work"
From: David Ahern <[email protected]>
This reverts commit a3ce2a21bb8969ae27917281244fa91bf5f286d7.
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.
--- net/ipv6/addrconf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/ipv6/addrconf.c +5 -6
@@ -4032,12 +4032,6 @@ static void addrconf_dad_work(struct work_struct *w)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);if (ifp->state ==INET6_IFADDR_STATE_PREDAD ) { action =DAD_BEGIN ;
@@ -4083,6 +4077,11 @@ static void addrconf_dad_work(struct work_struct *w) goto out;write_lock_bh (&idev->lock); +if (idev->dead || !(idev->if_flags &IF_READY )) { +write_unlock_bh (&idev->lock); + goto out; + } +spin_lock (&ifp->lock);if (ifp->state ==INET6_IFADDR_STATE_DEAD ) {spin_unlock (&ifp->lock);
Signature · 1 line
2.11.0
Quoted 9 lines · David Ahern
From: David Ahern <[email protected]>
This reverts commit
a3ce2a21bb8969ae27917281244fa91bf5f286d7.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.
Quoted 5 lines
Revert the patch and I will send a different solution for the problem Rajendra reported.
Signed-off-by David Ahern <[email protected]>Cc Eric Dumazet <[email protected]>
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Thu, 3 Oct 2019 14:46:15 -0700
Quoted 9 lines
From: David Ahern <[email protected]>
This reverts commit
a3ce2a21bb8969ae27917281244fa91bf5f286d7.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.
Quoted 4 lines
Revert the patch and I will send a different solution for the problem Rajendra reported.
Signed-off-by David Ahern <[email protected]>
Applied and the reverted patch removed from the -stable queue.