github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 19:16:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ice: fix input validation for virtchnl BW

Browse Source 
Add missing validation of tc and queue id values sent by a VF in
ice_vc_cfg_q_bw().
Additionally fixed logged value in the warning message,
where max_tx_rate was incorrectly referenced instead of min_tx_rate.
Also correct error handling in this function by properly exiting
when invalid configuration is detected.

Fixes: 015307754a ("ice: Support VF queue rate limit and quanta size configuration")
Reviewed-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Lukasz Czapnik <lukasz.czapnik@intel.com>
Co-developed-by: Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com>
Signed-off-by: Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Lukasz Czapnik 2025-03-04 12:08:34 +01:00 committed by Tony Nguyen
parent e2f7d3f733
commit c5be6562de
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/intel/ice/ice_virtchnl.c
View File

@ -1862,15 +1862,33 @@ static int ice_vc_cfg_q_bw(struct ice_vf *vf, u8 *msg)
for (i = 0; i < qbw->num_queues; i++) {
if (qbw->cfg[i].shaper.peak != 0 && vf->max_tx_rate != 0 &&
qbw->cfg[i].shaper.peak > vf->max_tx_rate)
qbw->cfg[i].shaper.peak > vf->max_tx_rate) {
dev_warn(ice_pf_to_dev(vf->pf), "The maximum queue %d rate limit configuration may not take effect because the maximum TX rate for VF-%d is %d\n",
qbw->cfg[i].queue_id, vf->vf_id,
vf->max_tx_rate);
v_ret = VIRTCHNL_STATUS_ERR_PARAM;
goto err;
}
if (qbw->cfg[i].shaper.committed != 0 && vf->min_tx_rate != 0 &&
qbw->cfg[i].shaper.committed < vf->min_tx_rate)
qbw->cfg[i].shaper.committed < vf->min_tx_rate) {
dev_warn(ice_pf_to_dev(vf->pf), "The minimum queue %d rate limit configuration may not take effect because the minimum TX rate for VF-%d is %d\n",
qbw->cfg[i].queue_id, vf->vf_id,
vf->max_tx_rate);
vf->min_tx_rate);
v_ret = VIRTCHNL_STATUS_ERR_PARAM;
goto err;
}
if (qbw->cfg[i].queue_id > vf->num_vf_qs) {
dev_warn(ice_pf_to_dev(vf->pf), "VF-%d trying to configure invalid queue_id\n",
vf->vf_id);
v_ret = VIRTCHNL_STATUS_ERR_PARAM;
goto err;
}
if (qbw->cfg[i].tc >= ICE_MAX_TRAFFIC_CLASS) {
dev_warn(ice_pf_to_dev(vf->pf), "VF-%d trying to configure a traffic class higher than allowed\n",
vf->vf_id);
v_ret = VIRTCHNL_STATUS_ERR_PARAM;
goto err;
}
}
for (i = 0; i < qbw->num_queues; i++) {