From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8C76725B2FA; Wed, 3 Dec 2025 16:08:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778130; cv=none; b=lWsiIqSwKnM60CDMBAUNeWoM7VFpNnRnRbJ3xG5I3Tg51RbfuUQZUxYN9dIDtV5WyjKQDLcEVToCkma/z9/Dbpvm0UoY9Ki8yoaAToSGooC1LMXseiqVjoqn4KepZjzt/F7kwd+jHzwjpXKNhjmya3Fr0XDZF8M6u334LCJF/R0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778130; c=relaxed/simple; bh=9k1y1nY2v0TEjj/GViovYi7jhA2tpoAZJVeQi+Z8HYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jFShBt9zkQnNpA20woUQVuaqIh2MIjJkQB15RxKVOn4HRCbeP0r4vxyTrDeiMGlKw+WGl4xhODRJj53b1Qp1oHHVXNflCmCklipPclv3HWSGjg56SVb9mkbQkfLX2j1Uvr4G0vo5XYl1+SplvOw+/X95XLMlqfT/tCY39kbkyrI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zMqS0HkO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zMqS0HkO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 759ADC4CEF5; Wed, 3 Dec 2025 16:08:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764778129; bh=9k1y1nY2v0TEjj/GViovYi7jhA2tpoAZJVeQi+Z8HYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zMqS0HkOL+Glol0kFVM/qpl9HgmIRVSK5/2UXzcabXXEAfamS+XN6WnmMmDsYrnPF e1yUDMmDvcy/rpO8qhOuKYumrTVAsQM3Le63rz30K1geiSxWQJIpRYb5cwR0zBpxZK rHf+paqEQsQ0WBNgwAhI1gNyzJKZKBLsW6nUQkXs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Gal Pressman , Nimrod Oren , Tariq Toukan , Paolo Abeni , Sasha Levin Subject: [PATCH 5.15 253/392] net/mlx5e: Fix maxrate wraparound in threshold between units Date: Wed, 3 Dec 2025 16:26:43 +0100 Message-ID: <20251203152423.479430206@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152414.082328008@linuxfoundation.org> References: <20251203152414.082328008@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gal Pressman [ Upstream commit a7bf4d5063c7837096aab2853224eb23628514d9 ] The previous calculation used roundup() which caused an overflow for rates between 25.5Gbps and 26Gbps. For example, a rate of 25.6Gbps would result in using 100Mbps units with value of 256, which would overflow the 8 bits field. Simplify the upper_limit_mbps calculation by removing the unnecessary roundup, and adjust the comparison to use <= to correctly handle the boundary condition. Fixes: d8880795dabf ("net/mlx5e: Implement DCBNL IEEE max rate") Signed-off-by: Gal Pressman Reviewed-by: Nimrod Oren Signed-off-by: Tariq Toukan Link: https://patch.msgid.link/1762681073-1084058-4-git-send-email-tariqt@nvidia.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c index f2862100d1a2e..51fadfcda35a5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c @@ -587,18 +587,19 @@ static int mlx5e_dcbnl_ieee_setmaxrate(struct net_device *netdev, struct mlx5_core_dev *mdev = priv->mdev; u8 max_bw_value[IEEE_8021QAZ_MAX_TCS]; u8 max_bw_unit[IEEE_8021QAZ_MAX_TCS]; - __u64 upper_limit_mbps = roundup(255 * MLX5E_100MB, MLX5E_1GB); + __u64 upper_limit_mbps; int i; memset(max_bw_value, 0, sizeof(max_bw_value)); memset(max_bw_unit, 0, sizeof(max_bw_unit)); + upper_limit_mbps = 255 * MLX5E_100MB; for (i = 0; i <= mlx5_max_tc(mdev); i++) { if (!maxrate->tc_maxrate[i]) { max_bw_unit[i] = MLX5_BW_NO_LIMIT; continue; } - if (maxrate->tc_maxrate[i] < upper_limit_mbps) { + if (maxrate->tc_maxrate[i] <= upper_limit_mbps) { max_bw_value[i] = div_u64(maxrate->tc_maxrate[i], MLX5E_100MB); max_bw_value[i] = max_bw_value[i] ? max_bw_value[i] : 1; -- 2.51.0