Commit 99b00201 authored by Tariq Toukan's avatar Tariq Toukan Committed by Jakub Kicinski
Browse files

net/mlx5e: Allow setting self loopback prevention bits on TIR init 



Until now, IPoIB was creating TIRs without setting self loopback
prevention, then modifying them in activation stage.

This is a preparation patch, that will be used by IPoIB to init TIRs
properly without the need for following calls of modify_tir.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarCarolina Jubran <cjubran@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1761831159-1013140-4-git-send-email-tariqt@nvidia.com


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

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

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ mlx5e_rss_create_tir(struct mlx5e_rss *rss, enum mlx5_traffic_types tt, 
				    rqtn, rss_inner);

	mlx5e_tir_builder_build_packet_merge(builder, pkt_merge_param);

	rss_tt = mlx5e_rss_get_tt_config(rss, tt);

	mlx5e_tir_builder_build_self_lb_block(builder, rss->params.self_lb_blk,

					      rss->params.self_lb_blk);

	mlx5e_tir_builder_build_rss(builder, &rss->hash, &rss_tt, inner);



	err = mlx5e_tir_init(tir, builder, rss->mdev, true);

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

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct mlx5e_rss_init_params { 
struct mlx5e_rss_params {

	bool inner_ft_support;

	u32 drop_rqn;

	bool self_lb_blk;

};



struct mlx5e_rss_params_traffic_type

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

+7 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ static int mlx5e_rx_res_rss_init_def(struct mlx5e_rx_res *res, 
	rss_params = (struct mlx5e_rss_params) {

		.inner_ft_support = inner_ft_support,

		.drop_rqn = res->drop_rqn,

		.self_lb_blk =

			res->features & MLX5E_RX_RES_FEATURE_SELF_LB_BLOCK,

	};



	rss = mlx5e_rss_init(res->mdev, &rss_params, &init_params);
@@ -104,6 +106,8 @@ int mlx5e_rx_res_rss_init(struct mlx5e_rx_res *res, u32 rss_idx, unsigned int in 
	rss_params = (struct mlx5e_rss_params) {

		.inner_ft_support = inner_ft_support,

		.drop_rqn = res->drop_rqn,

		.self_lb_blk =

			res->features & MLX5E_RX_RES_FEATURE_SELF_LB_BLOCK,

	};



	rss = mlx5e_rss_init(res->mdev, &rss_params, &init_params);
@@ -346,6 +350,7 @@ static struct mlx5e_rx_res *mlx5e_rx_res_alloc(struct mlx5_core_dev *mdev, unsig 
static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res)

{

	bool inner_ft_support = res->features & MLX5E_RX_RES_FEATURE_INNER_FT;

	bool self_lb_blk = res->features & MLX5E_RX_RES_FEATURE_SELF_LB_BLOCK;

	struct mlx5e_tir_builder *builder;

	int err = 0;

	int ix;
@@ -376,6 +381,8 @@ static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res) 
					    mlx5e_rqt_get_rqtn(&res->channels[ix].direct_rqt),

					    inner_ft_support);

		mlx5e_tir_builder_build_packet_merge(builder, &res->pkt_merge_param);

		mlx5e_tir_builder_build_self_lb_block(builder, self_lb_blk,

						      self_lb_blk);

		mlx5e_tir_builder_build_direct(builder);



		err = mlx5e_tir_init(&res->channels[ix].direct_tir, builder, res->mdev, true);

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

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ enum mlx5e_rx_res_features { 
	MLX5E_RX_RES_FEATURE_INNER_FT = BIT(0),

	MLX5E_RX_RES_FEATURE_PTP = BIT(1),

	MLX5E_RX_RES_FEATURE_MULTI_VHCA = BIT(2),

	MLX5E_RX_RES_FEATURE_SELF_LB_BLOCK = BIT(3),

};



/* Setup */