From: Salil Mehta <salil.mehta@huawei.com>
To: <davem@davemloft.net>
Cc: <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
<lipeng321@huawei.com>, <mehta.salil@opnsrc.net>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linuxarm@huawei.com>, Jian Shen <shenjian15@huawei.com>
Subject: [PATCH net-next 07/12] net: hns3: Add nic state check before calling netif_tx_wake_queue
Date: Fri, 21 Sep 2018 16:41:43 +0100 [thread overview]
Message-ID: <20180921154148.26756-8-salil.mehta@huawei.com> (raw)
In-Reply-To: <20180921154148.26756-1-salil.mehta@huawei.com>
From: Jian Shen <shenjian15@huawei.com>
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 <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
---
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 fc27f3f..73b42d3 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1973,6 +1973,7 @@ static int is_valid_clean_head(struct hns3_enet_ring *ring, int h)
void hns3_clean_tx_ring(struct hns3_enet_ring *ring)
{
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;
@@ -2018,7 +2019,8 @@ void hns3_clean_tx_ring(struct hns3_enet_ring *ring)
* 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.7.4
next prev parent reply other threads:[~2018-09-21 15:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 15:41 [PATCH net-next 00/12] Bug fixes, snall modifications & cleanup for HNS3 driver Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 01/12] net: hns3: Fix ets validate issue Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 02/12] net: hns3: Unify the type convert for desc.data Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 03/12] net: hns3: Adjust prefix of tx/rx statistic names Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 04/12] net: hns3: Fix tqp array traversal condition for vf Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 05/12] net: hns3: Unify the prefix of vf functions Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 06/12] net: hns3: Add handle for default case Salil Mehta
2018-09-21 15:41 ` Salil Mehta [this message]
2018-09-21 15:41 ` [PATCH net-next 08/12] net: hns3: Add unlikely for dma_mapping_error check Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 09/12] net: hns3: Remove print messages for error packet Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 10/12] net: hns3: Add get_media_type ops support for VF Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 11/12] net: hns3: Fix speed/duplex information loss problem when executing ethtool ethx cmd of VF Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 12/12] net: hns3: Remove redundant hclge_get_port_type() Salil Mehta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180921154148.26756-8-salil.mehta@huawei.com \
--to=salil.mehta@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=lipeng321@huawei.com \
--cc=mehta.salil@opnsrc.net \
--cc=netdev@vger.kernel.org \
--cc=shenjian15@huawei.com \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).