Re: [PATCH 3/3] drivers/net/ftgmac100: fix DHCP potential failure with systemd

From: Heyi Guo
Date: Wed Feb 23 2022 - 06:39:52 EST


Hi Florian,

在 2022/2/23 下午1:00, Florian Fainelli 写道:


On 2/22/2022 7:14 PM, Heyi Guo wrote:
DHCP failures were observed with systemd 247.6. The issue could be
reproduced by rebooting Aspeed 2600 and then running ifconfig ethX
down/up.

It is caused by below procedures in the driver:

1. ftgmac100_open() enables net interface and call phy_start()
2. When PHY is link up, it calls netif_carrier_on() and then
adjust_link callback
3. ftgmac100_adjust_link() will schedule the reset task
4. ftgmac100_reset_task() will then reset the MAC in another schedule

After step 2, systemd will be notified to send DHCP discover packet,
while the packet might be corrupted by MAC reset operation in step 4.

Call ftgmac100_reset() directly instead of scheduling task to fix the
issue.

Signed-off-by: Heyi Guo <guoheyi@xxxxxxxxxxxxxxxxx>
---
Cc: Andrew Lunn <andrew@xxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Jakub Kicinski <kuba@xxxxxxxxxx>
Cc: Joel Stanley <joel@xxxxxxxxx>
Cc: Guangbin Huang <huangguangbin2@xxxxxxxxxx>
Cc: Hao Chen <chenhao288@xxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Dylan Hung <dylan_hung@xxxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx


---
  drivers/net/ethernet/faraday/ftgmac100.c | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index c1deb6e5d26c5..d5356db7539a4 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1402,8 +1402,17 @@ static void ftgmac100_adjust_link(struct net_device *netdev)
      /* Disable all interrupts */
      iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);
  -    /* Reset the adapter asynchronously */
-    schedule_work(&priv->reset_task);
+    /* Release phy lock to allow ftgmac100_reset to aquire it, keeping lock

typo: acquire

Thanks for the catch :)
+     * order consistent to prevent dead lock.
+     */
+    if (netdev->phydev)
+        mutex_unlock(&netdev->phydev->lock);
+
+    ftgmac100_reset(priv);
+
+    if (netdev->phydev)
+        mutex_lock(&netdev->phydev->lock);

Do you really need to perform a full MAC reset whenever the link goes up or down? Instead cannot you just extract the maccr configuration which adjusts the speed and be done with it?

This is the original behavior and not changed in this patch set, and I'm not familiar with the hardware design of ftgmac100, so I'd like to limit the changes to the code which really causes practical issues.

Thanks,

Heyi


What kind of Ethernet MAC design is this seriously.