bcm63xx_enet: fix sporadic kernel panic

In ndo_stop functions, netdev_completed_queue() is called during forced
tx reclaim, after netdev_reset_queue(). This may trigger kernel panic if
there is any tx skb left.

This patch moves netdev_reset_queue() to after tx reclaim, so BQL can
complete successfully then reset.

Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com>
Fixes: 4c59b0f5543d ("bcm63xx_enet: add BQL support")
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20210222013530.1356-1-liew.s.piaw@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index fd8767213165779560090759026b62f97f6c7301..977f097fc7bf70f1e84e4c3456fda5206d3950b3 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1192,7 +1192,6 @@ static int bcm_enet_stop(struct net_device *dev)
        kdev = &priv->pdev->dev;
 
        netif_stop_queue(dev);
-       netdev_reset_queue(dev);
        napi_disable(&priv->napi);
        if (priv->has_phy)
                phy_stop(dev->phydev);
@@ -1231,6 +1230,9 @@ static int bcm_enet_stop(struct net_device *dev)
        if (priv->has_phy)
                phy_disconnect(dev->phydev);
 
+       /* reset BQL after forced tx reclaim to prevent kernel panic */
+       netdev_reset_queue(dev);
+
        return 0;
 }
 
@@ -2343,7 +2345,6 @@ static int bcm_enetsw_stop(struct net_device *dev)
 
        del_timer_sync(&priv->swphy_poll);
        netif_stop_queue(dev);
-       netdev_reset_queue(dev);
        napi_disable(&priv->napi);
        del_timer_sync(&priv->rx_timeout);
 
@@ -2371,6 +2372,9 @@ static int bcm_enetsw_stop(struct net_device *dev)
                free_irq(priv->irq_tx, dev);
        free_irq(priv->irq_rx, dev);
 
+       /* reset BQL after forced tx reclaim to prevent kernel panic */
+       netdev_reset_queue(dev);
+
        return 0;
 }