From: Or Har-Toov Cache aggregate TX-enabled speed we calculated, and use it instead of querying the bond speed so we can, in the following patch, limit it by the PCI bandwidth. The bond speed takes the calculation from PTYS, and PTYS is not bounded by the PCI bandwidth of the NIC. Fixes: 50f1d188c580 ("net/mlx5: Propagate LAG effective max_tx_speed to vports") Signed-off-by: Or Har-Toov Reviewed-by: Shay Drori Reviewed-by: Mark Bloch Signed-off-by: Tariq Toukan --- drivers/infiniband/hw/mlx5/main.c | 2 +- .../net/ethernet/mellanox/mlx5/core/lag/lag.c | 61 +++++++++++++++---- .../net/ethernet/mellanox/mlx5/core/lag/lag.h | 15 ++++- include/linux/mlx5/driver.h | 1 + 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 373ee1f42d4a..6ab7f945e712 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -1654,7 +1654,7 @@ static int mlx5_ib_query_port_speed_from_bond(struct mlx5_ib_dev *dev, u32 bond_speed; int err; - err = mlx5_lag_query_bond_speed(mdev, &bond_speed); + err = mlx5_lag_query_aggregated_speed(mdev, &bond_speed); if (err) return err; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c index c2f21eb4ea7c..76b574fa0d7a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c @@ -1413,7 +1413,6 @@ static bool mlx5_lag_should_disable_lag(struct mlx5_lag *ldev, bool do_bond) ldev->mode != MLX5_LAG_MODE_MPESW; } -#ifdef CONFIG_MLX5_ESWITCH static int mlx5_lag_get_devices_oper_speed(struct mlx5_lag *ldev, u32 *sum_speed) { @@ -1496,6 +1495,30 @@ static int mlx5_lag_get_devices_max_speed(struct mlx5_lag *ldev, u32 *max_speed) return 0; } +void mlx5_lag_update_agg_speed(struct mlx5_lag *ldev) +{ + u32 speed; + + lockdep_assert_held(&ldev->lock); + + if (mlx5_lag_get_devices_oper_speed(ldev, &speed)) + return; + + /* If speed is not set, use the sum of max speeds of all PFs */ + if (!speed && mlx5_lag_get_devices_max_speed(ldev, &speed)) + return; + + ldev->agg_speed_mbps = speed; +} + +void mlx5_lag_reset_agg_speed(struct mlx5_lag *ldev) +{ + lockdep_assert_held(&ldev->lock); + + ldev->agg_speed_mbps = 0; +} + +#ifdef CONFIG_MLX5_ESWITCH static void mlx5_lag_modify_device_vports_speed(struct mlx5_core_dev *mdev, u32 speed) { @@ -1541,17 +1564,10 @@ void mlx5_lag_set_vports_agg_speed(struct mlx5_lag *ldev) u32 speed; int pf_idx; - if (ldev->mode == MLX5_LAG_MODE_MPESW) { - if (mlx5_lag_get_devices_oper_speed(ldev, &speed)) - return; - } else { - speed = ldev->tracker.bond_speed_mbps; - if (speed == SPEED_UNKNOWN) - return; - } + mlx5_lag_update_agg_speed(ldev); + speed = ldev->agg_speed_mbps; - /* If speed is not set, use the sum of max speeds of all PFs */ - if (!speed && mlx5_lag_get_devices_max_speed(ldev, &speed)) + if (!speed) return; speed = speed / MLX5_MAX_TX_SPEED_UNIT; @@ -1576,6 +1592,7 @@ void mlx5_lag_reset_vports_speed(struct mlx5_lag *ldev) int pf_idx; int ret; + mlx5_lag_reset_agg_speed(ldev); mlx5_ldev_for_each(pf_idx, 0, ldev) { pf = mlx5_lag_pf(ldev, pf_idx); if (!pf) @@ -2068,6 +2085,28 @@ static int mlx5_handle_changeinfodata_event(struct mlx5_lag *ldev, return 1; } +/* Returns speed in Mbps. */ +int mlx5_lag_query_aggregated_speed(struct mlx5_core_dev *mdev, u32 *speed) +{ + struct mlx5_lag *ldev; + int ret = 0; + + ldev = mlx5_lag_dev(mdev); + if (!ldev) + return -ENODEV; + + mutex_lock(&ldev->lock); + *speed = ldev->agg_speed_mbps; + if (*speed == 0) + ret = -EINVAL; + mutex_unlock(&ldev->lock); + + if (ret == -EINVAL) + mlx5_core_dbg(mdev, "aggregated speed is unknown\n"); + return ret; +} +EXPORT_SYMBOL_GPL(mlx5_lag_query_aggregated_speed); + static void mlx5_lag_update_tracker_speed(struct lag_tracker *tracker, struct net_device *ndev) { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h index e9f0ef83ce1d..744fbf9a0078 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h @@ -99,6 +99,7 @@ struct mlx5_lag { /* Protect lag fields/state changes */ struct mutex lock; struct lag_mpesw lag_mpesw; + u32 agg_speed_mbps; }; static inline struct mlx5_lag * @@ -258,12 +259,22 @@ void mlx5_lag_rescan_dev_locked(struct mlx5_lag *ldev, void mlx5_lag_add_devices_filter(struct mlx5_lag *ldev, u32 filter); struct mlx5_devcom_comp_dev *mlx5_lag_get_devcom_comp(struct mlx5_lag *ldev); +void mlx5_lag_update_agg_speed(struct mlx5_lag *ldev); +void mlx5_lag_reset_agg_speed(struct mlx5_lag *ldev); + #ifdef CONFIG_MLX5_ESWITCH void mlx5_lag_set_vports_agg_speed(struct mlx5_lag *ldev); void mlx5_lag_reset_vports_speed(struct mlx5_lag *ldev); #else -static inline void mlx5_lag_set_vports_agg_speed(struct mlx5_lag *ldev) {} -static inline void mlx5_lag_reset_vports_speed(struct mlx5_lag *ldev) {} +static inline void mlx5_lag_set_vports_agg_speed(struct mlx5_lag *ldev) +{ + mlx5_lag_update_agg_speed(ldev); +} + +static inline void mlx5_lag_reset_vports_speed(struct mlx5_lag *ldev) +{ + mlx5_lag_reset_agg_speed(ldev); +} #endif static inline bool mlx5_lag_is_supported(struct mlx5_core_dev *dev) diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 83d0a83bbfbc..a83926689e9a 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -1155,6 +1155,7 @@ bool mlx5_lag_is_roce(struct mlx5_core_dev *dev); bool mlx5_lag_is_sriov(struct mlx5_core_dev *dev); bool mlx5_lag_is_active(struct mlx5_core_dev *dev); int mlx5_lag_query_bond_speed(struct mlx5_core_dev *dev, u32 *speed); +int mlx5_lag_query_aggregated_speed(struct mlx5_core_dev *dev, u32 *speed); bool mlx5_lag_mode_is_hash(struct mlx5_core_dev *dev); bool mlx5_lag_is_master(struct mlx5_core_dev *dev); bool mlx5_lag_is_shared_fdb(struct mlx5_core_dev *dev); -- 2.44.0