IB/mlx5: Fix loopback rollback and locking
Subsystems (2)
v10 cover IB/mlx5: Fix loopback rollback and locking
This series fixes transport-domain rollback and loopback state consistency in mlx5 IB.
Patch 1 fixes TD rollback on mlx5_ib_enable_lb() failure, makes the success return path explicit, and initializes lb.mutex earlier.
Patch 2 serializes MP force-enable state updates with lb.mutex and implements capability-aware thresholds (td_base) to ensure correct loopback behavior on both TD-capable and no-TD hardware.
v10:
- Initialize lb.mutex before multiport master init to avoid race.
- Use <= td_base in disable paths to handle idle/no-TD cases.
v9:
- Address race/state issues around force_enable and enabled.
- Fix TD leak on failure after successful allocation.
- Implement hardware-aware thresholds via mlx5_ib_lb_td_base() to handle both TD-capable and no-TD hardware correctly.
- Serialize MP force-enable transitions under lb.mutex.
v8:
- Resubmitted as a fresh, independent thread per maintainer request.
- No functional changes since v7.
v7:
- Split the series into two patches to isolate the return-value/mutex initialization fix from the refcounting logic.
- Moved force_enable check after increments/decrements to fix leaks.
- Updated hardware disable condition to a strict zero-check.
v1-v6:
- Initial combined versions.
- Added deallocation of tdn on failure.
- Moved mutex_init to stage_init_init to prevent crashes on non-ETH.
- Implemented atomic rollback in enable/disable paths.
Prathamesh Deshpande (2):
IB/mlx5: Fix transport-domain rollback and initialize lb mutex earlier IB/mlx5: Serialize force-enable state and preserve loopback accounting
drivers/infiniband/hw/mlx5/main.c | 82 ++++++++++++++++++++++++------- 1 file changed, 63 insertions(+), 19 deletions(-)
Signature · 1 line
2.43.0
PATCH v10 1/2 IB/mlx5: Fix transport-domain rollback and initialize lb mutex earlier
mlx5_ib_alloc_transport_domain() allocates a transport domain and then may fail in mlx5_ib_enable_lb(). In that case, the allocated TD is leaked.
Fix this by deallocating the TD when mlx5_ib_enable_lb() returns an error. Also return 0 explicitly in the no-loopback-capability success branch, and move dev->lb.mutex initialization to mlx5_ib_stage_init_init().
--- drivers/infiniband/hw/mlx5/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/infiniband/hw/mlx5/main.c +8 -7
@@ -2068,9 +2068,13 @@ static int mlx5_ib_alloc_transport_domain(struct mlx5_ib_dev *dev, u32 *tdn,if ((MLX5_CAP_GEN (dev->mdev, port_type) !=MLX5_CAP_PORT_TYPE_ETH ) || (!MLX5_CAP_GEN (dev->mdev, disable_local_lb_uc) && !MLX5_CAP_GEN (dev->mdev, disable_local_lb_mc))) -return err; +return 0 ; + + err =mlx5_ib_enable_lb (dev, true, false); +if (err) +mlx5_cmd_dealloc_transport_domain (dev->mdev, *tdn, uid); -return mlx5_ib_enable_lb (dev, true, false); +return err; } static void mlx5_ib_dealloc_transport_domain(struct mlx5_ib_dev *dev, u32 tdn,
@@ -4486,6 +4490,8 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev) dev->port[i].roce.last_port_state =IB_PORT_DOWN ; } +mutex_init (&dev->lb.mutex); + err =mlx5r_cmd_query_special_mkeys (dev);if (err)return err;
@@ -4786,11 +4792,6 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)if (err)return err; -if ((MLX5_CAP_GEN (dev->mdev, port_type) ==MLX5_CAP_PORT_TYPE_ETH ) && - (MLX5_CAP_GEN (dev->mdev, disable_local_lb_uc) || -MLX5_CAP_GEN (dev->mdev, disable_local_lb_mc))) -mutex_init (&dev->lb.mutex); -if (MLX5_CAP_GEN_64 (dev->mdev, general_obj_types) &MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q ) { err =mlx5_ib_init_var_region (dev);
Signature · 1 line
2.43.0
PATCH v10 2/2 IB/mlx5: Serialize force-enable state and preserve loopback accounting
In reply to Prathamesh Deshpandeforce_enable is shared between MP bind/unbind flows and regular loopback enable/disable flows. MP helpers updated force_enable without lb.mutex, while regular paths read it under lb.mutex, allowing races and state mismatches.
Serialize MP force-enable transitions under lb.mutex. In regular loopback paths, update counters before checking force_enable
and roll them back if HW enable fails. Also keep pre-existing master loopback enabled when MP enable fails on the slave side.
Use a TD-capability-aware baseline for user_td transitions so threshold checks are correct on both TD-capable and no-TD hardware.
--- drivers/infiniband/hw/mlx5/main.c | 67 +++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 12 deletions(-)
drivers/infiniband/hw/mlx5/main.c +55 -12
@@ -1973,25 +1973,45 @@ static void deallocate_uars(struct mlx5_ib_dev *dev, context->devx_uid); } +static inline u32 mlx5_ib_lb_td_base (struct mlx5_core_dev *mdev) +{ +return MLX5_CAP_GEN (mdev, log_max_transport_domain) ?1 :0 ; +} +static int mlx5_ib_enable_lb_mp (struct mlx5_core_dev *master,struct mlx5_core_dev *slave,struct mlx5_ib_lb_state *lb_state) { +bool user_enabled;int err; +lockdep_assert_held (&mlx5_ib_multiport_mutex); + +mutex_lock (&lb_state->mutex); +if (lb_state->force_enable) { +mutex_unlock (&lb_state->mutex); +return 0 ; + } + user_enabled = lb_state->enabled; + err =mlx5_nic_vport_update_local_lb (master, true);if (err) -return err; + goto unlock; err =mlx5_nic_vport_update_local_lb (slave, true);if (err) goto out; lb_state->force_enable = true; + lb_state->enabled = true; +mutex_unlock (&lb_state->mutex);return 0 ; out: -mlx5_nic_vport_update_local_lb (master, false); +if (!user_enabled) +mlx5_nic_vport_update_local_lb (master, false); +unlock: +mutex_unlock (&lb_state->mutex);return err; }
@@ -1999,33 +2019,53 @@ static void mlx5_ib_disable_lb_mp(struct mlx5_core_dev *master,struct mlx5_core_dev *slave, struct mlx5_ib_lb_state *lb_state) { -mlx5_nic_vport_update_local_lb (slave ,false ); -mlx5_nic_vport_update_local_lb (master, false); + u32 td_base = mlx5_ib_lb_td_base(master); + +lockdep_assert_held (&mlx5_ib_multiport_mutex); + +mutex_lock (&lb_state->mutex); +mlx5_nic_vport_update_local_lb (slave, false); lb_state->force_enable = false; +if (lb_state->enabled && + lb_state->user_td <= td_base && lb_state->qps ==0 ) { +mlx5_nic_vport_update_local_lb (master, false); + lb_state->enabled = false; + } + +mutex_unlock (&lb_state->mutex); }int mlx5_ib_enable_lb (struct mlx5_ib_dev *dev,bool td,bool qp) { +u32 td_base =mlx5_ib_lb_td_base (dev->mdev);int err =0 ; -if (dev->lb.force_enable) -return 0 ; -mutex_lock (&dev->lb.mutex);if (td) dev->lb.user_td++;if (qp) dev->lb.qps++; -if (dev->lb.user_td ==2 || +if (dev->lb.force_enable) + goto unlock; + +if (dev->lb.user_td == td_base +1 || dev->lb.qps ==1 ) {if (!dev->lb.enabled) { err =mlx5_nic_vport_update_local_lb (dev->mdev, true); - dev->lb.enabled = true; +if (err) { +if (td) + dev->lb.user_td--; +if (qp) + dev->lb.qps--; + }else { + dev->lb.enabled = true; + } } } +unlock:mutex_unlock (&dev->lb.mutex);return err;
@@ -2033,8 +2073,7 @@ int mlx5_ib_enable_lb(struct mlx5_ib_dev *dev, bool td, bool qp)void mlx5_ib_disable_lb (struct mlx5_ib_dev *dev,bool td,bool qp) { -if (dev->lb.force_enable) -return ; +u32 td_base =mlx5_ib_lb_td_base (dev->mdev);mutex_lock (&dev->lb.mutex);if (td)
@@ -2042,7 +2081,10 @@ void mlx5_ib_disable_lb(struct mlx5_ib_dev *dev, bool td, bool qp)if (qp) dev->lb.qps--; -if (dev->lb.user_td ==1 && +if (dev->lb.force_enable) + goto unlock; + +if (dev->lb.user_td <= td_base && dev->lb.qps ==0 ) {if (dev->lb.enabled) {mlx5_nic_vport_update_local_lb (dev->mdev, false);
@@ -2050,6 +2092,7 @@ void mlx5_ib_disable_lb(struct mlx5_ib_dev *dev, bool td, bool qp) } } +unlock:mutex_unlock (&dev->lb.mutex); }
Signature · 1 line
2.43.0
Re: [PATCH v10 2/2] IB/mlx5: Serialize force-enable state and preserve loopback accounting
Quoted 3 lines · Prathamesh Deshpande
force_enableis shared between MP bind/unbind flows and regular loopback enable/disable flows. MP helpers updatedforce_enablewithout lb.mutex, while regular paths read it under lb.mutex.
Yes, this is intentional. During device probing, a device cannot be treated as both MP and regular at the same time.
Thanks
Re: [PATCH v10 2/2] IB/mlx5: Serialize force-enable state and preserve loopback accounting
Quoted 7 lines · Leon Romanovsky
Quoted 3 lines · Prathamesh Deshpande
force_enableis shared between MP bind/unbind flows and regular loopback enable/disable flows. MP helpers updatedforce_enablewithout lb.mutex, while regular paths read it under lb.mutex.Yes, this is intentional. During device probing, a device cannot be treated as both MP and regular at the same time.
Hi Leon,
Thanks for the clarification. I've addressed this in v11 by dropping the MP-related locking changes to keep the intentional behavior unchanged. The updated series has been submitted as a fresh thread.
Thanks,
Prathamesh