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: 015307754a19 ("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>

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
index df13f5110168dd3cd7d0682eaf3ef81d4e2465e6..1af51469f070b65d7a50f08f5fd774763649877a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
@@ -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++) {