Commit e1a0bdbd authored by Patrisious Haddad's avatar Patrisious Haddad Committed by Leon Romanovsky
Browse files

RDMA/mlx5: Fix bind QP error cleanup flow 



When there is a failure during bind QP, the cleanup flow destroys the
counter regardless if it is the one that created it or not, which is
problematic since if it isn't the one that created it, that counter could
still be in use.

Fix that by destroying the counter only if it was created during this call.

Fixes: 45842fc6 ("IB/mlx5: Support statistic q counter configuration")
Signed-off-by: default avatarPatrisious Haddad <phaddad@nvidia.com>
Reviewed-by: default avatarMark Zhang <markzhang@nvidia.com>
Link: https://patch.msgid.link/25dfefddb0ebefa668c32e06a94d84e3216257cf.1740033937.git.leon@kernel.org


Reviewed-by: default avatarZhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent c534ffda

drivers/infiniband/hw/mlx5/counters.c

+6 −2
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter, 
				   struct ib_qp *qp)

{

	struct mlx5_ib_dev *dev = to_mdev(qp->device);

	bool new = false;

	int err;



	if (!counter->id) {
@@ -560,6 +561,7 @@ static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter, 
			return err;

		counter->id =

			MLX5_GET(alloc_q_counter_out, out, counter_set_id);

		new = true;

	}



	err = mlx5_ib_qp_set_counter(qp, counter);
@@ -569,8 +571,10 @@ static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter, 
	return 0;



fail_set_counter:

	if (new) {

		mlx5_ib_counter_dealloc(counter);

		counter->id = 0;

	}



	return err;

}