From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.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 30E4F37F011; Thu, 30 Jul 2026 15:38:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785425933; cv=none; b=LTrxHMkTL27Zuy3cAOe0GeYaB1w0+VKnB+grHGJxQv3o+5ljRRHKlm4it096ibRcEZLydT5jNHu+23A9vEF/YrIjKA3zKceCbkh3KL8r2XTGwBRd8yKal3Jo33lROqNCMshbhJhPK6wc5j9xLmwByHqLlA1hBLFEdnt91EzxX98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785425933; c=relaxed/simple; bh=wMJ2acNLZyb8hEPjchOETRfBzZNlII42DCZ4cUSdcpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bw6d6I82CUFjUbuSGvnZ/S1phmaww922FuC3kVgxLUS+uLWgcWIX6CIHTTRo7OPFk7M4kAQ6Z2qATVNma2G1mC4JQ12len83wql7FYcYFxGRhcJioQaGVt+bMV4tClJc2YzrrpqokKu9no6JnXJedBaiJEBg4C9Ae5+I5OMnJZo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UjI5LiqJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UjI5LiqJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AA661F000E9; Thu, 30 Jul 2026 15:38:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785425932; bh=7yLPXZeLZn87AxzB77GDVadJAFZbOFOFzEWQZaS7M5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UjI5LiqJSuaIigjJJ6Ea8I60ecMVOaPkh9sNfQkpNrI/UV3iNj70cduV2qA4T+sfm EHZa7R7BgbkGQ2Xbckn7S4/WfzbwA994l50WLgLJOzaqxCNZm+SxeVNjCZ9Z/KP6tM 2AqERHyyNNwXa8LijH83jVJapMmoMJXOshcDitU0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexei Lazar , Carolina Jubran , Tariq Toukan , Pavan Chebbi , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 243/602] net/mlx5e: Reject unsupported CB Shaper TSA in ETS validation Date: Thu, 30 Jul 2026 16:10:35 +0200 Message-ID: <20260730141441.078265849@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141435.976815864@linuxfoundation.org> References: <20260730141435.976815864@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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexei Lazar [ Upstream commit 9173e1d3c7c7d49a71eee813091f9e834ec7cee5 ] Credit Based (CB) TSA is not supported by the mlx5 driver, so reject any configurations that specify it. Fixes: 08fb1dacdd76 ("net/mlx5e: Support DCBNL IEEE ETS") Signed-off-by: Alexei Lazar Reviewed-by: Carolina Jubran Signed-off-by: Tariq Toukan Reviewed-by: Pavan Chebbi Link: https://patch.msgid.link/20260717075125.1244877-3-tariqt@nvidia.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c index d74ff20f825954..98ca8f486d52cd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c @@ -309,6 +309,14 @@ static int mlx5e_dbcnl_validate_ets(struct net_device *netdev, } } + for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) { + if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_CB_SHAPER) { + netdev_err(netdev, + "Failed to validate ETS: CB Shaper is not supported\n"); + return -EOPNOTSUPP; + } + } + /* Validate Bandwidth Sum */ for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) { if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) { -- 2.53.0