[PATCH AUTOSEL 4.18 042/126] net: hns3: Add nic state check before calling netif_tx_wake_queue

[Sasha Levin]

From: Jian Shen <shenjia...@huawei.com>

[ Upstream commit 7a8101109dd37837f587cd56f3111d4fc17a07f5 ]

When nic down, it firstly calls netif_tx_stop_all_queues(), then calls
napi_disable(). But napi_disable() will wait current napi_poll finish,
it may call netif_tx_wake_queue(). This patch fixes it by add nic state
checking.

Fixes: 424eb834a9be ("net: hns3: Unified HNS3 {VF|PF} Ethernet Driver for hip08 
SoC")
Signed-off-by: Jian Shen <shenjia...@huawei.com>
Signed-off-by: Peng Li <lipeng...@huawei.com>
Signed-off-by: Salil Mehta <salil.me...@huawei.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c 
b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 9d69621f5ab4..542f16074dc9 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1907,6 +1907,7 @@ static int is_valid_clean_head(struct hns3_enet_ring 
*ring, int h)
 bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget)
 {
        struct net_device *netdev = ring->tqp->handle->kinfo.netdev;
+       struct hns3_nic_priv *priv = netdev_priv(netdev);
        struct netdev_queue *dev_queue;
        int bytes, pkts;
        int head;
@@ -1953,7 +1954,8 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int 
budget)
                 * sees the new next_to_clean.
                 */
                smp_mb();
-               if (netif_tx_queue_stopped(dev_queue)) {
+               if (netif_tx_queue_stopped(dev_queue) &&
+                   !test_bit(HNS3_NIC_STATE_DOWN, &priv->state)) {
                        netif_tx_wake_queue(dev_queue);
                        ring->stats.restart_queue++;
                }
-- 
2.17.1