phy: fix possible double lock calling link changed handler
PATCH 1/1 phy: fix possible double lock calling link changed handler
From: Alessandro B Maurici <[email protected]>
Releases the phy lock before calling phy_link_change to avoid any worker thread lockup. Some network drivers(eg Microchip's LAN743x), make a call to phy_ethtool_get_link_ksettings inside the link change handler, and, due to the commit c10a485c3de5 ("phy: phy_ethtool_ksettings_get: Lock the phy for consistency"), this will cause a lockup.
As that mutex call is needed for consistency, we need to release the lock, if previously locked, before calling the handler to prevent issues.
--- drivers/net/phy/phy.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/net/phy/phy.c +18 -0
@@ -58,13 +58,31 @@ static const char *phy_state_to_str(enum phy_state st)static void phy_link_up (struct phy_device *phydev) { +bool must_relock = false; + +if (mutex_is_locked (&phydev->lock)) { + must_relock = true; +mutex_unlock (&phydev->lock); + } phydev->phy_link_change (phydev, true); +if (must_relock) +mutex_lock (&phydev->lock); +phy_led_trigger_change_speed (phydev); }static void phy_link_down (struct phy_device *phydev) { +bool must_relock = false; + +if (mutex_is_locked (&phydev->lock)) { + must_relock = true; +mutex_unlock (&phydev->lock); + } phydev->phy_link_change (phydev, false); +if (must_relock) +mutex_lock (&phydev->lock); +phy_led_trigger_change_speed (phydev); }
Andrew Lunn
maintainerQuoted 5 lines · Alessandro B Maurici
From: Alessandro B Maurici <[email protected]>
Releases the phy lock before calling
phy_link_changeto avoid any worker thread lockup. Some network drivers(eg Microchip's LAN743x), make a call tophy_ethtool_get_link_ksettingsinside the link change handler
I think we need to take a step back here and answer the question, why does it call phy_ethtool_get_link_ksettings in the link change handler. I'm not aware of any other MAC driver which does this.
Andrew
Quoted 7 lines · On Tue, 23 Nov 2021 05:18:14 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 5 lines · Alessandro B Maurici
From: Alessandro B Maurici <[email protected]>
Releases the phy lock before calling
phy_link_changeto avoid any worker thread lockup. Some network drivers(eg Microchip's LAN743x), make a call tophy_ethtool_get_link_ksettingsinside the link change handler
Quoted 5 lines
I think we need to take a step back here and answer the question, why does it call
phy_ethtool_get_link_ksettingsin the link change handler. I'm not aware of any other MAC driver which does this.Andrew
I agree, the use in the lan743x seems related to the PTP, that driver seems to be the only one using it, at least in the Linus tree.
I think that driver could be patched as there are other ways to do it, but my take on the problem itself is that the PHY device interface opens a way to break the flow and this behavior does not seem to be documented, so, instead of documenting a possible harmful interface while in the callback, we should just get rid of the problem itself, and calling a callback without any locks held seems to be a good alternative.
This is also a non critical performance path and the additional code would not impact much, of course it makes the stuff less nice to look at. The patch also has an additional check for the lock, since there is a function that is not calling the lock explicitly and has a warn if the lock is not held at the start, so I put it there to be extra safe.
Alessandro
Heiner Kallweit
maintainerQuoted 30 lines · Alessandro B Maurici
Quoted 7 lines · On Tue, 23 Nov 2021 05:18:14 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 5 lines · Alessandro B Maurici
From: Alessandro B Maurici <[email protected]>
Releases the phy lock before calling
phy_link_changeto avoid any worker thread lockup. Some network drivers(eg Microchip's LAN743x), make a call tophy_ethtool_get_link_ksettingsinside the link change handlerQuoted 5 lines
I think we need to take a step back here and answer the question, why does it call
phy_ethtool_get_link_ksettingsin the link change handler. I'm not aware of any other MAC driver which does this.Andrew
I agree, the use in the lan743x seems related to the PTP, that driver seems to be the only one using it, at least in the Linus tree.
I think that driver could be patched as there are other ways to do it, but my take on the problem itself is that the PHY device interface opens a way to break the flow and this behavior does not seem to be documented, so, instead of documenting a possible harmful interface while in the callback, we should just get rid of the problem itself, and calling a callback without any locks held seems to be a good alternative.
This is also a non critical performance path and the additional code would not impact much, of course it makes the stuff less nice to look at. The patch also has an additional check for the lock, since there is a function that is not calling the lock explicitly and has a warn if the lock is not held at the start, so I put it there to be extra safe.
Quoted 2 lines
Alessandro
Seeing the following code snippet in lan743x_phy_link_status_change() I wonder why it doesn't use phydev->speed and phydev->duplex directly. The current code seems to include unneeded overhead.
phy_ethtool_get_link_ksettings(netdev, &ksettings); local_advertisement = linkmode_adv_to_mii_adv_t(phydev->advertising); remote_advertisement = linkmode_adv_to_mii_adv_t(phydev->lp_advertising); lan743x_phy_update_flowcontrol(adapter, ksettings.base.duplex, local_advertisement, remote_advertisement); lan743x_ptp_update_latency(adapter, ksettings.base.speed);
Andrew Lunn
maintainerQuoted 16 lines · Alessandro B Maurici
Quoted 7 lines · On Tue, 23 Nov 2021 05:18:14 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 5 lines · Alessandro B Maurici
From: Alessandro B Maurici <[email protected]>
Releases the phy lock before calling
phy_link_changeto avoid any worker thread lockup. Some network drivers(eg Microchip's LAN743x), make a call tophy_ethtool_get_link_ksettingsinside the link change handlerQuoted 5 lines
I think we need to take a step back here and answer the question, why does it call
phy_ethtool_get_link_ksettingsin the link change handler. I'm not aware of any other MAC driver which does this.Andrew
Quoted 8 lines
I agree, the use in the lan743x seems related to the PTP, that driver seems to be the only one using it, at least in the Linus tree.
I think that driver could be patched as there are other ways to do it, but my take on the problem itself is that the PHY device interface opens a way to break the flow and this behavior does not seem to be documented, so, instead of documenting a possible harmful interface while in the callback, we should just get rid of the problem itself, and calling a callback without any locks held seems to be a good alternative.
That is a really bad alternative. It is only because the lock is held can the MAC driver actually trust anything passed to it. The callback needs phydev->speed, phydev->duplex, etc, and they can change at any time when the lock is not held. The values can be inconsistent with each other, etc, unless the lock is held.
The callback has always had the lock held, so is safe. However, recently a few bugs have been reported and fixed for functions like phy_ethtool_get_link_ksettings() and phy_ethtool_set_link_ksettings() where they have accessed phydev members without the lock and got inconsistent values in race condition. These are hard race conditions to reproduce, but a deadlock like this is very obvious, easy to fix. I would also say that _ethtool_ in the function name is also a good hit this is intended to be used for an ethtool callback.
Lets remove the inappropriate use of phy_ethtool_get_link_ksettings() here.
Andrew
Andrew Lunn
maintainerQuoted 3 lines
Seeing the following code snippet in
lan743x_phy_link_status_change()I wonder why it doesn't usephydev->speedandphydev->duplexdirectly. The current code seems to include unneeded overhead.
Yes, that is the change i would make. When adding the extra locks i missed that a driver was doing something like this. I will check all other callers to see if they are using it in odd contexts.
Andrew
Russell King (Oracle)
reviewerQuoted 41 lines · Andrew Lunn
Quoted 16 lines · Alessandro B Maurici
Quoted 7 lines · On Tue, 23 Nov 2021 05:18:14 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 5 lines · Alessandro B Maurici
From: Alessandro B Maurici <[email protected]>
Releases the phy lock before calling
phy_link_changeto avoid any worker thread lockup. Some network drivers(eg Microchip's LAN743x), make a call tophy_ethtool_get_link_ksettingsinside the link change handlerQuoted 5 lines
I think we need to take a step back here and answer the question, why does it call
phy_ethtool_get_link_ksettingsin the link change handler. I'm not aware of any other MAC driver which does this.Andrew
Quoted 8 lines
I agree, the use in the lan743x seems related to the PTP, that driver seems to be the only one using it, at least in the Linus tree.
I think that driver could be patched as there are other ways to do it, but my take on the problem itself is that the PHY device interface opens a way to break the flow and this behavior does not seem to be documented, so, instead of documenting a possible harmful interface while in the callback, we should just get rid of the problem itself, and calling a callback without any locks held seems to be a good alternative.That is a really bad alternative. It is only because the lock is held can the MAC driver actually trust anything passed to it. The callback needs
phydev->speed,phydev->duplex, etc, and they can change at any time when the lock is not held. The values can be inconsistent with each other, etc, unless the lock is held.The callback has always had the lock held, so is safe. However, recently a few bugs have been reported and fixed for functions like
phy_ethtool_get_link_ksettings()andphy_ethtool_set_link_ksettings()where they have accessed phydev members without the lock and got inconsistent values in race condition. These are hard race conditions to reproduce, but a deadlock like this is very obvious, easy to fix. I would also say that _ethtool_ in the function name is also a good hit this is intended to be used for an ethtool callback.
Quoted 2 lines
Lets remove the inappropriate use of
phy_ethtool_get_link_ksettings()here.
100% agreed.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Quoted 9 lines · On Tue, 23 Nov 2021 15:09:04 +0100 Andrew Lunn <[email protected]> wrote:
The callback has always had the lock held, so is safe. However, recently a few bugs have been reported and fixed for functions like
phy_ethtool_get_link_ksettings()andphy_ethtool_set_link_ksettings()where they have accessed phydev members without the lock and got inconsistent values in race condition. These are hard race conditions to reproduce, but a deadlock like this is very obvious, easy to fix. I would also say that _ethtool_ in the function name is also a good hit this is intended to be used for an ethtool callback.
Quoted 4 lines
Lets remove the inappropriate use of
phy_ethtool_get_link_ksettings()here.Andrew
Yes, I was under the impression because the lan743x driver used that way, this was an expected use case, and that why the patch, but you are 100% correct that the phy_dev information sent to the call back would be unprotected if used with that patch. My mistake.
Alessandro
Quoted 5 lines · On Tue, 23 Nov 2021 15:11:22 +0100 Andrew Lunn <[email protected]> wrote:
Yes, that is the change i would make. When adding the extra locks i missed that a driver was doing something like this. I will check all other callers to see if they are using it in odd contexts.
Andrew
Andrew, this kinda of implementation is really hard to get in a fast review, fortunately I happen to be testing one lan743x board with a 5.10.79 kernel that had the new locks in place, and noticed that really fast, but I wrongly assumed that call was okayish since the driver was on stable.
If you need to do some testing I will still have the hardware with me for some time.
Alessandro
Heiner Kallweit
maintainerQuoted 9 lines · Alessandro B Maurici
Quoted 5 lines · On Tue, 23 Nov 2021 15:11:22 +0100 Andrew Lunn <[email protected]> wrote:
Yes, that is the change i would make. When adding the extra locks i missed that a driver was doing something like this. I will check all other callers to see if they are using it in odd contexts.
Andrew
Quoted 9 lines
Andrew, this kinda of implementation is really hard to get in a fast review, fortunately I happen to be testing one lan743x board with a 5.10.79 kernel that had the new locks in place, and noticed that really fast, but I wrongly assumed that call was okayish since the driver was on stable.
If you need to do some testing I will still have the hardware with me for some time.Alessandro
Great that you have test hw, could you please test the following patch? The duplex argument of lan743x_phy_update_flowcontrol() seems to be some leftover, it isn't used and can be removed.
drivers/net/ethernet/microchip/lan743x_main.c +3 -9
@@ -914,8 +914,7 @@ static int lan743x_phy_reset(struct lan743x_adapter *adapter) }static void lan743x_phy_update_flowcontrol (struct lan743x_adapter *adapter, -u8 duplex,u16 local_adv, -u16 remote_adv) +u16 local_adv,u16 remote_adv) {struct lan743x_phy *phy = &adapter->phy;u8 cap;
@@ -943,7 +942,6 @@ static void lan743x_phy_link_status_change(struct net_device *netdev)phy_print_status (phydev);if (phydev->state ==PHY_RUNNING ) { -struct ethtool_link_ksettings ksettings;int remote_advertisement =0 ;int local_advertisement =0 ;
@@ -980,18 +978,14 @@ static void lan743x_phy_link_status_change(struct net_device *netdev) }lan743x_csr_write (adapter,MAC_CR , data); -memset (&ksettings,0 ,sizeof (ksettings)); -phy_ethtool_get_link_ksettings (netdev, &ksettings); local_advertisement =linkmode_adv_to_mii_adv_t (phydev->advertising); remote_advertisement =linkmode_adv_to_mii_adv_t (phydev->lp_advertising); -lan743x_phy_update_flowcontrol (adapter, - ksettings.base.duplex, - local_advertisement, +lan743x_phy_update_flowcontrol (adapter, local_advertisement, remote_advertisement); -lan743x_ptp_update_latency (adapter, ksettings.base.speed); +lan743x_ptp_update_latency (adapter, phydev->speed); } }
Signature · 1 line
2.34.0
Quoted 38 lines · On Tue, 23 Nov 2021 21:32:56 +0100 Heiner Kallweit <[email protected]> wrote:
Great that you have test hw, could you please test the following patch? The duplex argument of
lan743x_phy_update_flowcontrol()seems to be some leftover, it isn't used and can be removed.drivers/net/ethernet/microchip/lan743x_main.c +1
-5@@ -914,8 +914,7 @@ static int lan743x_phy_reset(struct lan743x_adapter *adapter) }static void lan743x_phy_update_flowcontrol (struct lan743x_adapter *adapter, -u8 duplex,u16 local_adv, -u16 remote_adv) +u16 local_adv,u16 remote_adv) {struct lan743x_phy *phy = &adapter->phy;u8 cap;@@ -943,7 +942,6 @@ static void lan743x_phy_link_status_change(struct net_device *netdev)phy_print_status (phydev);if (phydev->state ==PHY_RUNNING ) { -struct ethtool_link_ksettings ksettings;int remote_advertisement =0 ;int local_advertisement =0 ;@@ -980,18 +978,14 @@ static void lan743x_phy_link_status_change(struct net_device *netdev) }lan743x_csr_write (adapter,MAC_CR , data); -memset (&ksettings,0 ,sizeof (ksettings)); -phy_ethtool_get_link_ksettings (netdev, &ksettings); local_advertisement =linkmode_adv_to_mii_adv_t (phydev->advertising); remote_advertisement =linkmode_adv_to_mii_adv_t (phydev->lp_advertising);
drivers/net/ethernet/microchip/lan743x_main.c static void lan743x_phy_link_status_change(struct net_device *netdev) · line 991
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_main.c +2
-4-lan743x_phy_update_flowcontrol (adapter, - ksettings.base.duplex, - local_advertisement, +lan743x_phy_update_flowcontrol (adapter, local_advertisement, remote_advertisement); -lan743x_ptp_update_latency (adapter, ksettings.base.speed); +lan743x_ptp_update_latency (adapter, phydev->speed); } }
Patch tested and working as expected.
Alessandro