|
@@ -7721,10 +7721,11 @@ static int i40e_init_msix(struct i40e_pf *pf)
|
|
|
* i40e_vsi_alloc_q_vector - Allocate memory for a single interrupt vector
|
|
|
* @vsi: the VSI being configured
|
|
|
* @v_idx: index of the vector in the vsi struct
|
|
|
+ * @cpu: cpu to be used on affinity_mask
|
|
|
*
|
|
|
* We allocate one q_vector. If allocation fails we return -ENOMEM.
|
|
|
**/
|
|
|
-static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
|
|
|
+static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx, int cpu)
|
|
|
{
|
|
|
struct i40e_q_vector *q_vector;
|
|
|
|
|
@@ -7735,7 +7736,8 @@ static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
|
|
|
|
|
|
q_vector->vsi = vsi;
|
|
|
q_vector->v_idx = v_idx;
|
|
|
- cpumask_set_cpu(v_idx, &q_vector->affinity_mask);
|
|
|
+ cpumask_set_cpu(cpu, &q_vector->affinity_mask);
|
|
|
+
|
|
|
if (vsi->netdev)
|
|
|
netif_napi_add(vsi->netdev, &q_vector->napi,
|
|
|
i40e_napi_poll, NAPI_POLL_WEIGHT);
|
|
@@ -7759,8 +7761,7 @@ static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
|
|
|
static int i40e_vsi_alloc_q_vectors(struct i40e_vsi *vsi)
|
|
|
{
|
|
|
struct i40e_pf *pf = vsi->back;
|
|
|
- int v_idx, num_q_vectors;
|
|
|
- int err;
|
|
|
+ int err, v_idx, num_q_vectors, current_cpu;
|
|
|
|
|
|
/* if not MSIX, give the one vector only to the LAN VSI */
|
|
|
if (pf->flags & I40E_FLAG_MSIX_ENABLED)
|
|
@@ -7770,10 +7771,15 @@ static int i40e_vsi_alloc_q_vectors(struct i40e_vsi *vsi)
|
|
|
else
|
|
|
return -EINVAL;
|
|
|
|
|
|
+ current_cpu = cpumask_first(cpu_online_mask);
|
|
|
+
|
|
|
for (v_idx = 0; v_idx < num_q_vectors; v_idx++) {
|
|
|
- err = i40e_vsi_alloc_q_vector(vsi, v_idx);
|
|
|
+ err = i40e_vsi_alloc_q_vector(vsi, v_idx, current_cpu);
|
|
|
if (err)
|
|
|
goto err_out;
|
|
|
+ current_cpu = cpumask_next(current_cpu, cpu_online_mask);
|
|
|
+ if (unlikely(current_cpu >= nr_cpu_ids))
|
|
|
+ current_cpu = cpumask_first(cpu_online_mask);
|
|
|
}
|
|
|
|
|
|
return 0;
|