Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 696a97cf authored by Eugenia Emantayev's avatar Eugenia Emantayev Committed by Saeed Mahameed
Browse files

net/mlx5e: Fix defaulting RX ring size when not needed 



Fixes the bug when turning on/off CQE compression mechanism
resets the RX rings size to default value when it is not
needed.

Fixes: 2fc4bfb7 ("net/mlx5e: Dynamic RQ type infrastructure")
Signed-off-by: default avatarEugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 2989ad1e

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

+6 −2
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ 
	max_t(u32, MLX5_MPWRQ_MIN_LOG_STRIDE_SZ(mdev), req)

#define MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev)       MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, 6)

#define MLX5_MPWRQ_CQE_CMPRS_LOG_STRIDE_SZ(mdev) MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, 8)

#define MLX5E_MPWQE_STRIDE_SZ(mdev, cqe_cmprs) \

	(cqe_cmprs ? MLX5_MPWRQ_CQE_CMPRS_LOG_STRIDE_SZ(mdev) : \

	MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev))



#define MLX5_MPWRQ_LOG_WQE_SZ			18

#define MLX5_MPWRQ_WQE_PAGE_ORDER  (MLX5_MPWRQ_LOG_WQE_SZ - PAGE_SHIFT > 0 ? \
@@ -936,8 +939,9 @@ void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, 
				 u8 cq_period_mode);

void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params,

				 u8 cq_period_mode);

void mlx5e_set_rq_type_params(struct mlx5_core_dev *mdev,

			      struct mlx5e_params *params, u8 rq_type);

void mlx5e_init_rq_type_params(struct mlx5_core_dev *mdev,

			       struct mlx5e_params *params,

			       u8 rq_type);



static inline bool mlx5e_tunnel_inner_ft_supported(struct mlx5_core_dev *mdev)

{

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

+8 −2
Original line number Diff line number Diff line
@@ -1523,8 +1523,10 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_val 
	new_channels.params = priv->channels.params;

	MLX5E_SET_PFLAG(&new_channels.params, MLX5E_PFLAG_RX_CQE_COMPRESS, new_val);



	mlx5e_set_rq_type_params(priv->mdev, &new_channels.params,

				 new_channels.params.rq_wq_type);

	new_channels.params.mpwqe_log_stride_sz =

		MLX5E_MPWQE_STRIDE_SZ(priv->mdev, new_val);

	new_channels.params.mpwqe_log_num_strides =

		MLX5_MPWRQ_LOG_WQE_SZ - new_channels.params.mpwqe_log_stride_sz;



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {

		priv->channels.params = new_channels.params;
@@ -1536,6 +1538,10 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_val 
		return err;



	mlx5e_switch_priv_channels(priv, &new_channels, NULL);

	mlx5e_dbg(DRV, priv, "MLX5E: RxCqeCmprss was turned %s\n",

		  MLX5E_GET_PFLAG(&priv->channels.params,

				  MLX5E_PFLAG_RX_CQE_COMPRESS) ? "ON" : "OFF");



	return 0;

}

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

+7 −8
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev) 
		MLX5_CAP_ETH(mdev, reg_umr_sq);

}



void mlx5e_set_rq_type_params(struct mlx5_core_dev *mdev,

void mlx5e_init_rq_type_params(struct mlx5_core_dev *mdev,

			       struct mlx5e_params *params, u8 rq_type)

{

	params->rq_wq_type = rq_type;
@@ -88,10 +88,8 @@ void mlx5e_set_rq_type_params(struct mlx5_core_dev *mdev, 
		params->log_rq_size = is_kdump_kernel() ?

			MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE_MPW :

			MLX5E_PARAMS_DEFAULT_LOG_RQ_SIZE_MPW;

		params->mpwqe_log_stride_sz =

			MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS) ?

			MLX5_MPWRQ_CQE_CMPRS_LOG_STRIDE_SZ(mdev) :

			MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev);

		params->mpwqe_log_stride_sz = MLX5E_MPWQE_STRIDE_SZ(mdev,

			MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS));

		params->mpwqe_log_num_strides = MLX5_MPWRQ_LOG_WQE_SZ -

			params->mpwqe_log_stride_sz;

		break;
@@ -115,13 +113,14 @@ void mlx5e_set_rq_type_params(struct mlx5_core_dev *mdev, 
		       MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS));

}



static void mlx5e_set_rq_params(struct mlx5_core_dev *mdev, struct mlx5e_params *params)

static void mlx5e_set_rq_params(struct mlx5_core_dev *mdev,

				struct mlx5e_params *params)

{

	u8 rq_type = mlx5e_check_fragmented_striding_rq_cap(mdev) &&

		    !params->xdp_prog && !MLX5_IPSEC_DEV(mdev) ?

		    MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ :

		    MLX5_WQ_TYPE_LINKED_LIST;

	mlx5e_set_rq_type_params(mdev, params, rq_type);

	mlx5e_init_rq_type_params(mdev, params, rq_type);

}



static void mlx5e_update_carrier(struct mlx5e_priv *priv)

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void mlx5i_build_nic_params(struct mlx5_core_dev *mdev, 
				   struct mlx5e_params *params)

{

	/* Override RQ params as IPoIB supports only LINKED LIST RQ for now */

	mlx5e_set_rq_type_params(mdev, params, MLX5_WQ_TYPE_LINKED_LIST);

	mlx5e_init_rq_type_params(mdev, params, MLX5_WQ_TYPE_LINKED_LIST);



	/* RQ size in ipoib by default is 512 */

	params->log_rq_size = is_kdump_kernel() ?