Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 118f36c1 authored by Jian Shen's avatar Jian Shen Committed by Greg Kroah-Hartman
Browse files

net: hns3: Add nic state check before calling netif_tx_wake_queue 



[ 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: 424eb834 ("net: hns3: Unified HNS3 {VF|PF} Ethernet Driver for hip08 SoC")
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e79c6b6

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+3 −1
Original line number Diff line number Diff line
@@ -1915,6 +1915,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;
@@ -1961,7 +1962,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++;

		}