Commit 152b978a authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher

ice: Rework ice_ena_msix_range

The current implementation of ice_ena_msix_range is difficult to read
and has subtle issues. This patch reworks the said function for
clarity and correctness.

More specifically,

1. Add more checks to bail out of 'needed' is greater than 'v_left'.

2. Simplify fallback logic

3. Do not set pf->num_avail_sw_msix in ice_ena_msix_range as it
   gets overwritten by ice_init_interrupt_scheme.
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent cb6a8dc0
...@@ -2281,13 +2281,18 @@ static int ice_ena_msix_range(struct ice_pf *pf) ...@@ -2281,13 +2281,18 @@ static int ice_ena_msix_range(struct ice_pf *pf)
/* reserve one vector for miscellaneous handler */ /* reserve one vector for miscellaneous handler */
needed = 1; needed = 1;
if (v_left < needed)
goto no_hw_vecs_left_err;
v_budget += needed; v_budget += needed;
v_left -= needed; v_left -= needed;
/* reserve vectors for LAN traffic */ /* reserve vectors for LAN traffic */
pf->num_lan_msix = min_t(int, num_online_cpus(), v_left); needed = min_t(int, num_online_cpus(), v_left);
v_budget += pf->num_lan_msix; if (v_left < needed)
v_left -= pf->num_lan_msix; goto no_hw_vecs_left_err;
pf->num_lan_msix = needed;
v_budget += needed;
v_left -= needed;
pf->msix_entries = devm_kcalloc(&pf->pdev->dev, v_budget, pf->msix_entries = devm_kcalloc(&pf->pdev->dev, v_budget,
sizeof(*pf->msix_entries), GFP_KERNEL); sizeof(*pf->msix_entries), GFP_KERNEL);
...@@ -2312,18 +2317,18 @@ static int ice_ena_msix_range(struct ice_pf *pf) ...@@ -2312,18 +2317,18 @@ static int ice_ena_msix_range(struct ice_pf *pf)
if (v_actual < v_budget) { if (v_actual < v_budget) {
dev_warn(&pf->pdev->dev, dev_warn(&pf->pdev->dev,
"not enough vectors. requested = %d, obtained = %d\n", "not enough OS MSI-X vectors. requested = %d, obtained = %d\n",
v_budget, v_actual); v_budget, v_actual);
if (v_actual >= (pf->num_lan_msix + 1)) { /* 2 vectors for LAN (traffic + OICR) */
pf->num_avail_sw_msix = v_actual - #define ICE_MIN_LAN_VECS 2
(pf->num_lan_msix + 1);
} else if (v_actual >= 2) { if (v_actual < ICE_MIN_LAN_VECS) {
pf->num_lan_msix = 1; /* error if we can't get minimum vectors */
pf->num_avail_sw_msix = v_actual - 2;
} else {
pci_disable_msix(pf->pdev); pci_disable_msix(pf->pdev);
err = -ERANGE; err = -ERANGE;
goto msix_err; goto msix_err;
} else {
pf->num_lan_msix = ICE_MIN_LAN_VECS;
} }
} }
...@@ -2333,6 +2338,11 @@ static int ice_ena_msix_range(struct ice_pf *pf) ...@@ -2333,6 +2338,11 @@ static int ice_ena_msix_range(struct ice_pf *pf)
devm_kfree(&pf->pdev->dev, pf->msix_entries); devm_kfree(&pf->pdev->dev, pf->msix_entries);
goto exit_err; goto exit_err;
no_hw_vecs_left_err:
dev_err(&pf->pdev->dev,
"not enough device MSI-X vectors. requested = %d, available = %d\n",
needed, v_left);
err = -ERANGE;
exit_err: exit_err:
pf->num_lan_msix = 0; pf->num_lan_msix = 0;
return err; return err;
......
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