From patchwork Mon Feb 17 10:27:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martyna Szapar-Mudlaw X-Patchwork-Id: 13977520 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED1892165E3 for ; Mon, 17 Feb 2025 10:29:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788145; cv=none; b=VsZ6eiJLE7WAeQ+da6bzTzmpe/8yw7sXPJPNiot0Isb1JqXWuYRTq21naBijoQ3XsBZI6FCkmxjb01TpKFrI59Vd9pPys9A9Rp+gK6GqdxYLUfa1HLPdASNf0vb/a7if9NwKeyIbAvvoVws7sIDAchw6nW7F8dvPal1VO6FCzbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788145; c=relaxed/simple; bh=vFNOcW6D9AQ3oR7l/kDMzH69hgRBYY0HS+iPzompEAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FUgGQiEvH6glUuoCnegMhe1EOYsxBk4zgF1jSCHmFXHUcCYgCYqnOfncTEKQJm916vQUm0vpuMsIcJxJLOwvTCumfYxYYcHm5Bfk+i+CGbqRmJNS7iHsVT4mIQZfHHPG1DBFZjkxCHTFfW4Q2gfWTwXIosOGBJ+/fQOaSMSmb9Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=N+YFXl5T; arc=none smtp.client-ip=198.175.65.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="N+YFXl5T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739788144; x=1771324144; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vFNOcW6D9AQ3oR7l/kDMzH69hgRBYY0HS+iPzompEAY=; b=N+YFXl5TMTtoMI9AdcuMDNqjuz1rykXKqajNrymvomL5PX16Qc+Iw8bw tOlCQQR0RfuIGSF6t4BG0iW29U67Lh6S0XBuQV5N4WIhlnhe6ZbIybwEH 0vnChI8gnb5q5XxKSEtCUTJq7eAi07QHsjhF/aKO8QRsMM5YQ7SdqHx0q +cmw7tJ3RQAnmxwHhGrQg+BS74riR/d7sXSvPG5IQ0ZAR2+EGTTwKO/Nx Dn/FP+s5v6KL1NP+MZBhI153PfrI3C3TNNp2rxVp/k16hEAfU7ekM1UK1 f9v/nm/fJEaz+vc41GT1Q88QWrNq7f+JwbiwdyjWQXjEL++b+SEoh1OdS g==; X-CSE-ConnectionGUID: gjMWMjSkSOahXvwW3fV4lg== X-CSE-MsgGUID: c/CYk5bqRsmFU7ru/auYgw== X-IronPort-AV: E=McAfee;i="6700,10204,11347"; a="40168463" X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="40168463" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2025 02:29:03 -0800 X-CSE-ConnectionGUID: 1rCOmPpBQSulMvzuw0xhDQ== X-CSE-MsgGUID: chSRxClPSmauDPxdv4mN2A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="114598347" Received: from enterprise.igk.intel.com ([10.102.20.175]) by fmviesa010.fm.intel.com with ESMTP; 17 Feb 2025 02:29:02 -0800 From: Martyna Szapar-Mudlaw To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Lukasz Czapnik , Jedrzej Jagielski , Martyna Szapar-Mudlaw Subject: [iwl-net 4/4] ice: fix input validation for virtchnl BW Date: Mon, 17 Feb 2025 11:27:49 +0100 Message-ID: <20250217102744.300357-10-martyna.szapar-mudlaw@linux.intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250217102744.300357-2-martyna.szapar-mudlaw@linux.intel.com> References: <20250217102744.300357-2-martyna.szapar-mudlaw@linux.intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Lukasz Czapnik Add 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 improve 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 Signed-off-by: Lukasz Czapnik Co-developed-by: Martyna Szapar-Mudlaw Signed-off-by: Martyna Szapar-Mudlaw --- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c index adb1bf12542f..824ef849b0ea 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c @@ -1865,15 +1865,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++) {