| From afeed24d8e66a49eec9d89241e54b95784546c41 Mon Sep 17 00:00:00 2001 |
| From: Haiyang Zhang <haiyangz@microsoft.com> |
| Date: Fri, 21 Feb 2020 08:32:18 -0800 |
| Subject: [PATCH] hv_netvsc: Fix unwanted wakeup in netvsc_attach() |
| |
| commit f6f13c125e05603f68f5bf31f045b95e6d493598 upstream. |
| |
| When netvsc_attach() is called by operations like changing MTU, etc., |
| an extra wakeup may happen while netvsc_attach() calling |
| rndis_filter_device_add() which sends rndis messages when queue is |
| stopped in netvsc_detach(). The completion message will wake up queue 0. |
| |
| We can reproduce the issue by changing MTU etc., then the wake_queue |
| counter from "ethtool -S" will increase beyond stop_queue counter: |
| stop_queue: 0 |
| wake_queue: 1 |
| The issue causes queue wake up, and counter increment, no other ill |
| effects in current code. So we didn't see any network problem for now. |
| |
| To fix this, initialize tx_disable to true, and set it to false when |
| the NIC is ready to be attached or registered. |
| |
| Fixes: 7b2ee50c0cd5 ("hv_netvsc: common detach logic") |
| Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c |
| index d22a36fc7a7c..7745febdac73 100644 |
| --- a/drivers/net/hyperv/netvsc.c |
| +++ b/drivers/net/hyperv/netvsc.c |
| @@ -99,7 +99,7 @@ static struct netvsc_device *alloc_net_device(void) |
| |
| init_waitqueue_head(&net_device->wait_drain); |
| net_device->destroy = false; |
| - net_device->tx_disable = false; |
| + net_device->tx_disable = true; |
| |
| net_device->max_pkt = RNDIS_MAX_PKT_DEFAULT; |
| net_device->pkt_align = RNDIS_PKT_ALIGN_DEFAULT; |
| diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c |
| index fb8d416f45f7..15447151ddc4 100644 |
| --- a/drivers/net/hyperv/netvsc_drv.c |
| +++ b/drivers/net/hyperv/netvsc_drv.c |
| @@ -973,6 +973,7 @@ static int netvsc_attach(struct net_device *ndev, |
| } |
| |
| /* In any case device is now ready */ |
| + nvdev->tx_disable = false; |
| netif_device_attach(ndev); |
| |
| /* Note: enable and attach happen when sub-channels setup */ |
| @@ -2332,6 +2333,8 @@ static int netvsc_probe(struct hv_device *dev, |
| else |
| net->max_mtu = ETH_DATA_LEN; |
| |
| + nvdev->tx_disable = false; |
| + |
| ret = register_netdevice(net); |
| if (ret != 0) { |
| pr_err("Unable to register netdev.\n"); |
| -- |
| 2.7.4 |
| |
