Commit eaee12f0 authored by Khalid Manaa's avatar Khalid Manaa Committed by Saeed Mahameed
Browse files

net/mlx5e: Rename TIR lro functions to TIR packet merge functions 



This series introduces new packet merge type, therefore rename lro
functions to packet merge to support the new merge type:
- Generalize + rename mlx5e_build_tir_ctx_lro to
  mlx5e_build_tir_ctx_packet_merge.
- Rename mlx5e_modify_tirs_lro to mlx5e_modify_tirs_packet_merge.
- Rename lro bit in mlx5_ifc_modify_tir_bitmask_bits to packet_merge.
- Rename lro_en in mlx5e_params to packet_merge_type type and combine
  packet_merge params into one struct mlx5e_packet_merge_param.

Signed-off-by: default avatarKhalid Manaa <khalidm@nvidia.com>
Signed-off-by: default avatarBen Ben-Ishay <benishay@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 7025329d

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

+12 −2
Original line number Diff line number Diff line
@@ -242,6 +242,17 @@ enum mlx5e_priv_flag { 


#define MLX5E_GET_PFLAG(params, pflag) (!!((params)->pflags & (BIT(pflag))))



enum packet_merge {

	MLX5E_PACKET_MERGE_NONE,

	MLX5E_PACKET_MERGE_LRO,

	MLX5E_PACKET_MERGE_SHAMPO,

};



struct mlx5e_packet_merge_param {

	enum packet_merge type;

	u32 timeout;

};



struct mlx5e_params {

	u8  log_sq_size;

	u8  rq_wq_type;
@@ -259,13 +270,12 @@ struct mlx5e_params { 
	bool tunneled_offload_en;

	struct dim_cq_moder rx_cq_moderation;

	struct dim_cq_moder tx_cq_moderation;

	bool lro_en;

	struct mlx5e_packet_merge_param packet_merge;

	u8  tx_min_inline_mode;

	bool vlan_strip_disable;

	bool scatter_fcs_en;

	bool rx_dim_enabled;

	bool tx_dim_enabled;

	u32 packet_merge_timeout;

	u32 pflags;

	struct bpf_prog *xdp_prog;

	struct mlx5e_xsk *xsk;

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

+6 −15
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ bool mlx5e_rx_is_linear_skb(struct mlx5e_params *params, 
	u32 linear_frag_sz = max(mlx5e_rx_get_linear_frag_sz(params, xsk),

				 mlx5e_rx_get_linear_frag_sz(params, NULL));



	return !params->lro_en && linear_frag_sz <= PAGE_SIZE;

	return params->packet_merge.type == MLX5E_PACKET_MERGE_NONE &&

		linear_frag_sz <= PAGE_SIZE;

}



bool mlx5e_verify_rx_mpwqe_strides(struct mlx5_core_dev *mdev,
@@ -164,19 +165,8 @@ u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev, 
		mlx5e_rx_is_linear_skb(params, xsk) :

		mlx5e_rx_mpwqe_is_linear_skb(mdev, params, xsk);



	return is_linear_skb ? mlx5e_get_linear_rq_headroom(params, xsk) : 0;

}



struct mlx5e_lro_param mlx5e_get_lro_param(struct mlx5e_params *params)

{

	struct mlx5e_lro_param lro_param;



	lro_param = (struct mlx5e_lro_param) {

		.enabled = params->lro_en,

		.timeout = params->packet_merge_timeout,

	};



	return lro_param;

	return is_linear_skb || params->packet_merge.type == MLX5E_PACKET_MERGE_SHAMPO ?

		mlx5e_get_linear_rq_headroom(params, xsk) : 0;

}



u16 mlx5e_calc_sq_stop_room(struct mlx5_core_dev *mdev, struct mlx5e_params *params)
@@ -485,10 +475,11 @@ static void mlx5e_build_rx_cq_param(struct mlx5_core_dev *mdev, 


static u8 rq_end_pad_mode(struct mlx5_core_dev *mdev, struct mlx5e_params *params)

{

	bool lro_en = params->packet_merge.type == MLX5E_PACKET_MERGE_LRO;

	bool ro = pcie_relaxed_ordering_enabled(mdev->pdev) &&

		MLX5_CAP_GEN(mdev, relaxed_ordering_write);



	return ro && params->lro_en ?

	return ro && lro_en ?

		MLX5_WQ_END_PAD_MODE_NONE : MLX5_WQ_END_PAD_MODE_ALIGN;

}

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

+0 −6
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ struct mlx5e_xsk_param { 
	u16 chunk_size;

};



struct mlx5e_lro_param {

	bool enabled;

	u32 timeout;

};



struct mlx5e_cq_param {

	u32                        cqc[MLX5_ST_SZ_DW(cqc)];

	struct mlx5_wq_param       wq;
@@ -125,7 +120,6 @@ u8 mlx5e_mpwqe_get_log_num_strides(struct mlx5_core_dev *mdev, 
u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev,

			  struct mlx5e_params *params,

			  struct mlx5e_xsk_param *xsk);

struct mlx5e_lro_param mlx5e_get_lro_param(struct mlx5e_params *params);



/* Build queue parameters */

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

+12 −11
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ mlx5e_rss_get_tt_config(struct mlx5e_rss *rss, enum mlx5_traffic_types tt) 


static int mlx5e_rss_create_tir(struct mlx5e_rss *rss,

				enum mlx5_traffic_types tt,

				const struct mlx5e_lro_param *init_lro_param,

				const struct mlx5e_packet_merge_param *init_pkt_merge_param,

				bool inner)

{

	struct mlx5e_rss_params_traffic_type rss_tt;
@@ -161,7 +161,7 @@ static int mlx5e_rss_create_tir(struct mlx5e_rss *rss, 
	rqtn = mlx5e_rqt_get_rqtn(&rss->rqt);

	mlx5e_tir_builder_build_rqt(builder, rss->mdev->mlx5e_res.hw_objs.td.tdn,

				    rqtn, rss->inner_ft_support);

	mlx5e_tir_builder_build_lro(builder, init_lro_param);

	mlx5e_tir_builder_build_packet_merge(builder, init_pkt_merge_param);

	rss_tt = mlx5e_rss_get_tt_config(rss, tt);

	mlx5e_tir_builder_build_rss(builder, &rss->hash, &rss_tt, inner);
@@ -198,14 +198,14 @@ static void mlx5e_rss_destroy_tir(struct mlx5e_rss *rss, enum mlx5_traffic_types 
}



static int mlx5e_rss_create_tirs(struct mlx5e_rss *rss,

				 const struct mlx5e_lro_param *init_lro_param,

				 const struct mlx5e_packet_merge_param *init_pkt_merge_param,

				 bool inner)

{

	enum mlx5_traffic_types tt, max_tt;

	int err;



	for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++) {

		err = mlx5e_rss_create_tir(rss, tt, init_lro_param, inner);

		err = mlx5e_rss_create_tir(rss, tt, init_pkt_merge_param, inner);

		if (err)

			goto err_destroy_tirs;

	}
@@ -297,7 +297,7 @@ int mlx5e_rss_init_no_tirs(struct mlx5e_rss *rss, struct mlx5_core_dev *mdev, 


int mlx5e_rss_init(struct mlx5e_rss *rss, struct mlx5_core_dev *mdev,

		   bool inner_ft_support, u32 drop_rqn,

		   const struct mlx5e_lro_param *init_lro_param)

		   const struct mlx5e_packet_merge_param *init_pkt_merge_param)

{

	int err;
@@ -305,12 +305,12 @@ int mlx5e_rss_init(struct mlx5e_rss *rss, struct mlx5_core_dev *mdev, 
	if (err)

		goto err_out;



	err = mlx5e_rss_create_tirs(rss, init_lro_param, false);

	err = mlx5e_rss_create_tirs(rss, init_pkt_merge_param, false);

	if (err)

		goto err_destroy_rqt;



	if (inner_ft_support) {

		err = mlx5e_rss_create_tirs(rss, init_lro_param, true);

		err = mlx5e_rss_create_tirs(rss, init_pkt_merge_param, true);

		if (err)

			goto err_destroy_tirs;

	}
@@ -372,7 +372,7 @@ u32 mlx5e_rss_get_tirn(struct mlx5e_rss *rss, enum mlx5_traffic_types tt, 
 */

int mlx5e_rss_obtain_tirn(struct mlx5e_rss *rss,

			  enum mlx5_traffic_types tt,

			  const struct mlx5e_lro_param *init_lro_param,

			  const struct mlx5e_packet_merge_param *init_pkt_merge_param,

			  bool inner, u32 *tirn)

{

	struct mlx5e_tir *tir;
@@ -381,7 +381,7 @@ int mlx5e_rss_obtain_tirn(struct mlx5e_rss *rss, 
	if (!tir) { /* TIR doesn't exist, create one */

		int err;



		err = mlx5e_rss_create_tir(rss, tt, init_lro_param, inner);

		err = mlx5e_rss_create_tir(rss, tt, init_pkt_merge_param, inner);

		if (err)

			return err;

		tir = rss_get_tir(rss, tt, inner);
@@ -419,7 +419,8 @@ void mlx5e_rss_disable(struct mlx5e_rss *rss) 
			       mlx5e_rqt_get_rqtn(&rss->rqt), rss->drop_rqn, err);

}



int mlx5e_rss_lro_set_param(struct mlx5e_rss *rss, struct mlx5e_lro_param *lro_param)

int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss,

				     struct mlx5e_packet_merge_param *pkt_merge_param)

{

	struct mlx5e_tir_builder *builder;

	enum mlx5_traffic_types tt;
@@ -429,7 +430,7 @@ int mlx5e_rss_lro_set_param(struct mlx5e_rss *rss, struct mlx5e_lro_param *lro_p 
	if (!builder)

		return -ENOMEM;



	mlx5e_tir_builder_build_lro(builder, lro_param);

	mlx5e_tir_builder_build_packet_merge(builder, pkt_merge_param);



	final_err = 0;

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

+4 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct mlx5e_rss *mlx5e_rss_alloc(void); 
void mlx5e_rss_free(struct mlx5e_rss *rss);

int mlx5e_rss_init(struct mlx5e_rss *rss, struct mlx5_core_dev *mdev,

		   bool inner_ft_support, u32 drop_rqn,

		   const struct mlx5e_lro_param *init_lro_param);

		   const struct mlx5e_packet_merge_param *init_pkt_merge_param);

int mlx5e_rss_init_no_tirs(struct mlx5e_rss *rss, struct mlx5_core_dev *mdev,

			   bool inner_ft_support, u32 drop_rqn);

int mlx5e_rss_cleanup(struct mlx5e_rss *rss);
@@ -30,13 +30,14 @@ u32 mlx5e_rss_get_tirn(struct mlx5e_rss *rss, enum mlx5_traffic_types tt, 
		       bool inner);

int mlx5e_rss_obtain_tirn(struct mlx5e_rss *rss,

			  enum mlx5_traffic_types tt,

			  const struct mlx5e_lro_param *init_lro_param,

			  const struct mlx5e_packet_merge_param *init_pkt_merge_param,

			  bool inner, u32 *tirn);



void mlx5e_rss_enable(struct mlx5e_rss *rss, u32 *rqns, unsigned int num_rqns);

void mlx5e_rss_disable(struct mlx5e_rss *rss);



int mlx5e_rss_lro_set_param(struct mlx5e_rss *rss, struct mlx5e_lro_param *lro_param);

int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss,

				     struct mlx5e_packet_merge_param *pkt_merge_param);

int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc);

int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir,

		       const u8 *key, const u8 *hfunc,