diff options
| author | Bob Pearson <rpearsonhpe@gmail.com> | 2023-04-04 23:26:09 -0500 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-04-17 16:01:44 -0300 |
| commit | 98e891b5e4d94ceb0844de3355c9218027426e72 (patch) | |
| tree | 5bafae6e1b5bed5f0359b1edae69630caf581019 /drivers/infiniband/sw/rxe/rxe_comp.c | |
| parent | f55efc2ed206eedfed08e1c8f8552f64fc3a11dd (diff) | |
| download | linux-98e891b5e4d94ceb0844de3355c9218027426e72.tar.gz linux-98e891b5e4d94ceb0844de3355c9218027426e72.tar.bz2 linux-98e891b5e4d94ceb0844de3355c9218027426e72.zip | |
RDMA/rxe: Remove qp->req.state
The rxe driver has four different QP state variables,
qp->attr.qp_state,
qp->req.state,
qp->comp.state, and
qp->resp.state.
All of these basically carry the same information.
This patch replaces uses of qp->req.state by qp->attr.qp_state and enum
rxe_qp_state. This is the third of three patches which will remove all
but the qp->attr.qp_state variable. This will bring the driver closer to
the IBA description.
Link: https://lore.kernel.org/r/20230405042611.6467-3-rpearsonhpe@gmail.com
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe_comp.c')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_comp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_comp.c b/drivers/infiniband/sw/rxe/rxe_comp.c index 173ebfe784e6..979990734e0c 100644 --- a/drivers/infiniband/sw/rxe/rxe_comp.c +++ b/drivers/infiniband/sw/rxe/rxe_comp.c @@ -491,12 +491,11 @@ static inline enum comp_state complete_ack(struct rxe_qp *qp, } } - if (unlikely(qp->req.state == QP_STATE_DRAIN)) { + if (unlikely(qp_state(qp) == IB_QPS_SQD)) { /* state_lock used by requester & completer */ spin_lock_bh(&qp->state_lock); - if ((qp->req.state == QP_STATE_DRAIN) && - (qp->comp.psn == qp->req.psn)) { - qp->req.state = QP_STATE_DRAINED; + if (qp->attr.sq_draining && qp->comp.psn == qp->req.psn) { + qp->attr.sq_draining = 0; spin_unlock_bh(&qp->state_lock); if (qp->ibqp.event_handler) { @@ -723,7 +722,7 @@ int rxe_completer(struct rxe_qp *qp) * (4) the timeout parameter is set */ if ((qp_type(qp) == IB_QPT_RC) && - (qp->req.state == QP_STATE_READY) && + (qp_state(qp) >= IB_QPS_RTS) && (psn_compare(qp->req.psn, qp->comp.psn) > 0) && qp->qp_timeout_jiffies) mod_timer(&qp->retrans_timer, |