net/mlx5: Increase the max number of channels to 128

Currently the max number of channels is limited to 64, which is half of
the indirection table size to allow some flexibility. But on servers
with more than 64 cores, users may want to utilize more queues.

This patch increases the advertised max number of channels to 128 by
changing the ratio between channels and indirection table slots to 1:1.
At the same time, the driver still enable no more than 64 channels at
loading. Users can change it by ethtool afterwards.

Signed-off-by: Fan Li <fanl@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 9c8427698238feffc4e2a2d654a12331005a7177..fc80b59db9a8d837fb84fe5c8f38c3483ab2f68c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -135,7 +135,7 @@ struct page_pool;
 #define MLX5E_LOG_INDIR_RQT_SIZE       0x7
 #define MLX5E_INDIR_RQT_SIZE           BIT(MLX5E_LOG_INDIR_RQT_SIZE)
 #define MLX5E_MIN_NUM_CHANNELS         0x1
-#define MLX5E_MAX_NUM_CHANNELS         (MLX5E_INDIR_RQT_SIZE >> 1)
+#define MLX5E_MAX_NUM_CHANNELS         MLX5E_INDIR_RQT_SIZE
 #define MLX5E_MAX_NUM_SQS              (MLX5E_MAX_NUM_CHANNELS * MLX5E_MAX_NUM_TC)
 #define MLX5E_TX_CQ_POLL_BUDGET        128
 #define MLX5E_TX_XSK_POLL_BUDGET       64
@@ -1175,11 +1175,11 @@ int mlx5e_attach_netdev(struct mlx5e_priv *priv);
 void mlx5e_detach_netdev(struct mlx5e_priv *priv);
 void mlx5e_destroy_netdev(struct mlx5e_priv *priv);
 void mlx5e_set_netdev_mtu_boundaries(struct mlx5e_priv *priv);
-void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,
+void mlx5e_build_nic_params(struct mlx5e_priv *priv,
                            struct mlx5e_xsk *xsk,
                            struct mlx5e_rss_params *rss_params,
                            struct mlx5e_params *params,
-                           u16 max_channels, u16 mtu);
+                           u16 mtu);
 void mlx5e_build_rq_params(struct mlx5_core_dev *mdev,
                           struct mlx5e_params *params);
 void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 319b39f2559262d36cac0a7f1f9b6c985b0949c8..78737fd42616df0f326ccf3582324bc182d20e13 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -4739,17 +4739,19 @@ void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params,
                        tirc_default_config[tt].rx_hash_fields;
 }
 
-void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,
+void mlx5e_build_nic_params(struct mlx5e_priv *priv,
                            struct mlx5e_xsk *xsk,
                            struct mlx5e_rss_params *rss_params,
                            struct mlx5e_params *params,
-                           u16 max_channels, u16 mtu)
+                           u16 mtu)
 {
+       struct mlx5_core_dev *mdev = priv->mdev;
        u8 rx_cq_period_mode;
 
        params->sw_mtu = mtu;
        params->hard_mtu = MLX5E_ETH_HARD_MTU;
-       params->num_channels = max_channels;
+       params->num_channels = min_t(unsigned int, MLX5E_MAX_NUM_CHANNELS / 2,
+                                    priv->max_nch);
        params->num_tc       = 1;
 
        /* SQ */
@@ -4986,8 +4988,8 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev,
        if (err)
                return err;
 
-       mlx5e_build_nic_params(mdev, &priv->xsk, rss, &priv->channels.params,
-                              priv->max_nch, netdev->mtu);
+       mlx5e_build_nic_params(priv, &priv->xsk, rss, &priv->channels.params,
+                              netdev->mtu);
 
        mlx5e_timestamp_init(priv);
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
index 3ed8ab2d703d5112c032ae210b4dad27f232aa8e..7c87f523e370ad491ef9a302b24d4a0eaaa4cd40 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
@@ -87,8 +87,8 @@ int mlx5i_init(struct mlx5_core_dev *mdev,
        mlx5e_set_netdev_mtu_boundaries(priv);
        netdev->mtu = netdev->max_mtu;
 
-       mlx5e_build_nic_params(mdev, NULL, &priv->rss_params, &priv->channels.params,
-                              priv->max_nch, netdev->mtu);
+       mlx5e_build_nic_params(priv, NULL, &priv->rss_params, &priv->channels.params,
+                              netdev->mtu);
        mlx5i_build_nic_params(mdev, &priv->channels.params);
 
        mlx5e_timestamp_init(priv);