From patchwork Tue Mar 4 11:08:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Szapar-Mudlaw, Martyna" X-Patchwork-Id: 14000473 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 F3BC51FF1DC for ; Tue, 4 Mar 2025 11:09:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086564; cv=none; b=OjoTIkbm0BRx99FgWS0QmwJntUxnB5y9tqvhINc4XsfzzaGwewHtApEFF29vkmd6ZBjN0pZIyH4MixFfi/TnxOkpKP4xUB3z7ok6coOCMDVId5dTyotyDhZKT2p4ndy+DOsvtvwGxdVwYCVj5X3yJyWfwP8xXPaI6e3SIjLXFdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086564; c=relaxed/simple; bh=FxEuUtIO3qfXXHQvkUKICH8eg3BB/zNshjcsb7WiSYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LHZtYfcQt2AaHk4Krh3CVoJFhQkyKevCORuSRCxgSG2KwFNj1qSSk72Qwdrwlsz5tfui0XEAAnU+1xO/zFv2gHiENpUdNhdC4YTaMxB8/TvPs5HgjVqnyPiVmEXtTnpJUu2Fwp3iWcDJ2ZnhupGCMbgzp1gUw+FEHITE9xZs7x4= 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=O2LYSC4d; arc=none smtp.client-ip=192.198.163.18 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="O2LYSC4d" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741086563; x=1772622563; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FxEuUtIO3qfXXHQvkUKICH8eg3BB/zNshjcsb7WiSYI=; b=O2LYSC4dxhtjIsdK93g1apnyGBB6fPpsBnc36BiD9HgNICfs7SghQ25w x7jeQt0Z5wDLvW36thChMeeudaquQ6Yiakow1bPqNH511NbfPhGsDNkoG lmSdsmh4TPAG50S69SMWzfnZLQ23TE3BU+dyNT0INWe5S0LksA6e805ED 9XHoZWcGI/FobHV0pzUwbSrcbOPMqTEVFzlnD/U3dSeRG0v4AJNppkoPN Q7krJWcc1i5jpASWPEogkJrUcp9KdC4yPWV0x1VdXicPZ5ihn+XV9iPnq kP/ZDN6AsD1fHzH0T34lGNE9qRgIJ8Z4ctodWRDwYS7jYszb+kH2Q2GCm A==; X-CSE-ConnectionGUID: gw1GdJrgSJiSMFsFicz0cg== X-CSE-MsgGUID: kDYiyALYSEeRoJmrqZsKog== X-IronPort-AV: E=McAfee;i="6700,10204,11362"; a="41247046" X-IronPort-AV: E=Sophos;i="6.13,331,1732608000"; d="scan'208";a="41247046" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2025 03:09:23 -0800 X-CSE-ConnectionGUID: e81ZJRMdTVGZn135wFkt2A== X-CSE-MsgGUID: cFJlah8uSk2Kj0frjT+vDA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,331,1732608000"; d="scan'208";a="118341460" Received: from enterprise.igk.intel.com ([10.102.20.175]) by fmviesa007.fm.intel.com with ESMTP; 04 Mar 2025 03:09:21 -0800 From: Martyna Szapar-Mudlaw To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Lukasz Czapnik , Jedrzej Jagielski , Simon Horman , Martyna Szapar-Mudlaw Subject: [iwl-net v3 4/5] ice: fix input validation for virtchnl BW Date: Tue, 4 Mar 2025 12:08:34 +0100 Message-ID: <20250304110833.95997-7-martyna.szapar-mudlaw@linux.intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250304110833.95997-2-martyna.szapar-mudlaw@linux.intel.com> References: <20250304110833.95997-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 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 Reviewed-by: Simon Horman 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++) {