diff options
| author |   David Christensen <drc@linux.vnet.ibm.com> | 2020-06-17 11:51:17 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-06-18 20:35:04 -0700 |
| commit | 3a2656a211caf35e56afc9425e6e518fa52f7fbc (patch) | |
| tree | ef10066ea45a0efcae4703b620742d360415dfa7 | |
| parent | bareudp: Fixed multiproto mode configuration (diff) | |
| download | wireguard-linux-3a2656a211caf35e56afc9425e6e518fa52f7fbc.tar.xz wireguard-linux-3a2656a211caf35e56afc9425e6e518fa52f7fbc.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 7a3b22b35238..ebff1fc0d8ce 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -18168,8 +18168,8 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, rtnl_lock(); - /* We probably don't have netdev yet */ - if (!netdev || !netif_running(netdev)) + /* Could be second call or maybe we don't have netdev yet */ + if (!netdev || tp->pcierr_recovery || !netif_running(netdev)) goto done; /* We needn't recover from permanent error */ |