i40e: prevent overlapping tx_timeout recover
Subsystems (2)
PATCH 1/1 i40e: prevent overlapping tx_timeout recover
From: Alan Brady <[email protected]>
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.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -122,6 +122,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,
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -0
@@ -338,6 +338,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 */
@@ -9631,6 +9635,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); }/**
Signature · 1 line
2.9.5
Bowers
PATCH 1/1 i40e: prevent overlapping tx_timeout recover
Quoted 20 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Monday, October 29, 2018 11:27 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH] i40e: prevent overlappingtx_timeoutrecoverFrom: Alan Brady <[email protected]>
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_timeoutfires 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 ofi40e_rebuildwhen reset is complete.
Quoted 5 lines
Signed-off-by Alan Brady <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++ 2 files changed, 6 insertions(+)