From nobody Sun Dec 14 06:42:48 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 1017D30FC1F; Fri, 12 Dec 2025 21:07:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.177.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765573634; cv=none; b=OecHJZrgt4A/ajv3NiDcZUpbnZtN2dbTKxPB/c4eY8DkOVFGiAPxG5524393g3TVEQGHaueMMsuLnWZ6DQV/kTJ0y3mD9NxE+WLB+Y3mQ4W/QEnGtIoFU/BjH72Ri1FHF4fiBpXNQrQDClLd5SNRXuqJpEQ1fPOuy6fFIASgwkE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765573634; c=relaxed/simple; bh=15ZRge+sueIEOuBz26TgpciV7PX3CjaVLrmT8FG7+tA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u0LtgBR70B66kGqLEZpbP86cwBaVuvu0bfhH5hdE59xepcawiQ4rVd2vkmdK021EqJ5Ho6mgo+zeOXh9IdlwQOvjVaoFPe6cs6aGv1ekeD4A3tzIVOmyXTSVRRvOv1CoMpFz2Xs3o86+O/9n+Dy4Heyrw/qTL4AaVaXdroLrSxg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=U5D2qmyt; arc=none smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="U5D2qmyt" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BCKgXK7355774; Fri, 12 Dec 2025 21:07:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2025-04-25; bh=jZotv AzIzA21kiD8xdeWGblBDjeqsqgkQk818Xcb+70=; b=U5D2qmytOixg0d/aGOFt0 0/VULS3B3Oz9ZwvRPVkSEA06EIcUa7ENM/mUF04VSnMMGH+xBnLQmefyWtVmWjha x0nvzNgIzZpounzFX29QJvx2oouRHjSujfDlaUu5pBBu98D/v9l+SmGC8aF2uNg5 CFK6ovOZoMdWmHG8XSaZoYr2PjW3VzLZd8K4x5rmFi3gPYRNVWUkaTl29LBxJW33 XABlU1/2h5NQctzEKNNx8bylTp5dQytTAE6muKSSMyYb046uLqKjny+oyYE3QS4C 8zAZmfx3AXEoLKB3OpFO0NNZqC8b8SHB0dZJkp2wUbRWAh5XCL/fEwuO5HNLTE6j w== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 4ayd1mbuw7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Dec 2025 21:07:01 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 5BCJOawf039827; Fri, 12 Dec 2025 21:07:01 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4avaxq9t04-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Dec 2025 21:07:01 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 5BCL6thx002146; Fri, 12 Dec 2025 21:07:00 GMT Received: from oracle (dhcp-10-154-164-6.vpn.oracle.com [10.154.164.6]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 4avaxq9sve-2; Fri, 12 Dec 2025 21:06:59 +0000 From: gregory.herrero@oracle.com To: aleksandr.loktionov@intel.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory Herrero , Rafal Romanowski Subject: [PATCH v5 1/1] i40e: validate ring_len parameter against hardware-specific values Date: Fri, 12 Dec 2025 22:06:43 +0100 Message-ID: <20251212210643.1835176-2-gregory.herrero@oracle.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251212210643.1835176-1-gregory.herrero@oracle.com> References: <20251212210643.1835176-1-gregory.herrero@oracle.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-12_06,2025-12-11_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2510240000 definitions=main-2512120169 X-Proofpoint-GUID: u1ipdFh1w_ctQ97Klcx6f6rvd-tR4yf4 X-Authority-Analysis: v=2.4 cv=HvZ72kTS c=1 sm=1 tr=0 ts=693c83f5 b=1 cx=c_pps a=e1sVV491RgrpLwSTMOnk8w==:117 a=e1sVV491RgrpLwSTMOnk8w==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=yPCof4ZbAAAA:8 a=QyXUC8HyAAAA:8 a=h7IKB27rtHQ5j4P_g-8A:9 cc=ntf awl=host:13654 X-Proofpoint-ORIG-GUID: u1ipdFh1w_ctQ97Klcx6f6rvd-tR4yf4 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjEyMDE3MCBTYWx0ZWRfX0JGwpStb9kNu 5ik24FNQti/h6nvHu8twGGY0oHapcRTw2zWlsNhXOJXCLISYKdbLSSzkDCQwVHCuSm/AH8+JWpM jWjKRtWq63OfeccWNmC3xl7wDjEV5X+e07n8Nz8u/DyYjvN1FGww9ZwTjDCyPgS/45sMDEF1lVZ Sr1o+QoaoPrQlib/OnMQBk7sUNM7EdYsy6xjfFtK2lZq3D0jjHQgBtMWeZkFn+3FjvKa8D8PHHV 14LiSn2QaTrMho81dfICkKQhg2LWNpB2u1unEhwSc4H5zFgdNzIU0r7RJFpUXGB22kOMPtEijPj QUij8bF6EoJLzOvEgVXz7oasE6DYo+oXCYzvC8pXvnWKtVIgcU0upxB+hkdmNpgBgkQb87BDK3V XmuKHvS+toRrOkewSqt+L4kyWZlRFmAoV5RP/Fic8sUPiSswtOc= Content-Type: text/plain; charset="utf-8" From: Gregory Herrero The maximum number of descriptors supported by the hardware is hardware-dependent and can be retrieved using i40e_get_max_num_descriptors(). Move this function to a shared header and use it when checking for valid ring_len parameter rather than using hardcoded value. By fixing an over-acceptance issue, behavior change could be seen where ring_len could now be rejected while configuring rx and tx queues if its size is larger than the hardware-dependent maximum number of descriptors. Fixes: 55d225670def ("i40e: add validation for ring_len param") Signed-off-by: Gregory Herrero Tested-by: Rafal Romanowski Reviewed-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/i40e/i40e.h | 11 +++++++++++ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 12 ------------ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/= intel/i40e/i40e.h index d2d03db2acec..dcb50c2e1aa2 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -1422,4 +1422,15 @@ static inline struct i40e_veb *i40e_pf_get_main_veb(= struct i40e_pf *pf) return (pf->lan_veb !=3D I40E_NO_VEB) ? pf->veb[pf->lan_veb] : NULL; } =20 +static inline u32 i40e_get_max_num_descriptors(const struct i40e_pf *pf) +{ + const struct i40e_hw *hw =3D &pf->hw; + + switch (hw->mac.type) { + case I40E_MAC_XL710: + return I40E_MAX_NUM_DESCRIPTORS_XL710; + default: + return I40E_MAX_NUM_DESCRIPTORS; + } +} #endif /* _I40E_H_ */ diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/e= thernet/intel/i40e/i40e_ethtool.c index f2c2646ea298..6a47ea0927e9 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -2013,18 +2013,6 @@ static void i40e_get_drvinfo(struct net_device *netd= ev, drvinfo->n_priv_flags +=3D I40E_GL_PRIV_FLAGS_STR_LEN; } =20 -static u32 i40e_get_max_num_descriptors(struct i40e_pf *pf) -{ - struct i40e_hw *hw =3D &pf->hw; - - switch (hw->mac.type) { - case I40E_MAC_XL710: - return I40E_MAX_NUM_DESCRIPTORS_XL710; - default: - return I40E_MAX_NUM_DESCRIPTORS; - } -} - static void i40e_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring, struct kernel_ethtool_ringparam *kernel_ring, diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/n= et/ethernet/intel/i40e/i40e_virtchnl_pf.c index 8b30a3accd31..1fa877b52f61 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -656,7 +656,7 @@ static int i40e_config_vsi_tx_queue(struct i40e_vf *vf,= u16 vsi_id, =20 /* ring_len has to be multiple of 8 */ if (!IS_ALIGNED(info->ring_len, 8) || - info->ring_len > I40E_MAX_NUM_DESCRIPTORS_XL710) { + info->ring_len > i40e_get_max_num_descriptors(pf)) { ret =3D -EINVAL; goto error_context; } @@ -726,7 +726,7 @@ static int i40e_config_vsi_rx_queue(struct i40e_vf *vf,= u16 vsi_id, =20 /* ring_len has to be multiple of 32 */ if (!IS_ALIGNED(info->ring_len, 32) || - info->ring_len > I40E_MAX_NUM_DESCRIPTORS_XL710) { + info->ring_len > i40e_get_max_num_descriptors(pf)) { ret =3D -EINVAL; goto error_param; } --=20 2.51.0