Skip to content

Commit

Permalink
RDMA/rxe: Enforce IBA C11-17
Browse files Browse the repository at this point in the history
Add a counter to keep track of the number of WQs connected to a CQ and
return an error if destroy_cq() is called while the counter is non zero.

Link: https://lore.kernel.org/r/20220421014042.26985-8-rpearsonhpe@gmail.com
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
  • Loading branch information
Bob Pearson authored and Jason Gunthorpe committed May 9, 2022
1 parent cde3f5d commit 4703b4f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/infiniband/sw/rxe/rxe_qp.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ int rxe_qp_from_init(struct rxe_dev *rxe, struct rxe_qp *qp, struct rxe_pd *pd,
qp->scq = scq;
qp->srq = srq;

atomic_inc(&rcq->num_wq);
atomic_inc(&scq->num_wq);

rxe_qp_init_misc(rxe, qp, init);

err = rxe_qp_init_req(rxe, qp, init, udata, uresp);
Expand All @@ -341,6 +344,9 @@ int rxe_qp_from_init(struct rxe_dev *rxe, struct rxe_qp *qp, struct rxe_pd *pd,
rxe_queue_cleanup(qp->sq.queue);
qp->sq.queue = NULL;
err1:
atomic_dec(&rcq->num_wq);
atomic_dec(&scq->num_wq);

qp->pd = NULL;
qp->rcq = NULL;
qp->scq = NULL;
Expand Down Expand Up @@ -798,10 +804,14 @@ static void rxe_qp_do_cleanup(struct work_struct *work)
if (qp->rq.queue)
rxe_queue_cleanup(qp->rq.queue);

atomic_dec(&qp->scq->num_wq);
if (qp->scq)
rxe_put(qp->scq);

atomic_dec(&qp->rcq->num_wq);
if (qp->rcq)
rxe_put(qp->rcq);

if (qp->pd)
rxe_put(qp->pd);

Expand Down
6 changes: 6 additions & 0 deletions drivers/infiniband/sw/rxe/rxe_verbs.c
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,12 @@ static int rxe_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)
{
struct rxe_cq *cq = to_rcq(ibcq);

/* See IBA C11-17: The CI shall return an error if this Verb is
* invoked while a Work Queue is still associated with the CQ.
*/
if (atomic_read(&cq->num_wq))
return -EINVAL;

rxe_cq_disable(cq);

rxe_put(cq);
Expand Down
1 change: 1 addition & 0 deletions drivers/infiniband/sw/rxe/rxe_verbs.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ struct rxe_cq {
bool is_dying;
bool is_user;
struct tasklet_struct comp_task;
atomic_t num_wq;
};

enum wqe_state {
Expand Down

0 comments on commit 4703b4f

Please sign in to comment.