RDMA/irdma: Take a lock before moving SRQ tail in poll_cq

Need to take an SRQ lock in poll_cq before moving SRQ tail.

Signed-off-by: Jay Bhat <jay.bhat@intel.com>
Reviewed-by: Jacob Moroni <jmoroni@google.com>
Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
Link: https://patch.msgid.link/20251031021726.1003-7-tatyana.e.nikolova@intel.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/irdma/uk.c b/drivers/infiniband/hw/irdma/uk.c
index a006e7365f4d535c67ceb4ea5e54e2d1303f656e..8a463b3d4c8382026ba2550377db2b66e2bab68c 100644 (file)
--- a/drivers/infiniband/hw/irdma/uk.c
+++ b/drivers/infiniband/hw/irdma/uk.c
@@ -1309,6 +1309,8 @@ int irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq,
        info->op_type = (u8)FIELD_GET(IRDMACQ_OP, qword3);
 
        if (info->q_type == IRDMA_CQE_QTYPE_RQ && is_srq) {
+               unsigned long flags;
+
                srq = qp->srq_uk;
 
                get_64bit_val(cqe, 8, &info->wr_id);
@@ -1321,8 +1323,11 @@ int irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq,
                } else {
                        info->stag_invalid_set = false;
                }
+               spin_lock_irqsave(srq->lock, flags);
                IRDMA_RING_MOVE_TAIL(srq->srq_ring);
+               spin_unlock_irqrestore(srq->lock, flags);
                pring = &srq->srq_ring;
+
        } else if (info->q_type == IRDMA_CQE_QTYPE_RQ && !is_srq) {
                u32 array_idx;
 

diff --git a/drivers/infiniband/hw/irdma/user.h b/drivers/infiniband/hw/irdma/user.h
index 6c29fa04e821793f7d7a1ca1e4e07b58ad73e842..3a27cce3c3dbcd97b2404c4a593dbaeb31982745 100644 (file)
--- a/drivers/infiniband/hw/irdma/user.h
+++ b/drivers/infiniband/hw/irdma/user.h
@@ -466,6 +466,7 @@ struct irdma_srq_uk {
        u8 wqe_size;
        u8 wqe_size_multiplier;
        u8 deferred_flag;
+       spinlock_t *lock;
 };
 
 struct irdma_srq_uk_init_info {

diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
index 7eff07a329e72f7258f84c66a8c65fe9922eb757..66ecaa0f5be609b9f35997df0267490fe55d412d 100644 (file)
--- a/drivers/infiniband/hw/irdma/verbs.c
+++ b/drivers/infiniband/hw/irdma/verbs.c
@@ -2388,6 +2388,7 @@ static int irdma_create_srq(struct ib_srq *ibsrq,
        info.vsi = &iwdev->vsi;
        info.pd = &iwpd->sc_pd;
 
+       iwsrq->sc_srq.srq_uk.lock = &iwsrq->lock;
        err_code = irdma_sc_srq_init(&iwsrq->sc_srq, &info);
        if (err_code)
                goto free_dmem;