Commit 689805dc authored by Carolina Jubran's avatar Carolina Jubran Committed by Paolo Abeni
Browse files

net/mlx5e: Avoid WARN_ON when configuring MQPRIO with HTB offload enabled 



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: default avatarCarolina Jubran <cjubran@nvidia.com>
Reviewed-by: default avatarYael Chemla <ychemla@nvidia.com>
Reviewed-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 96d64a1a

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+5 −2
Original line number Diff line number Diff line
@@ -3816,8 +3816,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: