diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2017-03-24 18:01:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-24 22:28:55 -0400 |
commit | 13a8cd191a2b470cfd435b3b57dbd21aa65ff78c (patch) | |
tree | 2da8c4b5f6c70d03eabec73f4bc84d9bc1550ebe /drivers/net/ethernet/intel/i40e/i40e_main.c | |
parent | 28ee1b746f493b7c62347d714f58fbf4f70df4f0 (diff) |
i40e: Do not enable NAPI on q_vectors that have no rings
When testing the epoll w/ busy poll code I found that I could get into a
state where the i40e driver had q_vectors w/ active NAPI that had no rings.
This was resulting in a divide by zero error. To correct it I am updating
the driver code so that we only support NAPI on q_vectors that have 1 or
more rings allocated to them.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index e8a8351c8ea9..82a95cc2c8ee 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -4438,8 +4438,12 @@ static void i40e_napi_enable_all(struct i40e_vsi *vsi) | |||
4438 | if (!vsi->netdev) | 4438 | if (!vsi->netdev) |
4439 | return; | 4439 | return; |
4440 | 4440 | ||
4441 | for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) | 4441 | for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) { |
4442 | napi_enable(&vsi->q_vectors[q_idx]->napi); | 4442 | struct i40e_q_vector *q_vector = vsi->q_vectors[q_idx]; |
4443 | |||
4444 | if (q_vector->rx.ring || q_vector->tx.ring) | ||
4445 | napi_enable(&q_vector->napi); | ||
4446 | } | ||
4443 | } | 4447 | } |
4444 | 4448 | ||
4445 | /** | 4449 | /** |
@@ -4453,8 +4457,12 @@ static void i40e_napi_disable_all(struct i40e_vsi *vsi) | |||
4453 | if (!vsi->netdev) | 4457 | if (!vsi->netdev) |
4454 | return; | 4458 | return; |
4455 | 4459 | ||
4456 | for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) | 4460 | for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) { |
4457 | napi_disable(&vsi->q_vectors[q_idx]->napi); | 4461 | struct i40e_q_vector *q_vector = vsi->q_vectors[q_idx]; |
4462 | |||
4463 | if (q_vector->rx.ring || q_vector->tx.ring) | ||
4464 | napi_disable(&q_vector->napi); | ||
4465 | } | ||
4458 | } | 4466 | } |
4459 | 4467 | ||
4460 | /** | 4468 | /** |