On Thu, Feb 20, 2025 at 01:23:33PM +0100, Zhu Yanjun wrote:
> 在 2025/2/20 7:47, Leon Romanovsky 写道:
> > From: Patrisious Haddad <phaddad@xxxxxxxxxx>
> >
> > 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: 45842fc627c7 ("IB/mlx5: Support statistic q counter configuration")
> > Signed-off-by: Patrisious Haddad <phaddad@xxxxxxxxxx>
> > Reviewed-by: Mark Zhang <markzhang@xxxxxxxxxx>
> > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx>
> > ---
> > drivers/infiniband/hw/mlx5/counters.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/infiniband/hw/mlx5/counters.c b/drivers/infiniband/hw/mlx5/counters.c
> > index 4f6c1968a2ee..81cfa74147a1 100644
> > --- a/drivers/infiniband/hw/mlx5/counters.c
> > +++ b/drivers/infiniband/hw/mlx5/counters.c
> > @@ -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;
> It seems that there is no other better method except that a new bool
> variable is used. IMO, this method can fix this problem.
>
> Reviewed-by: Zhu Yanjun <yanjun.zhu@xxxxxxxxx>
Thanks
>
> Zhu Yanjun
>
> > }
> > 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:
> > - mlx5_ib_counter_dealloc(counter);
> > - counter->id = 0;
> > + if (new) {
> > + mlx5_ib_counter_dealloc(counter);
> > + counter->id = 0;
> > + }
> > return err;
> > }
>
>
