Replace int num_qp in struct rxe_mcg by atomic_t qp_num.
Signed-off-by: Bob Pearson <rpearsonhpe@xxxxxxxxx>
---
drivers/infiniband/sw/rxe/rxe_mcast.c | 9 ++++-----
drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_mcast.c b/drivers/infiniband/sw/rxe/rxe_mcast.c
index 96dc11a892a4..2c6cb2eb5ac1 100644
--- a/drivers/infiniband/sw/rxe/rxe_mcast.c
+++ b/drivers/infiniband/sw/rxe/rxe_mcast.c
@@ -109,7 +109,8 @@ static int rxe_attach_mcg(struct rxe_dev *rxe, struct rxe_qp *qp,
}
/* check limits after checking if already attached */
- if (mcg->num_qp >= rxe->attr.max_mcast_qp_attach) {
+ if (atomic_inc_return(&mcg->qp_num) > rxe->attr.max_mcast_qp_attach) {
+ atomic_dec(&mcg->qp_num);
kfree(mca);
err = -ENOMEM;
goto out;
@@ -120,7 +121,6 @@ static int rxe_attach_mcg(struct rxe_dev *rxe, struct rxe_qp *qp,
mca->qp = qp;
atomic_inc(&qp->mcg_num);
- mcg->num_qp++;
list_add(&mca->qp_list, &mcg->qp_list);
err = 0;
@@ -178,8 +178,7 @@ static int rxe_detach_mcg(struct rxe_dev *rxe, struct rxe_qp *qp,
* object since we are still holding a ref
* from the get key above.
*/
- mcg->num_qp--;
- if (mcg->num_qp <= 0)
+ if (atomic_dec_return(&mcg->qp_num) <= 0)
__rxe_destroy_mcg(mcg);
atomic_dec(&qp->mcg_num);
@@ -218,7 +217,7 @@ int rxe_attach_mcast(struct ib_qp *ibqp, union ib_gid *mgid, u16 mlid)
err = rxe_attach_mcg(rxe, qp, mcg);
/* if we failed to attach the first qp to mcg tear it down */
- if (mcg->num_qp == 0)
+ if (atomic_read(&mcg->qp_num) == 0)
rxe_destroy_mcg(mcg);
rxe_drop_ref(mcg);
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h
index 1b0f40881895..3790163bb265 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.h
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.h
@@ -356,7 +356,7 @@ struct rxe_mcg {
struct rxe_dev *rxe;
struct list_head qp_list;
union ib_gid mgid;
- int num_qp;
+ atomic_t qp_num;
u32 qkey;
u16 pkey;
};
--
2.32.0
