RDMA/mlx5: Fix bind QP error cleanup flow
Subsystems (2)
PATCH 1/1 RDMA/mlx5: Fix bind QP error cleanup flow
From: Patrisious Haddad <[email protected]>
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.
--- drivers/infiniband/hw/mlx5/counters.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx5/counters.c +6 -2
@@ -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: -mlx5_ib_counter_dealloc (counter); - counter->id =0 ; +if (new) { +mlx5_ib_counter_dealloc (counter); + counter->id =0 ; + }return err; }
Signature · 1 line
2.48.1
Quoted 30 lines · Leon Romanovsky
From: Patrisious Haddad <[email protected]>
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 <[email protected]>Reviewed-by Mark Zhang <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>--- drivers/infiniband/hw/mlx5/counters.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/infiniband/hw/mlx5/counters.c +1
-0@@ -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) {
drivers/infiniband/hw/mlx5/counters.c static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter, · line 564
Quoted 4 lines
drivers/infiniband/hw/mlx5/counters.c +1
-0@@ -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.
Zhu Yanjun
Quoted 16 lines
drivers/infiniband/hw/mlx5/counters.c +4
-2} 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; }
Quoted 37 lines · Zhu Yanjun
Quoted 29 lines · Leon Romanovsky
From: Patrisious Haddad <[email protected]>
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 <[email protected]>Reviewed-by Mark Zhang <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>--- drivers/infiniband/hw/mlx5/counters.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/infiniband/hw/mlx5/counters.c +1
-0@@ -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) {drivers/infiniband/hw/mlx5/counters.c static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter, · line 564
Quoted 4 lines
drivers/infiniband/hw/mlx5/counters.c +1
-0@@ -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.
Quoted 1 line
Reviewed-by Zhu Yanjun <[email protected]>
Thanks
Quoted 18 lines
Zhu Yanjun
Quoted 13 lines
drivers/infiniband/hw/mlx5/counters.c +4
-2} 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; }
Leon Romanovsky
AppliedQuoted 8 lines · Leon Romanovsky
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.
[...]
Applied, thanks!
[1/1] RDMA/mlx5: Fix bind QP error cleanup flow
https://git.kernel.org/rdma/rdma/c/e1a0bdbdfdf084
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>