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

Commit 2a0f561b authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Do not reset Receive Queue params on every type change 



Do not implicit a call to mlx5e_init_rq_type_params() upon every
change in RQ type. It should be called only on channels creation.

Fixes: 2fc4bfb7 ("net/mlx5e: Dynamic RQ type infrastructure")
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent b0cedc84

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

+1 −2
Original line number Diff line number Diff line
@@ -918,8 +918,7 @@ void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, 
void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params,

				 u8 cq_period_mode);

void mlx5e_init_rq_type_params(struct mlx5_core_dev *mdev,

			       struct mlx5e_params *params,

			       u8 rq_type);

			       struct mlx5e_params *params);



static inline bool mlx5e_tunnel_inner_ft_supported(struct mlx5_core_dev *mdev)

{

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

+7 −8
Original line number Diff line number Diff line
@@ -106,9 +106,8 @@ static u16 mlx5e_get_rq_headroom(struct mlx5e_params *params) 
}



void mlx5e_init_rq_type_params(struct mlx5_core_dev *mdev,

			       struct mlx5e_params *params, u8 rq_type)

			       struct mlx5e_params *params)

{

	params->rq_wq_type = rq_type;

	params->lro_wqe_sz = MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ;

	switch (params->rq_wq_type) {

	case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ:
@@ -135,15 +134,14 @@ void mlx5e_init_rq_type_params(struct mlx5_core_dev *mdev, 


static bool slow_pci_heuristic(struct mlx5_core_dev *mdev);



static void mlx5e_set_rq_params(struct mlx5_core_dev *mdev,

static void mlx5e_set_rq_type(struct mlx5_core_dev *mdev,

			      struct mlx5e_params *params)

{

	u8 rq_type = mlx5e_check_fragmented_striding_rq_cap(mdev) &&

	params->rq_wq_type = mlx5e_check_fragmented_striding_rq_cap(mdev) &&

		!slow_pci_heuristic(mdev) &&

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

		MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ :

		MLX5_WQ_TYPE_LINKED_LIST;

	mlx5e_init_rq_type_params(mdev, params, rq_type);

}



static void mlx5e_update_carrier(struct mlx5e_priv *priv)
@@ -3736,7 +3734,7 @@ static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog) 
		bpf_prog_put(old_prog);



	if (reset) /* change RQ type according to priv->xdp_prog */

		mlx5e_set_rq_params(priv->mdev, &priv->channels.params);

		mlx5e_set_rq_type(priv->mdev, &priv->channels.params);



	if (was_opened && reset)

		mlx5e_open_locked(netdev);
@@ -4029,7 +4027,8 @@ void mlx5e_build_nic_params(struct mlx5_core_dev *mdev, 
	MLX5E_SET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS, params->rx_cqe_compress_def);



	/* RQ */

	mlx5e_set_rq_params(mdev, params);

	mlx5e_set_rq_type(mdev, params);

	mlx5e_init_rq_type_params(mdev, params);



	/* HW LRO */

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

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ 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_init_rq_type_params(mdev, params, MLX5_WQ_TYPE_LINKED_LIST);

	params->rq_wq_type = MLX5_WQ_TYPE_LINKED_LIST;

	mlx5e_init_rq_type_params(mdev, params);



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

	params->log_rq_size = is_kdump_kernel() ?