net/mlx5e: Use a new initializer to build uniform indir table

Replace mlx5e_build_default_indir_rqt with a new initializer of struct
mlx5e_rss_params_indir that works directly with the struct, rather than
its internals.

The new initializer is called mlx5e_rss_params_indir_init_uniform, which
also reflects the purpose (uniform spreading) better.

Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 35668986878a16329613bcba2fe994ac75055e26..87dabb8b8ac4b2ec89d491e0dec15810e732e574 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -984,9 +984,6 @@ void mlx5e_activate_priv_channels(struct mlx5e_priv *priv);
 void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv);
 int mlx5e_ptp_rx_manage_fs_ctx(struct mlx5e_priv *priv, void *ctx);
 
-void mlx5e_build_default_indir_rqt(u32 *indirection_rqt, int len,
-                                  int num_channels);
-
 int mlx5e_modify_rq_state(struct mlx5e_rq *rq, int curr_state, int next_state);
 void mlx5e_activate_rq(struct mlx5e_rq *rq);
 void mlx5e_deactivate_rq(struct mlx5e_rq *rq);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c
index 38d0e9dbd6bd6f87bf5ea1a38f1dda58ec095a02..b915fb29dd2cfcebd3030a104a3df96df40906c8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c
@@ -4,6 +4,15 @@
 #include "rqt.h"
 #include <linux/mlx5/transobj.h>
 
+void mlx5e_rss_params_indir_init_uniform(struct mlx5e_rss_params_indir *indir,
+                                        unsigned int num_channels)
+{
+       unsigned int i;
+
+       for (i = 0; i < MLX5E_INDIR_RQT_SIZE; i++)
+               indir->table[i] = i % num_channels;
+}
+
 static int mlx5e_rqt_init(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev,
                          u16 max_size, u32 *init_rqns, u16 init_size)
 {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h
index d2c76649efb0057863be3d0200100be2f45b0e07..60c985a12f24f33f0f6e4d9a7ee8dc8bc5891722 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h
@@ -14,6 +14,9 @@ struct mlx5e_rss_params_indir {
        u32 table[MLX5E_INDIR_RQT_SIZE];
 };
 
+void mlx5e_rss_params_indir_init_uniform(struct mlx5e_rss_params_indir *indir,
+                                        unsigned int num_channels);
+
 struct mlx5e_rqt {
        struct mlx5_core_dev *mdev;
        u32 rqtn;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 3e644d3955a8f3d160f8faeb42deb4248f629c20..68be4e0e77bf30727434d53e4a80ce00853d456f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2572,8 +2572,8 @@ int mlx5e_num_channels_changed(struct mlx5e_priv *priv)
 
        /* This function may be called on attach, before priv->rx_res is created. */
        if (!netif_is_rxfh_configured(priv->netdev) && priv->rx_res)
-               mlx5e_build_default_indir_rqt(priv->rx_res->rss_params.indir.table,
-                                             MLX5E_INDIR_RQT_SIZE, count);
+               mlx5e_rss_params_indir_init_uniform(&priv->rx_res->rss_params.indir,
+                                                   count);
 
        return 0;
 }
@@ -4459,15 +4459,6 @@ const struct net_device_ops mlx5e_netdev_ops = {
        .ndo_get_devlink_port    = mlx5e_get_devlink_port,
 };
 
-void mlx5e_build_default_indir_rqt(u32 *indirection_rqt, int len,
-                                  int num_channels)
-{
-       int i;
-
-       for (i = 0; i < len; i++)
-               indirection_rqt[i] = i % num_channels;
-}
-
 static u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout)
 {
        int i;
@@ -4488,8 +4479,7 @@ void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params,
        rss_params->hash.hfunc = ETH_RSS_HASH_TOP;
        netdev_rss_key_fill(rss_params->hash.toeplitz_hash_key,
                            sizeof(rss_params->hash.toeplitz_hash_key));
-       mlx5e_build_default_indir_rqt(rss_params->indir.table,
-                                     MLX5E_INDIR_RQT_SIZE, num_channels);
+       mlx5e_rss_params_indir_init_uniform(&rss_params->indir, num_channels);
        for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++)
                rss_params->rx_hash_fields[tt] =
                        mlx5e_rss_get_default_tt_config(tt).rx_hash_fields;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 2ef02fea119add619338d2771d319ad1c9a0dd3e..4d7ed24ae13c988cb9418e458ecf788c1c8e249f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -525,9 +525,9 @@ static int mlx5e_hairpin_create_indirect_rqt(struct mlx5e_hairpin *hp)
        if (!indir)
                return -ENOMEM;
 
-       mlx5e_build_default_indir_rqt(indir->table, MLX5E_INDIR_RQT_SIZE, hp->num_channels);
+       mlx5e_rss_params_indir_init_uniform(indir, hp->num_channels);
        err = mlx5e_rqt_init_indir(&hp->indir_rqt, mdev, hp->pair->rqn, hp->num_channels,
-                                   priv->rx_res->rss_params.hash.hfunc, indir);
+                                  priv->rx_res->rss_params.hash.hfunc, indir);
 
        kvfree(indir);
        return err;