bonding/802.3ad: fix slave link initialization transition states
Subsystems (3)
PATCH 1/1 bonding/802.3ad: fix slave link initialization transition states
Once in a while, with just the right timing, 802.3ad slaves will fail to properly initialize, winding up in a weird state, with a partner system mac address of 00:00:00:00:00:00. This started happening after a fix to properly track link_failure_count tracking, where an 802.3ad slave that reported itself as link up in the miimon code, but wasn't able to get a valid speed/duplex, started getting set to BOND_LINK_FAIL instead of BOND_LINK_DOWN. That was the proper thing to do for the general "my link went down" case, but has created a link initialization race that can put the interface in this odd state.
The simple fix is to instead set the slave link to BOND_LINK_DOWN again, if the link has never been up (last_link_up == 0), so the link state doesn't bounce from BOND_LINK_DOWN to BOND_LINK_FAIL -- it hasn't failed in this case, it simply hasn't been up yet, and this prevents the unnecessary state change from DOWN to FAIL and getting stuck in an init failure w/o a partner mac.
--- drivers/net/bonding/bond_main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/bonding/bond_main.c +10 -5
@@ -3122,13 +3122,18 @@ static int bond_slave_netdev_event(unsigned long event,case NETDEV_CHANGE :/* For 802.3ad mode only: * Getting invalid Speed/Duplex values here will put slave -* in weird state. So mark it as link-fail for the time -* being and let link-monitoring (miimon) set it right when -* correct speeds/duplex are available. +* in weird state. Mark it as link-fail if the link was +* previously up or link-down if it hasn't yet come up, and +* let link-monitoring (miimon) set it right when correct +* speeds/duplex are available. */ if (bond_update_speed_duplex (slave) && -BOND_MODE (bond) ==BOND_MODE_8023AD ) - slave->link =BOND_LINK_FAIL ; +BOND_MODE (bond) ==BOND_MODE_8023AD ) { +if (slave->last_link_up) + slave->link =BOND_LINK_FAIL ; +else + slave->link =BOND_LINK_DOWN ; + }if (BOND_MODE (bond) ==BOND_MODE_8023AD )bond_3ad_adapter_speed_duplex_changed (slave);
Signature · 1 line
2.20.1
Quoted 9 lines · Jarod Wilson
Once in a while, with just the right timing, 802.3ad slaves will fail to properly initialize, winding up in a weird state, with a partner system mac address of 00:00:00:00:00:00. This started happening after a fix to properly track
link_failure_counttracking, where an 802.3ad slave that reported itself as link up in the miimon code, but wasn't able to get a valid speed/duplex, started getting set toBOND_LINK_FAILinstead ofBOND_LINK_DOWN. That was the proper thing to do for the general "my link went down" case, but has created a link initialization race that can put the interface in this odd state.
Reading back in the git history, the ultimate cause of this
"weird state" appears to be devices that assert NETDEV_UP prior to actually being able to supply sane speed/duplex values, correct?
Presuming that this is the case, I don't see that there's much
else to be done here, and so:
Quoted 53 lines
The simple fix is to instead set the slave link to
BOND_LINK_DOWNagain, if the link has never been up (last_link_up== 0), so the link state doesn't bounce fromBOND_LINK_DOWNtoBOND_LINK_FAIL-- it hasn't failed in this case, it simply hasn't been up yet, and this prevents the unnecessary state change from DOWN to FAIL and getting stuck in an init failure w/o a partner mac.Fixes ea53abfab960 ("bonding/802.3ad: fix link_failure_count tracking")CC Jay Vosburgh <[email protected]>CC Veaceslav Falico <[email protected]>CC Andy Gospodarek <[email protected]>CC "David S. Miller" <[email protected]>Tested-by Heesoon Kim <[email protected]>Signed-off-by Jarod Wilson <[email protected]>---
drivers/net/bonding/bond_main.c| 15 ++++++++++-----1 file changed, 10 insertions(+), 5 deletions(-)drivers/net/bonding/bond_main.c +10
-5@@ -3122,13 +3122,18 @@ static int bond_slave_netdev_event(unsigned long event,case NETDEV_CHANGE :/* For 802.3ad mode only: * Getting invalid Speed/Duplex values here will put slave -* in weird state. So mark it as link-fail for the time -* being and let link-monitoring (miimon) set it right when -* correct speeds/duplex are available. +* in weird state. Mark it as link-fail if the link was +* previously up or link-down if it hasn't yet come up, and +* let link-monitoring (miimon) set it right when correct +* speeds/duplex are available. */ if (bond_update_speed_duplex (slave) && -BOND_MODE (bond) ==BOND_MODE_8023AD ) - slave->link =BOND_LINK_FAIL ; +BOND_MODE (bond) ==BOND_MODE_8023AD ) { +if (slave->last_link_up) + slave->link =BOND_LINK_FAIL ; +else + slave->link =BOND_LINK_DOWN ; + }if (BOND_MODE (bond) ==BOND_MODE_8023AD )bond_3ad_adapter_speed_duplex_changed (slave);Signature · 1 line
2.20.1
Quoted 13 lines · Jay Vosburgh
Quoted 9 lines · Jarod Wilson
Once in a while, with just the right timing, 802.3ad slaves will fail to properly initialize, winding up in a weird state, with a partner system mac address of 00:00:00:00:00:00. This started happening after a fix to properly track
link_failure_counttracking, where an 802.3ad slave that reported itself as link up in the miimon code, but wasn't able to get a valid speed/duplex, started getting set toBOND_LINK_FAILinstead ofBOND_LINK_DOWN. That was the proper thing to do for the general "my link went down" case, but has created a link initialization race that can put the interface in this odd state.
Are there any notification consequences because of this change?
Quoted 62 lines
Reading back in the git history, the ultimate cause of this
"weird state" appears to be devices that assertNETDEV_UPprior to actually being able to supply sane speed/duplex values, correct?Presuming that this is the case, I don't see that there's much
else to be done here, and so:Acked-by Jay Vosburgh <[email protected]>Quoted 53 lines
The simple fix is to instead set the slave link to
BOND_LINK_DOWNagain, if the link has never been up (last_link_up== 0), so the link state doesn't bounce fromBOND_LINK_DOWNtoBOND_LINK_FAIL-- it hasn't failed in this case, it simply hasn't been up yet, and this prevents the unnecessary state change from DOWN to FAIL and getting stuck in an init failure w/o a partner mac.Fixes ea53abfab960 ("bonding/802.3ad: fix link_failure_count tracking")CC Jay Vosburgh <[email protected]>CC Veaceslav Falico <[email protected]>CC Andy Gospodarek <[email protected]>CC "David S. Miller" <[email protected]>Tested-by Heesoon Kim <[email protected]>Signed-off-by Jarod Wilson <[email protected]>---
drivers/net/bonding/bond_main.c| 15 ++++++++++-----1 file changed, 10 insertions(+), 5 deletions(-)drivers/net/bonding/bond_main.c +10
-6@@ -3122,13 +3122,18 @@ static int bond_slave_netdev_event(unsigned long event,case NETDEV_CHANGE :/* For 802.3ad mode only: * Getting invalid Speed/Duplex values here will put slave -* in weird state. So mark it as link-fail for the time -* being and let link-monitoring (miimon) set it right when -* correct speeds/duplex are available. +* in weird state. Mark it as link-fail if the link was +* previously up or link-down if it hasn't yet come up, and +* let link-monitoring (miimon) set it right when correct +* speeds/duplex are available. */ if (bond_update_speed_duplex (slave) && -BOND_MODE (bond) ==BOND_MODE_8023AD ) - slave->link =BOND_LINK_FAIL ; +BOND_MODE (bond) ==BOND_MODE_8023AD ) { +if (slave->last_link_up) + slave->link =BOND_LINK_FAIL ; +else + slave->link =BOND_LINK_DOWN ; + }if (BOND_MODE (bond) ==BOND_MODE_8023AD )bond_3ad_adapter_speed_duplex_changed (slave); --2.20.1
Quoted 14 lines · Mahesh Bandewar (महेश बंडेवार)
Quoted 13 lines · Jay Vosburgh
Quoted 9 lines · Jarod Wilson
Once in a while, with just the right timing, 802.3ad slaves will fail to properly initialize, winding up in a weird state, with a partner system mac address of 00:00:00:00:00:00. This started happening after a fix to properly track
link_failure_counttracking, where an 802.3ad slave that reported itself as link up in the miimon code, but wasn't able to get a valid speed/duplex, started getting set toBOND_LINK_FAILinstead ofBOND_LINK_DOWN. That was the proper thing to do for the general "my link went down" case, but has created a link initialization race that can put the interface in this odd state.
Quoted 1 line
Are there any notification consequences because of this change?
No, there shouldn't be, it just makes initial link-up cleaner, everything during runtime once the link is initialized should remain the same.
Signature · 2 lines
Jarod Wilson [email protected]
Quoted 12 lines · Jay Vosburgh
Quoted 9 lines · Jarod Wilson
Once in a while, with just the right timing, 802.3ad slaves will fail to properly initialize, winding up in a weird state, with a partner system mac address of 00:00:00:00:00:00. This started happening after a fix to properly track
link_failure_counttracking, where an 802.3ad slave that reported itself as link up in the miimon code, but wasn't able to get a valid speed/duplex, started getting set toBOND_LINK_FAILinstead ofBOND_LINK_DOWN. That was the proper thing to do for the general "my link went down" case, but has created a link initialization race that can put the interface in this odd state.
Quoted 8 lines
Reading back in the git history, the ultimate cause of this
"weird state" appears to be devices that assertNETDEV_UPprior to actually being able to supply sane speed/duplex values, correct?Presuming that this is the case, I don't see that there's much
else to be done here, and so:Acked-by Jay Vosburgh <[email protected]>
Correct, we've got an miimon "device is up", but still can't get speed and/or duplex in this case.
Signature · 2 lines
Jarod Wilson [email protected]
David Miller
maintainerFrom: Jarod Wilson <[email protected]>
Date: Fri, 24 May 2019 09:49:28 -0400
Quoted 17 lines
Once in a while, with just the right timing, 802.3ad slaves will fail to properly initialize, winding up in a weird state, with a partner system mac address of 00:00:00:00:00:00. This started happening after a fix to properly track
link_failure_counttracking, where an 802.3ad slave that reported itself as link up in the miimon code, but wasn't able to get a valid speed/duplex, started getting set toBOND_LINK_FAILinstead ofBOND_LINK_DOWN. That was the proper thing to do for the general "my link went down" case, but has created a link initialization race that can put the interface in this odd state.The simple fix is to instead set the slave link to
BOND_LINK_DOWNagain, if the link has never been up (last_link_up== 0), so the link state doesn't bounce fromBOND_LINK_DOWNtoBOND_LINK_FAIL-- it hasn't failed in this case, it simply hasn't been up yet, and this prevents the unnecessary state change from DOWN to FAIL and getting stuck in an init failure w/o a partner mac.
Quoted 3 lines
Fixes ea53abfab960 ("bonding/802.3ad: fix link_failure_count tracking")Tested-by Heesoon Kim <[email protected]>Signed-off-by Jarod Wilson <[email protected]>
Applied and queued up for -stable.