0
0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-19 00:54:41 +08:00

tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes

The driver function tg3_io_error_detected() calls napi_disable twice,
without an intervening napi_enable, when the number of EEH errors exceeds
eeh_max_freezes, resulting in an indefinite sleep while holding rtnl_lock.

Add check for pcierr_recovery which skips code already executed for the
"Frozen" state.

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Christensen 2020-06-17 11:51:17 -07:00 committed by David S. Miller
parent 4c98045c9b
commit 3a2656a211

View File

@ -18168,8 +18168,8 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,
rtnl_lock(); rtnl_lock();
/* We probably don't have netdev yet */ /* Could be second call or maybe we don't have netdev yet */
if (!netdev || !netif_running(netdev)) if (!netdev || tp->pcierr_recovery || !netif_running(netdev))
goto done; goto done;
/* We needn't recover from permanent error */ /* We needn't recover from permanent error */