]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
RDMA/mana_ib: create kernel-level CQs
authorKonstantin Taranov <kotaranov@microsoft.com>
Mon, 20 Jan 2025 17:27:10 +0000 (09:27 -0800)
committerLeon Romanovsky <leon@kernel.org>
Tue, 4 Feb 2025 13:27:03 +0000 (08:27 -0500)
Implement creation of CQs for the kernel.

Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>
Link: https://patch.msgid.link/1737394039-28772-5-git-send-email-kotaranov@linux.microsoft.com
Reviewed-by: Shiraz Saleem <shirazsaleem@microsoft.com>
Reviewed-by: Long Li <longli@microsoft.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
drivers/infiniband/hw/mana/cq.c

index f04a679d287144c3f531d60e110cf885c22902a8..d26d82d9f8ce6457d5d7e31882c2b4b5dad9cd93 100644 (file)
@@ -15,42 +15,57 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
        struct ib_device *ibdev = ibcq->device;
        struct mana_ib_create_cq ucmd = {};
        struct mana_ib_dev *mdev;
+       struct gdma_context *gc;
        bool is_rnic_cq;
        u32 doorbell;
+       u32 buf_size;
        int err;
 
        mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);
+       gc = mdev_to_gc(mdev);
 
        cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors;
        cq->cq_handle = INVALID_MANA_HANDLE;
 
-       if (udata->inlen < offsetof(struct mana_ib_create_cq, flags))
-               return -EINVAL;
+       if (udata) {
+               if (udata->inlen < offsetof(struct mana_ib_create_cq, flags))
+                       return -EINVAL;
 
-       err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), udata->inlen));
-       if (err) {
-               ibdev_dbg(ibdev,
-                         "Failed to copy from udata for create cq, %d\n", err);
-               return err;
-       }
+               err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), udata->inlen));
+               if (err) {
+                       ibdev_dbg(ibdev, "Failed to copy from udata for create cq, %d\n", err);
+                       return err;
+               }
 
-       is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
+               is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
 
-       if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) {
-               ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr->cqe);
-               return -EINVAL;
-       }
+               if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) {
+                       ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr->cqe);
+                       return -EINVAL;
+               }
 
-       cq->cqe = attr->cqe;
-       err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe * COMP_ENTRY_SIZE, &cq->queue);
-       if (err) {
-               ibdev_dbg(ibdev, "Failed to create queue for create cq, %d\n", err);
-               return err;
-       }
+               cq->cqe = attr->cqe;
+               err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe * COMP_ENTRY_SIZE,
+                                          &cq->queue);
+               if (err) {
+                       ibdev_dbg(ibdev, "Failed to create queue for create cq, %d\n", err);
+                       return err;
+               }
 
-       mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext,
-                                                 ibucontext);
-       doorbell = mana_ucontext->doorbell;
+               mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext,
+                                                         ibucontext);
+               doorbell = mana_ucontext->doorbell;
+       } else {
+               is_rnic_cq = true;
+               buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr->cqe * COMP_ENTRY_SIZE));
+               cq->cqe = buf_size / COMP_ENTRY_SIZE;
+               err = mana_ib_create_kernel_queue(mdev, buf_size, GDMA_CQ, &cq->queue);
+               if (err) {
+                       ibdev_dbg(ibdev, "Failed to create kernel queue for create cq, %d\n", err);
+                       return err;
+               }
+               doorbell = gc->mana_ib.doorbell;
+       }
 
        if (is_rnic_cq) {
                err = mana_ib_gd_create_cq(mdev, cq, doorbell);
@@ -66,11 +81,13 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                }
        }
 
-       resp.cqid = cq->queue.id;
-       err = ib_copy_to_udata(udata, &resp, min(sizeof(resp), udata->outlen));
-       if (err) {
-               ibdev_dbg(&mdev->ib_dev, "Failed to copy to udata, %d\n", err);
-               goto err_remove_cq_cb;
+       if (udata) {
+               resp.cqid = cq->queue.id;
+               err = ib_copy_to_udata(udata, &resp, min(sizeof(resp), udata->outlen));
+               if (err) {
+                       ibdev_dbg(&mdev->ib_dev, "Failed to copy to udata, %d\n", err);
+                       goto err_remove_cq_cb;
+               }
        }
 
        return 0;
@@ -122,7 +139,10 @@ int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)
                return -EINVAL;
        /* Create CQ table entry */
        WARN_ON(gc->cq_table[cq->queue.id]);
-       gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL);
+       if (cq->queue.kmem)
+               gdma_cq = cq->queue.kmem;
+       else
+               gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL);
        if (!gdma_cq)
                return -ENOMEM;
 
@@ -141,6 +161,10 @@ void mana_ib_remove_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)
        if (cq->queue.id >= gc->max_num_cqs || cq->queue.id == INVALID_QUEUE_ID)
                return;
 
+       if (cq->queue.kmem)
+       /* Then it will be cleaned and removed by the mana */
+               return;
+
        kfree(gc->cq_table[cq->queue.id]);
        gc->cq_table[cq->queue.id] = NULL;
 }