net/mlx5e: Introduce mlx5e_rss_params for RSS configuration

Group RSS-related parameters into a dedicated mlx5e_rss_params
struct. Pass this struct instead of individual arguments when
initializing RSS.

No functional changes.

Signed-off-by: Carolina Jubran <cjubran@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1759094723-843774-7-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 c3eeeec621299f0a0763eb3f4d23b07b7ff98bed..c96cbc4b0dbfab4961ae7298b555904c9129c3af 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
@@ -75,15 +75,14 @@ struct mlx5e_rss {
        struct mlx5e_tir *inner_tir[MLX5E_NUM_INDIR_TIRS];
        struct mlx5e_rqt rqt;
        struct mlx5_core_dev *mdev; /* primary */
-       u32 drop_rqn;
-       bool inner_ft_support;
+       struct mlx5e_rss_params params;
        bool enabled;
        refcount_t refcnt;
 };
 
 bool mlx5e_rss_get_inner_ft_support(struct mlx5e_rss *rss)
 {
-       return rss->inner_ft_support;
+       return rss->params.inner_ft_support;
 }
 
 void mlx5e_rss_params_indir_modify_actual_size(struct mlx5e_rss *rss, u32 num_channels)
@@ -198,6 +197,7 @@ mlx5e_rss_create_tir(struct mlx5e_rss *rss, enum mlx5_traffic_types tt,
                     const struct mlx5e_packet_merge_param *pkt_merge_param,
                     bool inner)
 {
+       bool rss_inner = rss->params.inner_ft_support;
        struct mlx5e_rss_params_traffic_type rss_tt;
        struct mlx5e_tir_builder *builder;
        struct mlx5e_tir **tir_p;
@@ -205,7 +205,7 @@ mlx5e_rss_create_tir(struct mlx5e_rss *rss, enum mlx5_traffic_types tt,
        u32 rqtn;
        int err;
 
-       if (inner && !rss->inner_ft_support) {
+       if (inner && !rss_inner) {
                mlx5e_rss_warn(rss->mdev,
                               "Cannot create inner indirect TIR[%d], RSS inner FT is not supported.\n",
                               tt);
@@ -228,7 +228,7 @@ mlx5e_rss_create_tir(struct mlx5e_rss *rss, enum mlx5_traffic_types tt,
 
        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);
+                                   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_rss(builder, &rss->hash, &rss_tt, inner);
@@ -337,7 +337,7 @@ static int mlx5e_rss_update_tirs(struct mlx5e_rss *rss)
                                       tt, err);
                }
 
-               if (!rss->inner_ft_support)
+               if (!rss->params.inner_ft_support)
                        continue;
 
                err = mlx5e_rss_update_tir(rss, tt, true);
@@ -357,11 +357,13 @@ static int mlx5e_rss_init_no_tirs(struct mlx5e_rss *rss)
        refcount_set(&rss->refcnt, 1);
 
        return mlx5e_rqt_init_direct(&rss->rqt, rss->mdev, true,
-                                    rss->drop_rqn, rss->indir.max_table_size);
+                                    rss->params.drop_rqn,
+                                    rss->indir.max_table_size);
 }
 
 struct mlx5e_rss *
