RDMA/mana_ib: implement uapi for creation of rnic cq

Enable users to create RNIC CQs using a corresponding flag.
With the previous request size, an ethernet CQ is created.
As a response, return ID of the created CQ.

Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>
Link: https://lore.kernel.org/r/1714137160-5222-6-git-send-email-kotaranov@linux.microsoft.com
Reviewed-by: Long Li <longli@microsoft.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c
index 688ffe61f6b229343e894294cf05ff1189b82af6..c6a3fd57a1969f641ea4c39579e557744e3cb8b4 100644 (file)
--- a/drivers/infiniband/hw/mana/cq.c
+++ b/drivers/infiniband/hw/mana/cq.c
@@ -9,17 +9,22 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                      struct ib_udata *udata)
 {
        struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq);
+       struct mana_ib_create_cq_resp resp = {};
+       struct mana_ib_ucontext *mana_ucontext;
        struct ib_device *ibdev = ibcq->device;
        struct mana_ib_create_cq ucmd = {};
        struct mana_ib_dev *mdev;
+       bool is_rnic_cq;
+       u32 doorbell;
        int err;
 
        mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);
 
-       if (udata->inlen < sizeof(ucmd))
-               return -EINVAL;
-
        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;
 
        err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), udata->inlen));
        if (err) {
@@ -28,7 +33,9 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                return err;
        }
 
-       if (attr->cqe > mdev->adapter_caps.max_qp_wr) {
+       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;
        }
@@ -40,7 +47,41 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                return err;
        }
 
+       mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext,
+                                                 ibucontext);
+       doorbell = mana_ucontext->doorbell;
+
+       if (is_rnic_cq) {
+               err = mana_ib_gd_create_cq(mdev, cq, doorbell);
+               if (err) {
+                       ibdev_dbg(ibdev, "Failed to create RNIC cq, %d\n", err);
+                       goto err_destroy_queue;
+               }
+
+               err = mana_ib_install_cq_cb(mdev, cq);
+               if (err) {
+                       ibdev_dbg(ibdev, "Failed to install cq callback, %d\n", err);
+                       goto err_destroy_rnic_cq;
+               }
+       }
+
+       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;
+
+err_remove_cq_cb:
+       mana_ib_remove_cq_cb(mdev, cq);
+err_destroy_rnic_cq:
+       mana_ib_gd_destroy_cq(mdev, cq);
+err_destroy_queue:
+       mana_ib_destroy_queue(mdev, &cq->queue);
+
+       return err;
 }
 
 int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)
@@ -52,6 +93,12 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)
        mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);
 
        mana_ib_remove_cq_cb(mdev, cq);
+
+       /* Ignore return code as there is not much we can do about it.
+        * The error message is printed inside.
+        */
+       mana_ib_gd_destroy_cq(mdev, cq);
+
        mana_ib_destroy_queue(mdev, &cq->queue);
 
        return 0;

diff --git a/include/uapi/rdma/mana-abi.h b/include/uapi/rdma/mana-abi.h
index 5fcb31b37fb91acc12ad3686831bff23f86ad53a..2c41cc315218f8e3becd5541ffe7cb3e2733121e 100644 (file)
--- a/include/uapi/rdma/mana-abi.h
+++ b/include/uapi/rdma/mana-abi.h
@@ -16,8 +16,20 @@
 
 #define MANA_IB_UVERBS_ABI_VERSION 1
 
+enum mana_ib_create_cq_flags {
+       MANA_IB_CREATE_RNIC_CQ  = 1 << 0,
+};
+
 struct mana_ib_create_cq {
        __aligned_u64 buf_addr;
+       __u16   flags;
+       __u16   reserved0;
+       __u32   reserved1;
+};
+
+struct mana_ib_create_cq_resp {
+       __u32 cqid;
+       __u32 reserved;
 };
 
 struct mana_ib_create_qp {