Commit b5d06f05 authored by Neerav Parikh's avatar Neerav Parikh Committed by Jeff Kirsher

i40e: Fix scheduling while atomic bug during NAPI

The bug is encountered when all the Tx hang recovery mechanisms have
failed and driver tries to bring down the interface in the interrupt context.
The patch defers this and schedules it for next cycle.

Change-ID: Id9cd1da15b0e5c018dce18da4d0eed5ef1e8a809
Signed-off-by: default avatarNeerav Parikh <neerav.parikh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c27936e7
...@@ -135,6 +135,7 @@ enum i40e_state_t { ...@@ -135,6 +135,7 @@ enum i40e_state_t {
__I40E_FILTER_OVERFLOW_PROMISC, __I40E_FILTER_OVERFLOW_PROMISC,
__I40E_SUSPENDED, __I40E_SUSPENDED,
__I40E_BAD_EEPROM, __I40E_BAD_EEPROM,
__I40E_DOWN_REQUESTED,
}; };
enum i40e_interrupt_policy { enum i40e_interrupt_policy {
......
...@@ -304,8 +304,8 @@ static void i40e_tx_timeout(struct net_device *netdev) ...@@ -304,8 +304,8 @@ static void i40e_tx_timeout(struct net_device *netdev)
break; break;
default: default:
netdev_err(netdev, "tx_timeout recovery unsuccessful\n"); netdev_err(netdev, "tx_timeout recovery unsuccessful\n");
set_bit(__I40E_DOWN, &vsi->state); set_bit(__I40E_DOWN_REQUESTED, &pf->state);
i40e_down(vsi); set_bit(__I40E_DOWN_REQUESTED, &vsi->state);
break; break;
} }
i40e_service_event_schedule(pf); i40e_service_event_schedule(pf);
...@@ -4690,6 +4690,23 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags) ...@@ -4690,6 +4690,23 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags)
} }
} }
/* no further action needed, so return now */
return;
} else if (reset_flags & (1 << __I40E_DOWN_REQUESTED)) {
int v;
/* Find the VSI(s) that needs to be brought down */
dev_info(&pf->pdev->dev, "VSI down requested\n");
for (v = 0; v < pf->num_alloc_vsi; v++) {
struct i40e_vsi *vsi = pf->vsi[v];
if (vsi != NULL &&
test_bit(__I40E_DOWN_REQUESTED, &vsi->state)) {
set_bit(__I40E_DOWN, &vsi->state);
i40e_down(vsi);
clear_bit(__I40E_DOWN_REQUESTED, &vsi->state);
}
}
/* no further action needed, so return now */ /* no further action needed, so return now */
return; return;
} else { } else {
...@@ -5162,6 +5179,10 @@ static void i40e_reset_subtask(struct i40e_pf *pf) ...@@ -5162,6 +5179,10 @@ static void i40e_reset_subtask(struct i40e_pf *pf)
reset_flags |= (1 << __I40E_GLOBAL_RESET_REQUESTED); reset_flags |= (1 << __I40E_GLOBAL_RESET_REQUESTED);
clear_bit(__I40E_GLOBAL_RESET_REQUESTED, &pf->state); clear_bit(__I40E_GLOBAL_RESET_REQUESTED, &pf->state);
} }
if (test_bit(__I40E_DOWN_REQUESTED, &pf->state)) {
reset_flags |= (1 << __I40E_DOWN_REQUESTED);
clear_bit(__I40E_DOWN_REQUESTED, &pf->state);
}
/* If there's a recovery already waiting, it takes /* If there's a recovery already waiting, it takes
* precedence before starting a new reset sequence. * precedence before starting a new reset sequence.
......
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