Commit b984806d authored by Yonglong Liu's avatar Yonglong Liu Committed by Greg Kroah-Hartman

net: hns: Avoid net reset caused by pause frames storm

[ Upstream commit a57275d3 ]

There will be a large number of MAC pause frames on the net,
which caused tx timeout of net device. And then the net device
was reset to try to recover it. So that is not useful, and will
cause some other problems.

So need doubled ndev->watchdog_timeo if device watchdog occurred
until watchdog_timeo up to 40s and then try resetting to recover
it.

When collecting dfx information such as hardware registers when tx timeout.
Some registers for count were cleared when read. So need move this task
before update net state which also read the count registers.
Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 02ad6ced
...@@ -1609,11 +1609,19 @@ static int hns_nic_net_stop(struct net_device *ndev) ...@@ -1609,11 +1609,19 @@ static int hns_nic_net_stop(struct net_device *ndev)
} }
static void hns_tx_timeout_reset(struct hns_nic_priv *priv); static void hns_tx_timeout_reset(struct hns_nic_priv *priv);
#define HNS_TX_TIMEO_LIMIT (40 * HZ)
static void hns_nic_net_timeout(struct net_device *ndev) static void hns_nic_net_timeout(struct net_device *ndev)
{ {
struct hns_nic_priv *priv = netdev_priv(ndev); struct hns_nic_priv *priv = netdev_priv(ndev);
hns_tx_timeout_reset(priv); if (ndev->watchdog_timeo < HNS_TX_TIMEO_LIMIT) {
ndev->watchdog_timeo *= 2;
netdev_info(ndev, "watchdog_timo changed to %d.\n",
ndev->watchdog_timeo);
} else {
ndev->watchdog_timeo = HNS_NIC_TX_TIMEOUT;
hns_tx_timeout_reset(priv);
}
} }
static int hns_nic_do_ioctl(struct net_device *netdev, struct ifreq *ifr, static int hns_nic_do_ioctl(struct net_device *netdev, struct ifreq *ifr,
...@@ -2193,11 +2201,11 @@ static void hns_nic_service_task(struct work_struct *work) ...@@ -2193,11 +2201,11 @@ static void hns_nic_service_task(struct work_struct *work)
= container_of(work, struct hns_nic_priv, service_task); = container_of(work, struct hns_nic_priv, service_task);
struct hnae_handle *h = priv->ae_handle; struct hnae_handle *h = priv->ae_handle;
hns_nic_reset_subtask(priv);
hns_nic_update_link_status(priv->netdev); hns_nic_update_link_status(priv->netdev);
h->dev->ops->update_led_status(h); h->dev->ops->update_led_status(h);
hns_nic_update_stats(priv->netdev); hns_nic_update_stats(priv->netdev);
hns_nic_reset_subtask(priv);
hns_nic_service_event_complete(priv); hns_nic_service_event_complete(priv);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment