net/mlx5e: Have a single RSS Toeplitz hash key

No need to generate a unique key per TIR.
Generating a single key per netdev and copying it to all
its TIRs.

Signed-off-by: Achiad Shochat <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index e9d7d90363a8ea4d31ff6de176cf5b0b9c575956..7b2b74398ead6984712e7843510bf377a198bfaa 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -273,6 +273,7 @@ struct mlx5e_params {
        u32 lro_wqe_sz;
        u8  rss_hfunc;
        u16 tx_max_inline;
+       u8 toeplitz_hash_key[40];
 };
 
 enum {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 111427b33ec861df14ec9b2a5eef873ee87976f6..662ca675a9ce02bb937afdf464317a15dbdfd949 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -1611,7 +1611,7 @@ static void mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 *tirc, int tt)
                                                       rx_hash_toeplitz_key);
 
                        MLX5_SET(tirc, tirc, rx_hash_symmetric, 1);
-                       netdev_rss_key_fill(rss_key, len);
+                       memcpy(rss_key, priv->params.toeplitz_hash_key, len);
                }
                break;
        }
@@ -1939,6 +1939,9 @@ static void mlx5e_build_netdev_priv(struct mlx5_core_dev *mdev,
        priv->params.default_vlan_prio     = 0;
        priv->params.rss_hfunc             = ETH_RSS_HASH_XOR;
 
+       netdev_rss_key_fill(priv->params.toeplitz_hash_key,
+                           sizeof(priv->params.toeplitz_hash_key));
+
        priv->params.lro_en = false && !!MLX5_CAP_ETH(priv->mdev, lro_cap);
        priv->params.lro_wqe_sz            =
                MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ;