Commit f12ed9c0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2022-11-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2022-11-12

Misc updates to mlx5 driver

1) Support enhanced CQE compression, on ConnectX6-Dx
   Reduce irq rate, cpu utilization and latency.

2) Connection tracking: Optimize the pre_ct table lookup for rules
   installed on chain 0.

3) implement ethtool get_link_ext_stats for PHY down events

4) Expose device vhca_id to debugfs

5) misc cleanups and trivial changes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6970ef27 e07c4924

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

+2 −9
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static const struct devlink_trap_group mlx5_trap_groups_arr[] = { 
	DEVLINK_TRAP_GROUP_GENERIC(L2_DROPS, 0),

};



static int mlx5_devlink_traps_register(struct devlink *devlink)

int mlx5_devlink_traps_register(struct devlink *devlink)

{

	struct mlx5_core_dev *core_dev = devlink_priv(devlink);

	int err;
@@ -862,7 +862,7 @@ static int mlx5_devlink_traps_register(struct devlink *devlink) 
	return err;

}



static void mlx5_devlink_traps_unregister(struct devlink *devlink)

void mlx5_devlink_traps_unregister(struct devlink *devlink)

{

	devl_traps_unregister(devlink, mlx5_traps_arr, ARRAY_SIZE(mlx5_traps_arr));

	devl_trap_groups_unregister(devlink, mlx5_trap_groups_arr,
@@ -889,17 +889,11 @@ int mlx5_devlink_register(struct devlink *devlink) 
	if (err)

		goto max_uc_list_err;



	err = mlx5_devlink_traps_register(devlink);

	if (err)

		goto traps_reg_err;



	if (!mlx5_core_is_mp_slave(dev))

		devlink_set_features(devlink, DEVLINK_F_RELOAD);



	return 0;



traps_reg_err:

	mlx5_devlink_max_uc_list_param_unregister(devlink);

max_uc_list_err:

	mlx5_devlink_auxdev_params_unregister(devlink);

auxdev_reg_err:
@@ -910,7 +904,6 @@ int mlx5_devlink_register(struct devlink *devlink) 


void mlx5_devlink_unregister(struct devlink *devlink)

{

	mlx5_devlink_traps_unregister(devlink);

	mlx5_devlink_max_uc_list_param_unregister(devlink);

	mlx5_devlink_auxdev_params_unregister(devlink);

	devlink_params_unregister(devlink, mlx5_devlink_params,

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ void mlx5_devlink_trap_report(struct mlx5_core_dev *dev, int trap_id, struct sk_ 
int mlx5_devlink_trap_get_num_active(struct mlx5_core_dev *dev);

int mlx5_devlink_traps_get_action(struct mlx5_core_dev *dev, int trap_id,

				  enum devlink_trap_action *action);

int mlx5_devlink_traps_register(struct devlink *devlink);

void mlx5_devlink_traps_unregister(struct devlink *devlink);



struct devlink *mlx5_devlink_alloc(struct device *dev);

void mlx5_devlink_free(struct devlink *devlink);

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

+2 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ enum { 
	MLX5E_RQ_STATE_CSUM_FULL, /* cqe_csum_full hw bit is set */

	MLX5E_RQ_STATE_MINI_CQE_HW_STRIDX, /* set when mini_cqe_resp_stride_index cap is used */

	MLX5E_RQ_STATE_SHAMPO, /* set when SHAMPO cap is used */

	MLX5E_RQ_STATE_MINI_CQE_ENHANCED,  /* set when enhanced mini_cqe_cap is used */

};



struct mlx5e_cq {
@@ -370,6 +371,7 @@ struct mlx5e_cq_decomp { 
	u8                         mini_arr_idx;

	u16                        left;

	u16                        wqe_counter;

	bool                       last_cqe_title;

} ____cacheline_aligned_in_smp;



enum mlx5e_dma_map_type {

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+4 −8
Original line number Diff line number Diff line
@@ -607,14 +607,6 @@ void mlx5e_init_rq_type_params(struct mlx5_core_dev *mdev, 
	params->log_rq_mtu_frames = is_kdump_kernel() ?

		MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE :

		MLX5E_PARAMS_DEFAULT_LOG_RQ_SIZE;



	mlx5_core_info(mdev, "MLX5E: StrdRq(%d) RqSz(%ld) StrdSz(%ld) RxCqeCmprss(%d)\n",

		       params->rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ,

		       params->rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ ?

		       BIT(mlx5e_mpwqe_get_log_rq_size(mdev, params, NULL)) :

		       BIT(params->log_rq_mtu_frames),

		       BIT(mlx5e_mpwqe_get_log_stride_size(mdev, params, NULL)),

		       MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS));

}



void mlx5e_set_rq_type(struct mlx5_core_dev *mdev, struct mlx5e_params *params)
@@ -852,6 +844,10 @@ static void mlx5e_build_rx_cq_param(struct mlx5_core_dev *mdev, 
	if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS)) {

		MLX5_SET(cqc, cqc, mini_cqe_res_format, hw_stridx ?

			 MLX5_CQE_FORMAT_CSUM_STRIDX : MLX5_CQE_FORMAT_CSUM);

		MLX5_SET(cqc, cqc, cqe_compression_layout,

			 MLX5_CAP_GEN(mdev, enhanced_cqe_compression) ?

			 MLX5_CQE_COMPRESS_LAYOUT_ENHANCED :

			 MLX5_CQE_COMPRESS_LAYOUT_BASIC);

		MLX5_SET(cqc, cqc, cqe_comp_en, 1);

	}

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

+14 −0
Original line number Diff line number Diff line
@@ -154,4 +154,18 @@ int mlx5e_build_channel_param(struct mlx5_core_dev *mdev, 
u16 mlx5e_calc_sq_stop_room(struct mlx5_core_dev *mdev, struct mlx5e_params *params);

int mlx5e_validate_params(struct mlx5_core_dev *mdev, struct mlx5e_params *params);



static inline void mlx5e_params_print_info(struct mlx5_core_dev *mdev,

					   struct mlx5e_params *params)

{

	mlx5_core_info(mdev, "MLX5E: StrdRq(%d) RqSz(%ld) StrdSz(%ld) RxCqeCmprss(%d %s)\n",

		       params->rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ,

		       params->rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ ?

		       BIT(mlx5e_mpwqe_get_log_rq_size(mdev, params, NULL)) :

		       BIT(params->log_rq_mtu_frames),

		       BIT(mlx5e_mpwqe_get_log_stride_size(mdev, params, NULL)),

		       MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS),

		       MLX5_CAP_GEN(mdev, enhanced_cqe_compression) ?

				       "enhanced" : "basic");

};



#endif /* __MLX5_EN_PARAMS_H__ */