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 8133022D9E6; Mon, 5 May 2025 23:05:14 +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=1746486315; cv=none; b=DhXmDp3WKHIfdLaC0q6HftaxLpwR1QVCxCZcSKuELrgsBT1h3VGNmKADq/PZ19u7Nv0vp92WFeB5AjSsUeH71Fsur/7QUIRAvsz6GZGtN5uaC0xybrCvGIvSCuo+pZdU8hsIRbeWWyPtiFyZBRqJVLWlEiwabVET8mwvFSAfbfw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486315; c=relaxed/simple; bh=LklpPNp8SX5KhXxNIdCOZH6I+6WxBbAL2UkQJMhXjSk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tLrv6uk4/a1yzgK+iOxGbwyA+xyz8RMTyUh9bjJRtYWqfiIwFm4+Kf962/rNQqA+DjEoMajDGQwAkhxTo3dR5c+yP8V7Kbxti5zxVIbMMQQY4o7nDxv76lJgdQRRCIFRIVcd/lYWbuAtjZwaUl2vXmuwIp2u/4wWxRaiMGKXUXo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MPtPPwvi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MPtPPwvi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BAD9AC4CEEE; Mon, 5 May 2025 23:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486314; bh=LklpPNp8SX5KhXxNIdCOZH6I+6WxBbAL2UkQJMhXjSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MPtPPwviw/oPeU8+REJZVuBJ1O011w5LgmPWO5RZvskj5KjE4L4jeK4uHUU3N922D wzd3aUF/G2iTjSEc9oLJnnBP6+B+kVijwVi9hffavYg3P9ENbvaoSqQ+K6div9Xr0e X/yxHSGgGOO3BjQ/dyk4pHbSW/e3cmkbrud7LDFRPihp5371lx2iSsx0wnECXJZR5k Zdb3YP+j2KjIXLCpwP30HDwkp4z2mYMAIXSKsLrE9clNLcWbSyXe3ZQw1rG7BgJy1X JJ8sebxTkwHfXR20C4U8emOJZSmfLVhaWQX1OwSfd6oF4UsLWLrHLUBqu4X15Y9cFI QtP1Hy/3T/DIA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Carolina Jubran , Yael Chemla , Cosmin Ratiu , Tariq Toukan , Kalesh AP , Paolo Abeni , Sasha Levin , saeedm@nvidia.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 255/294] net/mlx5e: Avoid WARN_ON when configuring MQPRIO with HTB offload enabled Date: Mon, 5 May 2025 18:55:55 -0400 Message-Id: <20250505225634.2688578-255-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505225634.2688578-1-sashal@kernel.org> References: <20250505225634.2688578-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.89 Content-Transfer-Encoding: 8bit From: Carolina Jubran [ Upstream commit 689805dcc474c2accb5cffbbcea1c06ee4a54570 ] When attempting to enable MQPRIO while HTB offload is already configured, the driver currently returns `-EINVAL` and triggers a `WARN_ON`, leading to an unnecessary call trace. Update the code to handle this case more gracefully by returning `-EOPNOTSUPP` instead, while also providing a helpful user message. Signed-off-by: Carolina Jubran Reviewed-by: Yael Chemla Reviewed-by: Cosmin Ratiu Signed-off-by: Tariq Toukan Reviewed-by: Kalesh AP Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 8a892614015cd..8e2cd50899ea1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3627,8 +3627,11 @@ static int mlx5e_setup_tc_mqprio(struct mlx5e_priv *priv, /* MQPRIO is another toplevel qdisc that can't be attached * simultaneously with the offloaded HTB. */ - if (WARN_ON(mlx5e_selq_is_htb_enabled(&priv->selq))) - return -EINVAL; + if (mlx5e_selq_is_htb_enabled(&priv->selq)) { + NL_SET_ERR_MSG_MOD(mqprio->extack, + "MQPRIO cannot be configured when HTB offload is enabled."); + return -EOPNOTSUPP; + } switch (mqprio->mode) { case TC_MQPRIO_MODE_DCB: -- 2.39.5