Commit c135b0de authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher

i40e: scale msix vector use when more cores than vectors

When there are more cores than vectors available to the PF, scale back
the LAN msix usage to force queue/vector sharing and leave some vectors
for Flow Director, VMDq, etc.

Change-ID: Ie0317732eb85ad8d851d7da7d9af86b1bf8c21ad
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarPatrick Lu <patrick.lu@intel.com>
Tested-by: default avatarJim Young <jamesx.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 7204a785
...@@ -6699,6 +6699,7 @@ static int i40e_init_msix(struct i40e_pf *pf) ...@@ -6699,6 +6699,7 @@ static int i40e_init_msix(struct i40e_pf *pf)
{ {
i40e_status err = 0; i40e_status err = 0;
struct i40e_hw *hw = &pf->hw; struct i40e_hw *hw = &pf->hw;
int other_vecs = 0;
int v_budget, i; int v_budget, i;
int vec; int vec;
...@@ -6724,10 +6725,10 @@ static int i40e_init_msix(struct i40e_pf *pf) ...@@ -6724,10 +6725,10 @@ static int i40e_init_msix(struct i40e_pf *pf)
*/ */
pf->num_lan_msix = pf->num_lan_qps - (pf->rss_size_max - pf->rss_size); pf->num_lan_msix = pf->num_lan_qps - (pf->rss_size_max - pf->rss_size);
pf->num_vmdq_msix = pf->num_vmdq_qps; pf->num_vmdq_msix = pf->num_vmdq_qps;
v_budget = 1 + pf->num_lan_msix; other_vecs = 1;
v_budget += (pf->num_vmdq_vsis * pf->num_vmdq_msix); other_vecs += (pf->num_vmdq_vsis * pf->num_vmdq_msix);
if (pf->flags & I40E_FLAG_FD_SB_ENABLED) if (pf->flags & I40E_FLAG_FD_SB_ENABLED)
v_budget++; other_vecs++;
#ifdef I40E_FCOE #ifdef I40E_FCOE
if (pf->flags & I40E_FLAG_FCOE_ENABLED) { if (pf->flags & I40E_FLAG_FCOE_ENABLED) {
...@@ -6737,7 +6738,9 @@ static int i40e_init_msix(struct i40e_pf *pf) ...@@ -6737,7 +6738,9 @@ static int i40e_init_msix(struct i40e_pf *pf)
#endif #endif
/* Scale down if necessary, and the rings will share vectors */ /* Scale down if necessary, and the rings will share vectors */
v_budget = min_t(int, v_budget, hw->func_caps.num_msix_vectors); pf->num_lan_msix = min_t(int, pf->num_lan_msix,
(hw->func_caps.num_msix_vectors - other_vecs));
v_budget = pf->num_lan_msix + other_vecs;
pf->msix_entries = kcalloc(v_budget, sizeof(struct msix_entry), pf->msix_entries = kcalloc(v_budget, sizeof(struct msix_entry),
GFP_KERNEL); GFP_KERNEL);
......
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