Skip to content

Commit a987371

Browse files
zefir-kurtisigregkh
authored andcommitted
phy state machine: failsafe leave invalid RUNNING state
[ Upstream commit 811a919135b980bac8009d042acdccf10dc1ef5e ] While in RUNNING state, phy_state_machine() checks for link changes by comparing phydev->link before and after calling phy_read_status(). This works as long as it is guaranteed that phydev->link is never changed outside the phy_state_machine(). If in some setups this happens, it causes the state machine to miss a link loss and remain RUNNING despite phydev->link being 0. This has been observed running a dsa setup with a process continuously polling the link states over ethtool each second (SNMPD RFC-1213 agent). Disconnecting the link on a phy followed by a ETHTOOL_GSET causes dsa_slave_get_settings() / dsa_slave_get_link_ksettings() to call phy_read_status() and with that modify the link status - and with that bricking the phy state machine. This patch adds a fail-safe check while in RUNNING, which causes to move to CHANGELINK when the link is gone and we are still RUNNING. Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent db01878 commit a987371

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

drivers/net/phy/phy.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,15 @@ void phy_state_machine(struct work_struct *work)
921921
if (old_link != phydev->link)
922922
phydev->state = PHY_CHANGELINK;
923923
}
924+
/*
925+
* Failsafe: check that nobody set phydev->link=0 between two
926+
* poll cycles, otherwise we won't leave RUNNING state as long
927+
* as link remains down.
928+
*/
929+
if (!phydev->link && phydev->state == PHY_RUNNING) {
930+
phydev->state = PHY_CHANGELINK;
931+
dev_err(&phydev->dev, "no link in PHY_RUNNING\n");
932+
}
924933
break;
925934
case PHY_CHANGELINK:
926935
err = phy_read_status(phydev);

0 commit comments

Comments
 (0)