openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i40e: Fix recalculation of MSI-X vectors for VMDq 

This patch adds a recalculation of number of MSI-X
vectors for VMDq in the case where we have less
vectors available than we would want to reserve for
VMDq.

It fixes the issue where we recalculate vectors left
and vectors wanted but we didn't take into account
the reduced number of queue pairs per VSI.

Signed-off-by: Patryk Małek <patryk.malek@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Patryk Małek 2018-05-10 05:59:44 -07:00 committed by Jeff Kirsher
parent 132ee00eed
commit ca12c9d421
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -10309,21 +10309,28 @@ static int i40e_init_msix(struct i40e_pf *pf)
/* any vectors left over go for VMDq support */ /* any vectors left over go for VMDq support */
if (pf->flags & I40E_FLAG_VMDQ_ENABLED) { if (pf->flags & I40E_FLAG_VMDQ_ENABLED) {
int vmdq_vecs_wanted = pf->num_vmdq_vsis * pf->num_vmdq_qps;
int vmdq_vecs = min_t(int, vectors_left, vmdq_vecs_wanted);
if (!vectors_left) { if (!vectors_left) {
pf->num_vmdq_msix = 0; pf->num_vmdq_msix = 0;
pf->num_vmdq_qps = 0; pf->num_vmdq_qps = 0;
} else { } else {
int vmdq_vecs_wanted =
pf->num_vmdq_vsis * pf->num_vmdq_qps;
int vmdq_vecs =
min_t(int, vectors_left, vmdq_vecs_wanted);
/* if we're short on vectors for what's desired, we limit /* if we're short on vectors for what's desired, we limit
* the queues per vmdq. If this is still more than are * the queues per vmdq. If this is still more than are
* available, the user will need to change the number of * available, the user will need to change the number of
* queues/vectors used by the PF later with the ethtool * queues/vectors used by the PF later with the ethtool
* channels command * channels command
*/ */
if (vmdq_vecs < vmdq_vecs_wanted) if (vectors_left < vmdq_vecs_wanted) {
pf->num_vmdq_qps = 1; pf->num_vmdq_qps = 1;
vmdq_vecs_wanted = pf->num_vmdq_vsis;
vmdq_vecs = min_t(int,
vectors_left,
vmdq_vecs_wanted);
}
pf->num_vmdq_msix = pf->num_vmdq_qps; pf->num_vmdq_msix = pf->num_vmdq_qps;
v_budget += vmdq_vecs; v_budget += vmdq_vecs;