Commit ab666b52 authored by Gal Pressman's avatar Gal Pressman Committed by Jakub Kicinski
Browse files

net/mlx5e: Use extack in set ringparams callback 



In case of errors in set ringparams, reflect it through extack instead
of a dmesg print.
While at it, make the messages more human friendly and remove two
redundant checks that are already validated by the core.

Signed-off-by: default avatarGal Pressman <gal@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20240808055927.2059700-7-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4384bcff

drivers/net/ethernet/mellanox/mlx5/core/en.h

+2 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,8 @@ void mlx5e_ethtool_get_ringparam(struct mlx5e_priv *priv, 
				 struct ethtool_ringparam *param,

				 struct kernel_ethtool_ringparam *kernel_param);

int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,

				struct ethtool_ringparam *param);

				struct ethtool_ringparam *param,

				struct netlink_ext_ack *extack);

void mlx5e_ethtool_get_channels(struct mlx5e_priv *priv,

				struct ethtool_channels *ch);

int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,

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

+9 −19
Original line number Diff line number Diff line
@@ -352,34 +352,24 @@ static void mlx5e_get_ringparam(struct net_device *dev, 
}



int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,

				struct ethtool_ringparam *param)

				struct ethtool_ringparam *param,

				struct netlink_ext_ack *extack)

{

	struct mlx5e_params new_params;

	u8 log_rq_size;

	u8 log_sq_size;

	int err = 0;



	if (param->rx_jumbo_pending) {

		netdev_info(priv->netdev, "%s: rx_jumbo_pending not supported\n",

			    __func__);

		return -EINVAL;

	}

	if (param->rx_mini_pending) {

		netdev_info(priv->netdev, "%s: rx_mini_pending not supported\n",

			    __func__);

		return -EINVAL;

	}



	if (param->rx_pending < (1 << MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE)) {

		netdev_info(priv->netdev, "%s: rx_pending (%d) < min (%d)\n",

			    __func__, param->rx_pending,

		NL_SET_ERR_MSG_FMT_MOD(extack, "rx (%d) < min (%d)",

				       param->rx_pending,

				       1 << MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE);

		return -EINVAL;

	}



	if (param->tx_pending < (1 << MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)) {

		netdev_info(priv->netdev, "%s: tx_pending (%d) < min (%d)\n",

			    __func__, param->tx_pending,

		NL_SET_ERR_MSG_FMT_MOD(extack, "tx (%d) < min (%d)",

				       param->tx_pending,

				       1 << MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE);

		return -EINVAL;

	}
@@ -416,7 +406,7 @@ static int mlx5e_set_ringparam(struct net_device *dev, 
{

	struct mlx5e_priv *priv = netdev_priv(dev);



	return mlx5e_ethtool_set_ringparam(priv, param);

	return mlx5e_ethtool_set_ringparam(priv, param, extack);

}



void mlx5e_ethtool_get_channels(struct mlx5e_priv *priv,

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

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ mlx5e_rep_set_ringparam(struct net_device *dev, 
{

	struct mlx5e_priv *priv = netdev_priv(dev);



	return mlx5e_ethtool_set_ringparam(priv, param);

	return mlx5e_ethtool_set_ringparam(priv, param, extack);

}



static void mlx5e_rep_get_channels(struct net_device *dev,

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int mlx5i_set_ringparam(struct net_device *dev, 
{

	struct mlx5e_priv *priv = mlx5i_epriv(dev);



	return mlx5e_ethtool_set_ringparam(priv, param);

	return mlx5e_ethtool_set_ringparam(priv, param, extack);

}



static void mlx5i_get_ringparam(struct net_device *dev,