-mlx5e_rss_init(struct mlx5_core_dev *mdev, bool inner_ft_support, u32 drop_rqn,
+mlx5e_rss_init(struct mlx5_core_dev *mdev,
+              const struct mlx5e_rss_params *params,
               const struct mlx5e_rss_init_params *init_params)
 {
        u32 rqt_max_size, rqt_size;
@@ -379,8 +381,7 @@ mlx5e_rss_init(struct mlx5_core_dev *mdev, bool inner_ft_support, u32 drop_rqn,
                goto err_free_rss;
 
        rss->mdev = mdev;
-       rss->inner_ft_support = inner_ft_support;
-       rss->drop_rqn = drop_rqn;
+       rss->params = *params;
 
        err = mlx5e_rss_init_no_tirs(rss);
        if (err)
@@ -394,7 +395,7 @@ mlx5e_rss_init(struct mlx5_core_dev *mdev, bool inner_ft_support, u32 drop_rqn,
        if (err)
                goto err_destroy_rqt;
 
-       if (inner_ft_support) {
+       if (params->inner_ft_support) {
                err = mlx5e_rss_create_tirs(rss,
                                            init_params->pkt_merge_param,
                                            true);
@@ -423,7 +424,7 @@ int mlx5e_rss_cleanup(struct mlx5e_rss *rss)
 
        mlx5e_rss_destroy_tirs(rss, false);
 
-       if (rss->inner_ft_support)
+       if (rss->params.inner_ft_support)
                mlx5e_rss_destroy_tirs(rss, true);
 
        mlx5e_rqt_destroy(&rss->rqt);
@@ -453,7 +454,7 @@ u32 mlx5e_rss_get_tirn(struct mlx5e_rss *rss, enum mlx5_traffic_types tt,
 {
        struct mlx5e_tir *tir;
 
-       WARN_ON(inner && !rss->inner_ft_support);
+       WARN_ON(inner && !rss->params.inner_ft_support);
        tir = rss_get_tir(rss, tt, inner);
        WARN_ON(!tir);
 
@@ -517,10 +518,11 @@ void mlx5e_rss_disable(struct mlx5e_rss *rss)
        int err;
 
        rss->enabled = false;
-       err = mlx5e_rqt_redirect_direct(&rss->rqt, rss->drop_rqn, NULL);
+       err = mlx5e_rqt_redirect_direct(&rss->rqt, rss->params.drop_rqn, NULL);
        if (err)
                mlx5e_rss_warn(rss->mdev, "Failed to redirect RQT %#x to drop RQ %#x: err = %d\n",
-                              mlx5e_rqt_get_rqtn(&rss->rqt), rss->drop_rqn, err);
+                              mlx5e_rqt_get_rqtn(&rss->rqt),
+                              rss->params.drop_rqn, err);
 }
 
 int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss,
@@ -553,7 +555,7 @@ int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss,
                }
 
 inner_tir:
-               if (!rss->inner_ft_support)
+               if (!rss->params.inner_ft_support)
                        continue;
 
                tir = rss_get_tir(rss, tt, true);
@@ -686,7 +688,7 @@ int mlx5e_rss_set_hash_fields(struct mlx5e_rss *rss, enum mlx5_traffic_types tt,
                return err;
        }
 
-       if (!(rss->inner_ft_support))
+       if (!(rss->params.inner_ft_support))
                return 0;
 
        err = mlx5e_rss_update_tir(rss, tt, true);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
index 80225709675b0136794ad0fcc8b946b6c342079c..5fb03cd0a411be48dc677d23e247689cbcfc1094 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
@@ -20,6 +20,11 @@ struct mlx5e_rss_init_params {
        unsigned int max_nch;
 };
 
+struct mlx5e_rss_params {
+       bool inner_ft_support;
+       u32 drop_rqn;
+};
+
 struct mlx5e_rss_params_traffic_type
 mlx5e_rss_get_default_tt_config(enum mlx5_traffic_types tt);
 
@@ -30,7 +35,8 @@ int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir,
 void mlx5e_rss_params_indir_cleanup(struct mlx5e_rss_params_indir *indir);
 void mlx5e_rss_params_indir_modify_actual_size(struct mlx5e_rss *rss, u32 num_channels);
 struct mlx5e_rss *
-mlx5e_rss_init(struct mlx5_core_dev *mdev, bool inner_ft_support, u32 drop_rqn,
+mlx5e_rss_init(struct mlx5_core_dev *mdev,
+              const struct mlx5e_rss_params *params,
               const struct mlx5e_rss_init_params *init_params);
 int mlx5e_rss_cleanup(struct mlx5e_rss *rss);
 

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 74dda61e92bcdbf17e1f0f28bad9b597a67a31af..ac26a32845d0de6064d90152e4b28306ef1ed0a4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
@@ -55,6 +55,7 @@ static int mlx5e_rx_res_rss_init_def(struct mlx5e_rx_res *res,
 {
        bool inner_ft_support = res->features & MLX5E_RX_RES_FEATURE_INNER_FT;
        struct mlx5e_rss_init_params init_params;
+       struct mlx5e_rss_params rss_params;
        struct mlx5e_rss *rss;
 
        if (WARN_ON(res->rss[0]))
@@ -67,8 +68,12 @@ static int mlx5e_rx_res_rss_init_def(struct mlx5e_rx_res *res,
                .max_nch = res->max_nch,
        };
 
-       rss = mlx5e_rss_init(res->mdev, inner_ft_support, res->drop_rqn,
-                            &init_params);
+       rss_params = (struct mlx5e_rss_params) {
+               .inner_ft_support = inner_ft_support,
+               .drop_rqn = res->drop_rqn,
+       };
+
+       rss = mlx5e_rss_init(res->mdev, &rss_params, &init_params);
        if (IS_ERR(rss))
                return PTR_ERR(rss);
 
@@ -83,6 +88,7 @@ int mlx5e_rx_res_rss_init(struct mlx5e_rx_res *res, u32 rss_idx, unsigned int in
 {
        bool inner_ft_support = res->features & MLX5E_RX_RES_FEATURE_INNER_FT;
        struct mlx5e_rss_init_params init_params;
+       struct mlx5e_rss_params rss_params;
        struct mlx5e_rss *rss;
 
        if (WARN_ON_ONCE(res->rss[rss_idx]))
@@ -95,8 +101,12 @@ int mlx5e_rx_res_rss_init(struct mlx5e_rx_res *res, u32 rss_idx, unsigned int in
                .max_nch = res->max_nch,
        };
 
-       rss = mlx5e_rss_init(res->mdev, inner_ft_support, res->drop_rqn,
-                            &init_params);
+       rss_params = (struct mlx5e_rss_params) {
+               .inner_ft_support = inner_ft_support,
+               .drop_rqn = res->drop_rqn,
+       };
+
+       rss = mlx5e_rss_init(res->mdev, &rss_params, &init_params);
        if (IS_ERR(rss))
                return PTR_ERR(rss);