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: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1761831159-1013140-4-git-send-email-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
index c96cbc4b0dbfab4961ae7298b555904c9129c3af..88b0e1050d1af7bf29c4d5be0699a47524aa8a7b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
@@ -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);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
index 5fb03cd0a411be48dc677d23e247689cbcfc1094..17664757a561c255dcfe48d47b3ae4526918f11e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
@@ -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

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
index ac26a32845d0de6064d90152e4b28306ef1ed0a4..55c117b7d8c4a4a69da83a218d656e8f1435bc66 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
@@ -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);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
index 65a857c215e1a555532cc5dc8bccc370a8d2799d..675780120a20d8104859831bda774edba628d582 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
@@ -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 */