Skip to content

Commit 4d809f6

Browse files
nielsdosjgunthorpe
authored andcommitted
IB/rdmavt: add lock to call to rvt_error_qp to prevent a race condition
The documentation of the function rvt_error_qp says both r_lock and s_lock need to be held when calling that function. It also asserts using lockdep that both of those locks are held. However, the commit I referenced in Fixes accidentally makes the call to rvt_error_qp in rvt_ruc_loopback no longer covered by r_lock. This results in the lockdep assertion failing and also possibly in a race condition. Fixes: d757c60 ("IB/rdmavt: Fix concurrency panics in QP post_send and modify to error") Link: https://lore.kernel.org/r/20220228165330.41546-1-dossche.niels@gmail.com Signed-off-by: Niels Dossche <dossche.niels@gmail.com> Acked-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent 107dd7b commit 4d809f6

File tree

1 file changed

+5
-1
lines changed
  • drivers/infiniband/sw/rdmavt

1 file changed

+5
-1
lines changed

drivers/infiniband/sw/rdmavt/qp.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3190,7 +3190,11 @@ void rvt_ruc_loopback(struct rvt_qp *sqp)
31903190
spin_lock_irqsave(&sqp->s_lock, flags);
31913191
rvt_send_complete(sqp, wqe, send_status);
31923192
if (sqp->ibqp.qp_type == IB_QPT_RC) {
3193-
int lastwqe = rvt_error_qp(sqp, IB_WC_WR_FLUSH_ERR);
3193+
int lastwqe;
3194+
3195+
spin_lock(&sqp->r_lock);
3196+
lastwqe = rvt_error_qp(sqp, IB_WC_WR_FLUSH_ERR);
3197+
spin_unlock(&sqp->r_lock);
31943198

31953199
sqp->s_flags &= ~RVT_S_BUSY;
31963200
spin_unlock_irqrestore(&sqp->s_lock, flags);

0 commit comments

Comments
 (0)