Merge tag 'v5.18' into rdma.git for-next

[platform/kernel/linux-starfive.git] / drivers / infiniband / sw / rdmavt / qp.c

diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 8ef112f..3acab56 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -2775,7 +2775,7 @@ void rvt_qp_iter(struct rvt_dev_info *rdi,
 EXPORT_SYMBOL(rvt_qp_iter);
 
 /*
- * This should be called with s_lock held.
+ * This should be called with s_lock and r_lock held.
  */
 void rvt_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe,
                       enum ib_wc_status status)
@@ -3134,7 +3134,9 @@ send_comp:
        rvp->n_loop_pkts++;
 flush_send:
        sqp->s_rnr_retry = sqp->s_rnr_retry_cnt;
+       spin_lock(&sqp->r_lock);
        rvt_send_complete(sqp, wqe, send_status);
+       spin_unlock(&sqp->r_lock);
        if (local_ops) {
                atomic_dec(&sqp->local_ops_pending);
                local_ops = 0;
@@ -3188,7 +3190,9 @@ serr:
        spin_unlock_irqrestore(&qp->r_lock, flags);
 serr_no_r_lock:
        spin_lock_irqsave(&sqp->s_lock, flags);
+       spin_lock(&sqp->r_lock);
        rvt_send_complete(sqp, wqe, send_status);
+       spin_unlock(&sqp->r_lock);
        if (sqp->ibqp.qp_type == IB_QPT_RC) {
                int lastwqe;