Commit c5be6562 authored by Lukasz Czapnik's avatar Lukasz Czapnik Committed by Tony Nguyen
Browse files

ice: fix input validation for virtchnl BW 



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: 01530775 ("ice: Support VF queue rate limit and quanta size configuration")
Reviewed-by: default avatarJedrzej Jagielski <jedrzej.jagielski@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarLukasz Czapnik <lukasz.czapnik@intel.com>
Co-developed-by: default avatarMartyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com>
Signed-off-by: default avatarMartyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent e2f7d3f7

drivers/net/ethernet/intel/ice/ice_virtchnl.c

+21 −3
Original line number Diff line number Diff line
@@ -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++) {