| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Alan Brady <[email protected]>
- Date: Mon, 29 Oct 2018 11:27:21 -0700
- Subject: [PATCH] i40e: prevent overlapping tx_timeout recover
- If a TX hang occurs, we attempt to recover by incrementally resetting.
- If we're starved for CPU time, it's possible the reset doesn't actually
- complete (or even fire) before another tx_timeout fires causing us to
- fly through the different resets without actually doing them.
- This adds a bit to set and check if a timeout recovery is already
- pending and, if so, bail out of tx_timeout. The bit will get cleared at
- the end of i40e_rebuild when reset is complete.
- Signed-off-by: Alan Brady <[email protected]>
- Tested-by: Andrew Bowers <[email protected]>
- Signed-off-by: Jeff Kirsher <[email protected]>
- Signed-off-by: Thomas Lamprecht <[email protected]>
- ---
- drivers/net/ethernet/intel/i40e/i40e.h | 1 +
- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++
- 2 files changed, 6 insertions(+)
- diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
- index e019baa905c5..80114d6a910a 100644
- --- a/drivers/net/ethernet/intel/i40e/i40e.h
- +++ b/drivers/net/ethernet/intel/i40e/i40e.h
- @@ -145,6 +145,7 @@ enum i40e_state_t {
- __I40E_MDD_EVENT_PENDING,
- __I40E_VFLR_EVENT_PENDING,
- __I40E_RESET_RECOVERY_PENDING,
- + __I40E_TIMEOUT_RECOVERY_PENDING,
- __I40E_MISC_IRQ_REQUESTED,
- __I40E_RESET_INTR_RECEIVED,
- __I40E_REINIT_REQUESTED,
- diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
- index 7895a0af37e6..874fd143c351 100644
- --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
- +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
- @@ -365,6 +365,10 @@ static void i40e_tx_timeout(struct net_device *netdev)
- (pf->tx_timeout_last_recovery + netdev->watchdog_timeo)))
- return; /* don't do any new action before the next timeout */
-
- + /* don't kick off another recovery if one is already pending */
- + if (test_and_set_bit(__I40E_TIMEOUT_RECOVERY_PENDING, pf->state))
- + return;
- +
- if (tx_ring) {
- head = i40e_get_head(tx_ring);
- /* Read interrupt register */
- @@ -9478,6 +9482,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
- clear_bit(__I40E_RESET_FAILED, pf->state);
- clear_recovery:
- clear_bit(__I40E_RESET_RECOVERY_PENDING, pf->state);
- + clear_bit(__I40E_TIMEOUT_RECOVERY_PENDING, pf->state);
- }
-
- /**
|
