RDMA/mana: Provide a modern CQ creation interface
Subsystems (2)
PATCH v2 1/1 RDMA/mana: Provide a modern CQ creation interface
From: Konstantin Taranov <[email protected]>
The uverbs CQ creation UAPI allows users to supply their own umem for a CQ. Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend mana_ib_create_queue() to return the umem to the caller and do not allocate umem if it was allocted by the caller.
---
v2: It is a rework of the patch proposed by Leon
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++---------- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)
drivers/infiniband/hw/mana/cq.c +81 -44
@@ -8,12 +8,8 @@int mana_ib_create_cq (struct ib_cq *ibcq,const struct ib_cq_init_attr *attr,struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_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;
@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -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; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ; -if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) || - attr->cqe >U32_MAX /COMP_ENTRY_SIZE ) { -ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); -return -EINVAL ; - } + 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 = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe *COMP_ENTRY_SIZE , - &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { -ibdev_dbg (ibdev,"Failed to create queue for create cq, %d\n" , err); -return err; +ibdev_dbg (ibdev,"Failed to create RNIC cq, %d\n" , err); + goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext, - ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) { -ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); -return -EINVAL ; - } - 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); + err =mana_ib_install_cq_cb (mdev, cq);if (err) { -ibdev_dbg (ibdev,"Failed to create kernel queue for create cq, %d\n" , err); -return err; +ibdev_dbg (ibdev,"Failed to install cq callback, %d\n" , err); + goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ; + +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_create_user_cq (struct ib_cq *ibcq,const struct ib_cq_init_attr *attr, +struct uverbs_attr_bundle *attrs) +{ + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); +struct ib_udata *udata = &attrs->driver_udata; +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); + + cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; + cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +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; + } + +if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) || + attr->cqe >U32_MAX /COMP_ENTRY_SIZE ) +return -EINVAL ; + + cq->cqe = attr->cqe; + err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe *COMP_ENTRY_SIZE , + &cq->queue, &ibcq->umem); +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; +if (is_rnic_cq) { err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) {
@@ -82,13 +121,11 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, } } -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; - } + 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; }spin_lock_init (&cq->cq_lock);
drivers/infiniband/hw/mana/device.c +1 -0
@@ -21,6 +21,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .alloc_ucontext = mana_ib_alloc_ucontext, .create_ah = mana_ib_create_ah, .create_cq = mana_ib_create_cq, + .create_user_cq = mana_ib_create_user_cq, .create_qp = mana_ib_create_qp, .create_rwq_ind_table = mana_ib_create_rwq_ind_table, .create_wq = mana_ib_create_wq,
drivers/infiniband/hw/mana/main.c +21 -9
@@ -262,33 +262,45 @@ int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu }int mana_ib_create_queue (struct mana_ib_dev *mdev,u64 addr,u32 size, -struct mana_ib_queue *queue) +struct mana_ib_queue *queue,struct ib_umem **umem) { -struct ib_umem *umem;int err; queue->umem =NULL ; queue->id =INVALID_QUEUE_ID ; queue->gdma_region =GDMA_INVALID_DMA_REGION ; - umem =ib_umem_get (&mdev->ib_dev, addr, size,IB_ACCESS_LOCAL_WRITE ); -if (IS_ERR (umem)) { -ibdev_dbg (&mdev->ib_dev,"Failed to get umem, %pe\n" , umem); -return PTR_ERR (umem); +if (umem) + queue->umem = *umem; + +if (!queue->umem) { +/* if umem is not provided, allocate it */ + queue->umem =ib_umem_get (&mdev->ib_dev, addr, size,IB_ACCESS_LOCAL_WRITE ); +if (IS_ERR (queue->umem)) { +ibdev_dbg (&mdev->ib_dev,"Failed to get umem, %pe\n" , queue->umem); +return PTR_ERR (queue->umem); + } } - err =mana_ib_create_zero_offset_dma_region (mdev, umem, &queue->gdma_region); + err =mana_ib_create_zero_offset_dma_region (mdev, queue->umem, &queue->gdma_region);if (err) {ibdev_dbg (&mdev->ib_dev,"Failed to create dma region, %d\n" , err); goto free_umem; } - queue->umem = umem;ibdev_dbg (&mdev->ib_dev,"created dma region 0x%llx\n" , queue->gdma_region); +if (umem) { +/* Give ownership of umem to the caller */ + *umem = queue->umem; + queue->umem =NULL ; + } +return 0 ; free_umem: -ib_umem_release (umem); +if (!umem || !(*umem)) +/* deallocate mana's umem */ +ib_umem_release (queue->umem);return err; }
drivers/infiniband/hw/mana/mana_ib.h +3 -2
@@ -625,7 +625,7 @@ int mana_ib_gd_destroy_dma_region(struct mana_ib_dev *dev,int mana_ib_create_kernel_queue (struct mana_ib_dev *mdev,u32 size,enum gdma_queue_type type,struct mana_ib_queue *queue);int mana_ib_create_queue (struct mana_ib_dev *mdev,u64 addr,u32 size, -struct mana_ib_queue *queue); +struct mana_ib_queue *queue,struct ib_umem **umem);void mana_ib_destroy_queue (struct mana_ib_dev *mdev,struct mana_ib_queue *queue); struct ib_wq *mana_ib_create_wq(struct ib_pd *pd,
@@ -667,7 +667,8 @@ void mana_ib_uncfg_vport(struct mana_ib_dev *dev, struct mana_ib_pd *pd,int mana_ib_create_cq (struct ib_cq *ibcq,const struct ib_cq_init_attr *attr,struct uverbs_attr_bundle *attrs); - +int mana_ib_create_user_cq (struct ib_cq *ibcq,const struct ib_cq_init_attr *attr, +struct uverbs_attr_bundle *attrs);int mana_ib_destroy_cq (struct ib_cq *ibcq,struct ib_udata *udata);int mana_ib_alloc_pd (struct ib_pd *ibpd,struct ib_udata *udata);
drivers/infiniband/hw/mana/qp.c +3 -2
@@ -325,7 +325,8 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd,ibdev_dbg (&mdev->ib_dev,"ucmd sq_buf_addr 0x%llx port %u\n" , ucmd.sq_buf_addr, ucmd.port); - err =mana_ib_create_queue (mdev, ucmd.sq_buf_addr, ucmd.sq_buf_size, &qp->raw_sq); + err =mana_ib_create_queue (mdev, ucmd.sq_buf_addr, ucmd.sq_buf_size, + &qp->raw_sq,NULL );if (err) {ibdev_dbg (&mdev->ib_dev,"Failed to create queue for create qp-raw, err %d\n" , err);
@@ -555,7 +556,7 @@ static int mana_ib_create_rc_qp(struct ib_qp *ibqp, struct ib_pd *ibpd,continue ; } err =mana_ib_create_queue (mdev, ucmd.queue_buf[j], ucmd.queue_size[j], - &qp->rc_qp.queues[i]); + &qp->rc_qp.queues[i],NULL );if (err) {ibdev_err (&mdev->ib_dev,"Failed to create queue %d, err %d\n" , i, err); goto destroy_queues;
drivers/infiniband/hw/mana/wq.c +2 -1
@@ -31,7 +31,8 @@ struct ib_wq *mana_ib_create_wq(struct ib_pd *pd,ibdev_dbg (&mdev->ib_dev,"ucmd wq_buf_addr 0x%llx\n" , ucmd.wq_buf_addr); - err =mana_ib_create_queue (mdev, ucmd.wq_buf_addr, ucmd.wq_buf_size, &wq->queue); + err =mana_ib_create_queue (mdev, ucmd.wq_buf_addr, ucmd.wq_buf_size, + &wq->queue,NULL );if (err) {ibdev_dbg (&mdev->ib_dev,"Failed to create queue for create wq, %d\n" , err);
Signature · 1 line
2.43.0
Quoted 6 lines · Konstantin Taranov
From: Konstantin Taranov <[email protected]>
The uverbs CQ creation UAPI allows users to supply their own umem for a CQ. Update mana to support this workflow while preserving support for creating umem through the legacy interface.
Quoted 7 lines
To support RDMA objects that own umem, extend
mana_ib_create_queue()to return the umem to the caller and do not allocate umem if it was allocted by the caller.Signed-off-by Konstantin Taranov <[email protected]>---
v2: It is a rework of the patch proposed by Leon
I am curious to know what changes were introduced?
Quoted 30 lines
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++---------- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)drivers/infiniband/hw/mana/cq.c +0
-5@@ -8,12 +8,8 @@int mana_ib_create_cq (struct ib_cq *ibcq,const struct ib_cq_init_attr *attr,struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -if (udata) {
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 26
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +2
-8-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; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;
We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
Quoted 163 lines
drivers/infiniband/hw/mana/cq.c +79
-31-if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) || - attr->cqe >U32_MAX /COMP_ENTRY_SIZE ) { -ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); -return -EINVAL ; - } + 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 = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe *COMP_ENTRY_SIZE , - &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { -ibdev_dbg (ibdev,"Failed to create queue for create cq, %d\n" , err); -return err; +ibdev_dbg (ibdev,"Failed to create RNIC cq, %d\n" , err); + goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext, - ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) { -ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); -return -EINVAL ; - } - 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); + err =mana_ib_install_cq_cb (mdev, cq);if (err) { -ibdev_dbg (ibdev,"Failed to create kernel queue for create cq, %d\n" , err); -return err; +ibdev_dbg (ibdev,"Failed to install cq callback, %d\n" , err); + goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ; + +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_create_user_cq (struct ib_cq *ibcq,const struct ib_cq_init_attr *attr, +struct uverbs_attr_bundle *attrs) +{ + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); +struct ib_udata *udata = &attrs->driver_udata; +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); + + cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; + cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +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; + } + +if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) || + attr->cqe >U32_MAX /COMP_ENTRY_SIZE ) +return -EINVAL ; + + cq->cqe = attr->cqe; + err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe *COMP_ENTRY_SIZE , + &cq->queue, &ibcq->umem); +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; +if (is_rnic_cq) { err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) {@@ -82,13 +121,11 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, } } -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; - } + 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; }spin_lock_init (&cq->cq_lock);drivers/infiniband/hw/mana/device.c +1
-0@@ -21,6 +21,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .alloc_ucontext = mana_ib_alloc_ucontext, .create_ah = mana_ib_create_ah, .create_cq = mana_ib_create_cq, + .create_user_cq = mana_ib_create_user_cq, .create_qp = mana_ib_create_qp, .create_rwq_ind_table = mana_ib_create_rwq_ind_table, .create_wq = mana_ib_create_wq,drivers/infiniband/hw/mana/main.c +1
-6@@ -262,33 +262,45 @@ int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu }int mana_ib_create_queue (struct mana_ib_dev *mdev,u64 addr,u32 size, -struct mana_ib_queue *queue) +struct mana_ib_queue *queue,struct ib_umem **umem) { -struct ib_umem *umem;int err; queue->umem =NULL ; queue->id =INVALID_QUEUE_ID ; queue->gdma_region =GDMA_INVALID_DMA_REGION ; - umem =ib_umem_get (&mdev->ib_dev, addr, size,IB_ACCESS_LOCAL_WRITE ); -if (IS_ERR (umem)) { -ibdev_dbg (&mdev->ib_dev,"Failed to get umem, %pe\n" , umem); -return PTR_ERR (umem);
drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu · line 282
Quoted 10 lines
drivers/infiniband/hw/mana/main.c +10
-0+if (umem) + queue->umem = *umem; + +if (!queue->umem) { +/* if umem is not provided, allocate it */ + queue->umem =ib_umem_get (&mdev->ib_dev, addr, size,IB_ACCESS_LOCAL_WRITE ); +if (IS_ERR (queue->umem)) { +ibdev_dbg (&mdev->ib_dev,"Failed to get umem, %pe\n" , queue->umem); +return PTR_ERR (queue->umem); + }
I moved this hunk to the callers on purpose. The idea is to call to ib_umem_get() as early as possible.
Quoted 14 lines
drivers/infiniband/hw/mana/main.c +3
-2} - err =mana_ib_create_zero_offset_dma_region (mdev, umem, &queue->gdma_region); + err =mana_ib_create_zero_offset_dma_region (mdev, queue->umem, &queue->gdma_region);if (err) {ibdev_dbg (&mdev->ib_dev,"Failed to create dma region, %d\n" , err); goto free_umem; } - queue->umem = umem;ibdev_dbg (&mdev->ib_dev,"created dma region 0x%llx\n" , queue->gdma_region); +if (umem) { +/* Give ownership of umem to the caller */
drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu · line 303
Quoted 10 lines
drivers/infiniband/hw/mana/main.c +7
-1+ *umem = queue->umem; + queue->umem =NULL ; + } +return 0 ; free_umem: -ib_umem_release (umem); +if (!umem || !(*umem)) +/* deallocate mana's umem */ +ib_umem_release (queue->umem);
This is another reason why ib_umem_get() shouldn't be buried in the driver's internals. IB/core is responsible to release it.
Thanks
Konstantin Taranov
maintainerQuoted 8 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()
Quoted 8 lines
Quoted 6 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by Konstantin Taranov <[email protected]>---
v2: It is a rework of the patch proposed by LeonI am curious to know what changes were introduced?
It is like your patch, but I kept get_umem in mana_ib_create_queue and introduced ownership. It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of the umem. With new mana_ib_create_queue() it is clear from the caller what happens and no special changes in the caller required.
Quoted 40 lines
Quoted 14 lines
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++---------- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a100644drivers/infiniband/hw/mana/cq.c line 8
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr*attr,
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +0
-4struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct
ib_cq_init_attr*attr,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +0
-5cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -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));drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const · line 35
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq, %d\n", err);
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 26
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 201 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr->cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size, GDMA_CQ,
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue for createcq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq, %d\n",err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c
Quoted 12 lines
drivers/infiniband/hw/mana/cq.c +0
-5- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) { - ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernel queue forcreate cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback, %d\n",err);
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ;drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+ +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_create_user_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,Quoted 23 lines
drivers/infiniband/hw/mana/cq.c +22
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); +struct ib_udata *udata = &attrs->driver_udata; +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); + + cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; + cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), udata-inlen));
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +9
-0+return err; + } + +if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) || + attr->cqe >U32_MAX /COMP_ENTRY_SIZE ) +return -EINVAL ; + + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe *
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +3
-0+ &cq->queue, &ibcq->umem); +if (err) { + ibdev_dbg(ibdev, "Failed to create queue for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+return err; + } + + mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c +3
-0+ ibucontext); + doorbell = mana_ucontext->doorbell; +if (is_rnic_cq) { err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) {@@ -82,13 +121,11 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct
ib_cq_init_attr*attr,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +0
-3} } -if (udata) { - resp.cqid = cq->queue.id; - err = ib_copy_to_udata(udata, &resp, min(sizeof(resp),
udata->outlen));drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const · line 89
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(&mdev->ib_dev, "Failed to copy to udata,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c +4
-2- goto err_remove_cq_cb; - } + 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);
drivers/infiniband/hw/mana/device.c static const struct ib_device_ops mana_ib_dev_ops =
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +1
-0+ goto err_remove_cq_cb; }drivers/infiniband/hw/mana/cq.c +0
-0spin_lock_init (&cq->cq_lock);drivers/infiniband/hw/mana/device.c +0
-0@@ -21,6 +21,7 @@ static const struct ib_device_ops mana_ib_dev_ops ={
Quoted 13 lines
drivers/infiniband/hw/mana/device.c +1
-0.alloc_ucontext = mana_ib_alloc_ucontext, .create_ah = mana_ib_create_ah, .create_cq = mana_ib_create_cq, + .create_user_cq = mana_ib_create_user_cq, .create_qp = mana_ib_create_qp, .create_rwq_ind_table = mana_ib_create_rwq_ind_table, .create_wq = mana_ib_create_wq,drivers/infiniband/hw/mana/main.c +0
-0drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct · line 265
Quoted 5 lines
drivers/infiniband/hw/mana/main.c +1
-1@@ -262,33 +262,45 @@ int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu } int mana_ib_create_queue(struct mana_ib_dev *mdev, u64 addr, u32 size, -struct mana_ib_queue *queue) + struct mana_ib_queue *queue, struct ib_umem**umem)
drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu
Quoted 9 lines
drivers/infiniband/hw/mana/main.c +0
-2{ -struct ib_umem *umem;int err; queue->umem =NULL ; queue->id =INVALID_QUEUE_ID ; queue->gdma_region =GDMA_INVALID_DMA_REGION ; - umem = ib_umem_get(&mdev->ib_dev, addr, size,
IB_ACCESS_LOCAL_WRITE);drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct · line 276
Quoted 2 lines
drivers/infiniband/hw/mana/main.c +0
-2-if (IS_ERR (umem)) { - ibdev_dbg(&mdev->ib_dev, "Failed to get umem, %pe\n",umem);
drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu
Quoted 7 lines
drivers/infiniband/hw/mana/main.c +6
-1-return PTR_ERR (umem); +if (umem) + queue->umem = *umem; + +if (!queue->umem) { +/* if umem is not provided, allocate it */ + queue->umem = ib_umem_get(&mdev->ib_dev, addr, size,
IB_ACCESS_LOCAL_WRITE);
Quoted 8 lines
drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct · line 280
Quoted 2 lines
drivers/infiniband/hw/mana/main.c +2
-0+if (IS_ERR (queue->umem)) { + ibdev_dbg(&mdev->ib_dev, "Failed to get umem,%pe\n",
queue->umem);drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct · line 282
Quoted 2 lines
drivers/infiniband/hw/mana/main.c +2
-0+return PTR_ERR (queue->umem); + }I moved this hunk to the callers on purpose. The idea is to call to
ib_umem_get()as early as possible.
Fundamentally, it is called at the same moment as in your proposal, but it is packed in a handy helper we already used before. Instead of adding boiler plate code around every call of mana_ib_create_queue() I just integrated the logic you wanted inside. It also helped to solve the double free bug in your patch as the ownership was not clearly defined and ib/core and mana both had umem pointer that they wanted to clean.
Quoted 18 lines
drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct · line 280
Quoted 4 lines
drivers/infiniband/hw/mana/main.c +0
-1} - err = mana_ib_create_zero_offset_dma_region(mdev, umem,
&queue->gdma_region);drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct · line 289
Quoted 5 lines
drivers/infiniband/hw/mana/main.c +2
-0+ err =mana_ib_create_zero_offset_dma_region (mdev, queue- umem, +&queue->gdma_region);if (err) { ibdev_dbg(&mdev->ib_dev, "Failed to create dma region,%d\n", err);
Quoted 7 lines
drivers/infiniband/hw/mana/main.c +0
-1goto free_umem; } - queue->umem = umem;ibdev_dbg (&mdev->ib_dev,"created dma region 0x%llx\n" , queue->gdma_region);
Quoted 15 lines
drivers/infiniband/hw/mana/main.c int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu · line 303
Quoted 12 lines
drivers/infiniband/hw/mana/main.c +9
-1+if (umem) { +/* Give ownership of umem to the caller */ + *umem = queue->umem; + queue->umem =NULL ; + } +return 0 ; free_umem: -ib_umem_release (umem); +if (!umem || !(*umem)) +/* deallocate mana's umem */ +ib_umem_release (queue->umem);This is another reason why
ib_umem_get()shouldn't be buried in the driver's internals. IB/core is responsible to release it.
It is released by IB/core, if the helper is called with &umem and the helper succeeds. This release is for an error case when mana creates umem and it should clean as it created it. I think the rule is if function fails it should be side-effect free, that is what achieved in this helper. I can make the helper more verbose and employ extra variables to clearly show that mana cleans it only when it allocates it.
Quoted 2 lines
Thanks
Konstantin Taranov
maintainerQuoted 192 lines
Quoted 8 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()Quoted 8 lines
Quoted 6 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by Konstantin Taranov <[email protected]>---
v2: It is a rework of the patch proposed by LeonI am curious to know what changes were introduced?
It is like your patch, but I kept
get_umeminmana_ib_create_queueand introduced ownership.
It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of the umem. With newmana_ib_create_queue()it is clear from the caller what happens and no special changes in the caller required.Quoted 41 lines
Quoted 15 lines
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++---------- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a100644drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structQuoted 1 line
ib_cq_init_attr*attr,
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +0
-4struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct
ib_cq_init_attr*attr,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +0
-5cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -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));drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const · line 35
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq, %d\n", err);
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 26
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 115 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr->cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size, GDMA_CQ,
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue for createcq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq, %d\n",err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c
Quoted 12 lines
drivers/infiniband/hw/mana/cq.c +0
-5- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) { - ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernel queue forcreate cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback, %d\n",err);
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ;drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+ +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_create_user_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,Quoted 23 lines
drivers/infiniband/hw/mana/cq.c +22
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); +struct ib_udata *udata = &attrs->driver_udata; +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); + + cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; + cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), udata-inlen));
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +9
-0+return err; + } + +if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) || + attr->cqe >U32_MAX /COMP_ENTRY_SIZE ) +return -EINVAL ; + + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe *
COMP_ENTRY_SIZE,
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 100
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +1
-0+ &cq->queue, &ibcq->umem);
I just realized that I forgot to handle the case when ibcq->umem == NULL and mana fails later after this call. I need to clean ibcq->umem in this case. I will address that in v3. I am sorry.
- Konstantin
Konstantin Taranov
maintainerQuoted 194 lines
Quoted 194 lines
Quoted 8 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()Quoted 8 lines
Quoted 6 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by Konstantin Taranov <[email protected]>---
v2: It is a rework of the patch proposed by LeonI am curious to know what changes were introduced?
It is like your patch, but I kept
get_umeminmana_ib_create_queueand introduced ownership.
It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of the umem. With newmana_ib_create_queue()it is clear from the caller what happens and no special changes in the caller required.Quoted 43 lines
Quoted 16 lines
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++---------- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a100644drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structQuoted 1 line
ib_cq_init_attr*attr,
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +0
-4struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq,Quoted 1 line
const
struct
ib_cq_init_attr*attr,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +0
-5cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -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));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq, %d\n", err);
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 26
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 115 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr->cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size, GDMA_CQ,
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue for createcq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq, %d\n",err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c
Quoted 12 lines
drivers/infiniband/hw/mana/cq.c +0
-5- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) { - ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernel queue forcreate cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback, %d\n",err);
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ;drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+ +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_create_user_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,Quoted 23 lines
drivers/infiniband/hw/mana/cq.c +22
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); +struct ib_udata *udata = &attrs->driver_udata; +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); + + cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; + cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), udata-inlen));
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +9
-0+return err; + } + +if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) || + attr->cqe >U32_MAX /COMP_ENTRY_SIZE ) +return -EINVAL ; + + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe *
COMP_ENTRY_SIZE,
Quoted 6 lines
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 100
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +1
-0+ &cq->queue, &ibcq->umem);I just realized that I forgot to handle the case when
ibcq->umem== NULL and mana fails later after this call. I need to cleanibcq->umemin this case. I will address that in v3. I am sorry.
Hi Leon,
After re-reading the code, I see that there is no bug in v2 as the umem gets deallocated on failure inside the handler of UVERBS_METHOD_CQ_CREATE. I also see that you also had the same logic in v1. So, what is your recommendation? Leave v2 logic as is, so mana would immediately give ownership of umem to cq->umem, and if mana_ib_create_user_cq() fails at later stage it should not clean cq->umem and leave it to the caller handle (i.e., UVERBS_METHOD_CQ_CREATE) to clean cq->umem regardless of who created it.
Or should I make v3, where I will assign umem to cq->umem right before return 0, so that if mana_ib_create_user_cq() fails it does not change cq->umem at all.
Quoted 2 lines
- Konstantin
Quoted 209 lines · Konstantin Taranov
Quoted 194 lines
Quoted 194 lines
Quoted 8 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()Quoted 8 lines
Quoted 6 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by Konstantin Taranov <[email protected]>---
v2: It is a rework of the patch proposed by LeonI am curious to know what changes were introduced?
It is like your patch, but I kept
get_umeminmana_ib_create_queueand introduced ownership.
It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of the umem. With newmana_ib_create_queue()it is clear from the caller what happens and no special changes in the caller required.Quoted 43 lines
Quoted 16 lines
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++---------- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a100644drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structQuoted 1 line
ib_cq_init_attr*attr,
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +0
-4struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq,Quoted 1 line
const
struct
ib_cq_init_attr*attr,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +0
-5cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -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));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq, %d\n", err);
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 26
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 115 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr->cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size, GDMA_CQ,
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue for createcq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq, %d\n",err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c
Quoted 12 lines
drivers/infiniband/hw/mana/cq.c +0
-5- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) { - ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernel queue forcreate cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback, %d\n",err);
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ;drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+ +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_create_user_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,Quoted 23 lines
drivers/infiniband/hw/mana/cq.c +22
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); +struct ib_udata *udata = &attrs->driver_udata; +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); + + cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; + cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), udata-inlen));
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +9
-0+return err; + } + +if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) || + attr->cqe >U32_MAX /COMP_ENTRY_SIZE ) +return -EINVAL ; + + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe *
COMP_ENTRY_SIZE,Quoted 6 lines
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 100
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +1
-0+ &cq->queue, &ibcq->umem);I just realized that I forgot to handle the case when
ibcq->umem== NULL and mana fails later after this call. I need to cleanibcq->umemin this case. I will address that in v3. I am sorry.Hi Leon,
After re-reading the code, I see that there is no bug in v2 as the umem gets deallocated on failure inside the handler ofUVERBS_METHOD_CQ_CREATE. I also see that you also had the same logic in v1. So, what is your recommendation? Leave v2 logic as is, so mana would immediately give ownership of umem tocq->umem, and ifmana_ib_create_user_cq()fails at later stage it should not cleancq->umemand leave it to the caller handle (i.e.,UVERBS_METHOD_CQ_CREATE) to cleancq->umemregardless of who created it.
Quoted 2 lines
Or should I make v3, where I will assign umem to
cq->umemright before return 0, so that ifmana_ib_create_user_cq()fails it does not changecq->umemat all.
My suggestion is to stick with my original patch and remove ib_umem_release(queue->umem) from mana_ib_destroy_queue().
Thanks
Quoted 5 lines
Quoted 3 lines
- Konstantin
Konstantin Taranov
maintainerQuoted 239 lines · Konstantin Taranov
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 8 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()Quoted 8 lines
Quoted 6 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by Konstantin Taranov <[email protected]>---
v2: It is a rework of the patch proposed by LeonI am curious to know what changes were introduced?
It is like your patch, but I kept
get_umeminmana_ib_create_queueand introduced ownership.
It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of the umem. With newmana_ib_create_queue()it is clear from the caller what happens and no special changes in the caller required.Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++----------
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 14 lines
drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a100644drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structQuoted 1 line
ib_cq_init_attr*attr,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-1struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_udata; struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +0
-3-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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq,const
struct
ib_cq_init_attr*attr,Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +0
-2cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -if (udata) { - if (udata->inlen < offsetof(struct mana_ib_create_cq,flags))
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - - err = ib_copy_from_udata(&ucmd, udata,min(sizeof(ucmd),
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
udata->inlen));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udatafor
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 8 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 26
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 2 lines
Quoted 2 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue forcreate
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
+cq,
%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr,
cq->cqeQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue forcreate
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq,%d\n",
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata,struct
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-4- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ){
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +0
-1- ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size =MANA_PAGE_ALIGN(roundup_pow_of_two(attr-
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernelqueue for
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback,%d\n",
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
err);
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ;drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+ +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_create_user_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +5
-0+struct ib_udata *udata = &attrs->driver_udata; +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 = {};Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +8
-0+struct mana_ib_dev *mdev; +bool is_rnic_cq; +u32 doorbell; +int err; + + mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + + cq->comp_vector = attr->comp_vector % ibdev-
num_comp_vectors;Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +8
-0+ cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), +udata-inlen));
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq,
Quoted 11 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
%d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+return err; + } + + if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +5
-0+ attr->cqe > U32_MAX / COMP_ENTRY_SIZE) +return -EINVAL ; + + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe*
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, · line 100
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +1
-0+ &cq->queue, &ibcq->umem);I just realized that I forgot to handle the case when
ibcq->umem== NULL and mana fails later after this call. I need to cleanibcq->umeminthis case.
Quoted 10 lines
Quoted 2 lines
I will address that in v3. I am sorry.
Hi Leon,
After re-reading the code, I see that there is no bug in v2 as the umem gets deallocated on failure inside the handler ofUVERBS_METHOD_CQ_CREATE. I also see that you also had the same logic in v1. So, what is your recommendation? Leave v2 logic as is, so mana would immediately give ownership of umem tocq->umem, and ifmana_ib_create_user_cq()fails at later stage it should not cleancq->umemand leave it to the caller handle (i.e.,
UVERBS_METHOD_CQ_CREATE) to cleancq->umemregardless of who created it.Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Or should I make v3, where I will assign umem to
cq->umemright before return 0, so that ifmana_ib_create_user_cq()fails it does not changecq->umemat all.My suggestion is to stick with my original patch and remove
ib_umem_release(queue->umem)frommana_ib_destroy_queue().
Unfortunately, this will break the code and will require more boilerplate workarounds. MANA still needs to allocate umem for many objects. I see that we can generalize for CQs, but mana RC QPs use 4 queues at the moment, and I am preparing a patch to have 5th queue for BIND WQEs for RC. Our UC QP will use 3 queues. Having a nice entity as mana queue allows us to have clean code and do not have extra complex conditions to detect whether a mana queue has an umem and the cleanup of mana queue handles that.
My proposal is to keep the nice property of mana queues and just extend the mana_ib_create_queue() to satisfy your requirements without adding burden of special handling umems. As I understand the new API requirement is that umem for a CQ should be owned by the ib core, and that is what the helper
achieves: the umem pointer is not stored and assigned to cq->umem directly. The only open question I have is what the requirement for writing an umem to cq->umem is. In your patch, I see that you mutate cq->umem even if mana_ib_create_user_cq() fails. Is it the behavior you need/want/allow and will it be enforced in other IB objects that have one umem (e.g., WQs, SRQs)?
As it seems to be allowed in the UVERBS_METHOD_CQ_CREATE code:
if (ib_dev->ops.create_user_cq) ret = ib_dev->ops.create_user_cq(cq, &attr, attrs); else ret = ib_dev->ops.create_cq(cq, &attr, attrs); if (ret) goto err_free; ... err_free: ib_umem_release(cq->umem);
If it is not expected, you might enforce it by adding WARN_ON(cq->umem != umem); before ib_umem_release() And I am happy to adjust mana code to satisfy this behavior.
here I am just trying to get a win-win situation where we both can be happy about the code. I looked at
your proposal and removing ib_umem_release from mana destroy queue will just add it after mana_ib_destroy_queue() in all code paths except the CQ. As well as we would need to add code to handle failures of ib_umem_get, so keeping it in the helper removes the need to have that. Instead, I would like to make the helper to handle the cases when umem is created by upper stack or is not created but want to be owned by the upper stack. What is more, I would like the helper be general enough to be used for other ib core objects and that is why I would like to know the model so I adjust the helper accordingly.
Thanks
Konstantin
Quoted 8 lines
Thanks
Quoted 5 lines
Quoted 3 lines
- Konstantin
Konstantin Taranov
maintainerQuoted 284 lines
Quoted 27 lines · Konstantin Taranov
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 8 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()Quoted 8 lines
Quoted 6 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by Konstantin Taranov <[email protected]>---
v2: It is a rework of the patch proposed by LeonI am curious to know what changes were introduced?
It is like your patch, but I kept
get_umeminmana_ib_create_queueand introduced ownership.
It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of the umem. With newmana_ib_create_queue()it is clear from the caller what happens and no special changes in the caller required.Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++------
Quoted 192 lines
----
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 14 lines
drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a100644drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structQuoted 1 line
ib_cq_init_attr*attr,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-1struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_udata; struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 22
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +0
-3-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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct
ib_cq_init_attr*attr,Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 31
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +0
-2cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -if (udata) { - if (udata->inlen < offsetof(struct mana_ib_create_cq,flags))
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 34
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - - err = ib_copy_from_udata(&ucmd, udata,min(sizeof(ucmd),
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
udata->inlen));drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 36
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udatafor
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 8 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 27
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 2 lines
Quoted 2 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue forcreate
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
+cq,
%d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr,
cq->cqeQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue forcreate
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq,%d\n",
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
err);
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata,struct
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-4- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ){
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +0
-1- ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size =MANA_PAGE_ALIGN(roundup_pow_of_two(attr-
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernelqueue for
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback,%d\n",
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
err);
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ;drivers/infiniband/hw/mana/cq.c
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+ +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_create_user_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +5
-0+struct ib_udata *udata = &attrs->driver_udata; +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 = {};Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +8
-0+struct mana_ib_dev *mdev; +bool is_rnic_cq; +u32 doorbell; +int err; + + mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + + cq->comp_vector = attr->comp_vector % ibdev-
num_comp_vectors;Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +8
-0+ cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), +udata-inlen));
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq,
Quoted 11 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
%d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+return err; + } + + if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +5
-0+ attr->cqe > U32_MAX / COMP_ENTRY_SIZE) +return -EINVAL ; + + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe*
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +1
-0+ &cq->queue, &ibcq->umem);I just realized that I forgot to handle the case when
ibcq->umem== NULL and mana fails later after this call. I need to cleanibcq->umeminthis case.
Quoted 7 lines
Quoted 2 lines
I will address that in v3. I am sorry.
Hi Leon,
After re-reading the code, I see that there is no bug in v2 as the umem gets deallocated on failure inside the handler ofUVERBS_METHOD_CQ_CREATE. I also see that you also had the samelogic
Quoted 8 lines
Quoted 4 lines
in v1. So, what is your recommendation? Leave v2 logic as is, so mana would immediately give ownership of umem to
cq->umem, and ifmana_ib_create_user_cq()fails at later stage it should not cleancq->umemand leave it to the caller handle (i.e.,
UVERBS_METHOD_CQ_CREATE) to cleancq->umemregardless of who created it.Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Or should I make v3, where I will assign umem to
cq->umemright before return 0, so that ifmana_ib_create_user_cq()fails it does not changecq->umemat all.My suggestion is to stick with my original patch and remove
ib_umem_release(queue->umem)frommana_ib_destroy_queue().Unfortunately, this will break the code and will require more boilerplate workarounds.
MANA still needs to allocate umem for many objects. I see that we can generalize for CQs, but mana RC QPs use 4 queues at the moment, and I am preparing a patch to have 5th queue for BIND WQEs for RC. Our UC QP will use 3 queues. Having a nice entity as mana queue allows us to have clean code and do not have extra complex conditions to detect whether a mana queue has an umem and the cleanup of mana queue handles that.My proposal is to keep the nice property of mana queues and just extend the
mana_ib_create_queue()to satisfy your requirements without adding burden of special handling umems. As I understand the new API requirement is that umem for a CQ should be owned by the ib core, and that is what the helper
achieves: the umem pointer is not stored and assigned tocq->umemdirectly. The only open question I have is what the requirement for writing an umem tocq->umemis. In your patch, I see that you mutatecq->umemeven ifmana_ib_create_user_cq()fails. Is it the behavior you need/want/allow and will it be enforced in other IB objects that have one umem (e.g., WQs, SRQs)? As it seems to be allowed in theUVERBS_METHOD_CQ_CREATEcode:if (ib_dev->ops.create_user_cq) ret = ib_dev->ops.create_user_cq(cq, &attr, attrs); else ret = ib_dev->ops.create_cq(cq, &attr, attrs); if (ret) goto err_free; ... err_free: ib_umem_release(cq->umem);If it is not expected, you might enforce it by adding
WARN_ON(cq->umem != umem); beforeib_umem_release()And I am happy to adjust mana code to satisfy this behavior.
Quoted 10 lines
here I am just trying to get a win-win situation where we both can be happy about the code. I looked at your proposal and removing
ib_umem_releasefrom mana destroy queue will just add it aftermana_ib_destroy_queue()in all code paths except the CQ. As well as we would need to add code to handle failures ofib_umem_get, so keeping it in the helper removes the need to have that. Instead, I would like to make the helper to handle the cases when umem is created by upper stack or is not created but want to be owned by the upper stack. What is more, I would like the helper be general enough to be used for other ib core objects and that is why I would like to know the model so I adjust the helper accordingly.
Hi Leon! Could you please respond to the question above so I can resend v2 or suggest a v3 of this patch. I am asking as I would like to send patches for UC QP support in mana_ib and it uses mana_ib_create_queue(). Or should I send UC QP patches now with existing mana_ib_create_queue() signature and send a v3 for this patch later, where I also fix mana_ib_create_queue() for UC QP handling?
Thanks
Quoted 12 lines
Thanks
KonstantinQuoted 8 lines
Thanks
Quoted 5 lines
Quoted 3 lines
- Konstantin
Quoted 295 lines · Konstantin Taranov
Quoted 284 lines
Quoted 27 lines · Konstantin Taranov
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 8 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()Quoted 8 lines
Quoted 6 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by Konstantin Taranov <[email protected]>---
v2: It is a rework of the patch proposed by LeonI am curious to know what changes were introduced?
It is like your patch, but I kept
get_umeminmana_ib_create_queueand introduced ownership.
It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of the umem. With newmana_ib_create_queue()it is clear from the caller what happens and no special changes in the caller required.Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c | 125 +++++++++++++++++------
Quoted 192 lines
----
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 14 lines
drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a100644drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structQuoted 1 line
ib_cq_init_attr*attr,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-1struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_udata; struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 22
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +0
-3-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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct
ib_cq_init_attr*attr,Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 31
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +0
-2cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -if (udata) { - if (udata->inlen < offsetof(struct mana_ib_create_cq,flags))
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 34
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - - err = ib_copy_from_udata(&ucmd, udata,min(sizeof(ucmd),
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
udata->inlen));drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 36
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udatafor
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 8 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 27
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 2 lines
Quoted 2 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue forcreate
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
+cq,
%d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr,
cq->cqeQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue forcreate
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq,%d\n",
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
err);
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata,struct
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-4- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ){
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +0
-1- ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size =MANA_PAGE_ALIGN(roundup_pow_of_two(attr-
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernelqueue for
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback,%d\n",
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
err);
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ;drivers/infiniband/hw/mana/cq.c
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+ +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_create_user_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +5
-0+struct ib_udata *udata = &attrs->driver_udata; +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 = {};Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +8
-0+struct mana_ib_dev *mdev; +bool is_rnic_cq; +u32 doorbell; +int err; + + mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + + cq->comp_vector = attr->comp_vector % ibdev-
num_comp_vectors;Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +8
-0+ cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), +udata-inlen));
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq,
Quoted 11 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
%d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+return err; + } + + if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +5
-0+ attr->cqe > U32_MAX / COMP_ENTRY_SIZE) +return -EINVAL ; + + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe*
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +1
-0+ &cq->queue, &ibcq->umem);I just realized that I forgot to handle the case when
ibcq->umem== NULL and mana fails later after this call. I need to cleanibcq->umeminthis case.
Quoted 7 lines
Quoted 2 lines
I will address that in v3. I am sorry.
Hi Leon,
After re-reading the code, I see that there is no bug in v2 as the umem gets deallocated on failure inside the handler ofUVERBS_METHOD_CQ_CREATE. I also see that you also had the samelogic
Quoted 8 lines
Quoted 4 lines
in v1. So, what is your recommendation? Leave v2 logic as is, so mana would immediately give ownership of umem to
cq->umem, and ifmana_ib_create_user_cq()fails at later stage it should not cleancq->umemand leave it to the caller handle (i.e.,
UVERBS_METHOD_CQ_CREATE) to cleancq->umemregardless of who created it.Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Or should I make v3, where I will assign umem to
cq->umemright before return 0, so that ifmana_ib_create_user_cq()fails it does not changecq->umemat all.My suggestion is to stick with my original patch and remove
ib_umem_release(queue->umem)frommana_ib_destroy_queue().Unfortunately, this will break the code and will require more boilerplate workarounds.
MANA still needs to allocate umem for many objects. I see that we can generalize for CQs, but mana RC QPs use 4 queues at the moment, and I am preparing a patch to have 5th queue for BIND WQEs for RC. Our UC QP will use 3 queues. Having a nice entity as mana queue allows us to have clean code and do not have extra complex conditions to detect whether a mana queue has an umem and the cleanup of mana queue handles that.My proposal is to keep the nice property of mana queues and just extend the
mana_ib_create_queue()to satisfy your requirements without adding burden of special handling umems. As I understand the new API requirement is that umem for a CQ should be owned by the ib core, and that is what the helper
achieves: the umem pointer is not stored and assigned tocq->umemdirectly. The only open question I have is what the requirement for writing an umem tocq->umemis. In your patch, I see that you mutatecq->umemeven ifmana_ib_create_user_cq()fails. Is it the behavior you need/want/allow and will it be enforced in other IB objects that have one umem (e.g., WQs, SRQs)? As it seems to be allowed in theUVERBS_METHOD_CQ_CREATEcode:if (ib_dev->ops.create_user_cq) ret = ib_dev->ops.create_user_cq(cq, &attr, attrs); else ret = ib_dev->ops.create_cq(cq, &attr, attrs); if (ret) goto err_free; ... err_free: ib_umem_release(cq->umem);If it is not expected, you might enforce it by adding
WARN_ON(cq->umem != umem); beforeib_umem_release()And I am happy to adjust mana code to satisfy this behavior.Quoted 10 lines
here I am just trying to get a win-win situation where we both can be happy about the code. I looked at your proposal and removing
ib_umem_releasefrom mana destroy queue will just add it aftermana_ib_destroy_queue()in all code paths except the CQ. As well as we would need to add code to handle failures ofib_umem_get, so keeping it in the helper removes the need to have that. Instead, I would like to make the helper to handle the cases when umem is created by upper stack or is not created but want to be owned by the upper stack. What is more, I would like the helper be general enough to be used for other ib core objects and that is why I would like to know the model so I adjust the helper accordingly.
Quoted 5 lines
Hi Leon! Could you please respond to the question above so I can resend v2 or suggest a v3 of this patch. I am asking as I would like to send patches for UC QP support in
mana_iband it usesmana_ib_create_queue(). Or should I send UC QP patches now with existingmana_ib_create_queue()signature and send a v3 for this patch later, where I also fixmana_ib_create_queue()for UC QP handling?
It depends on your readiness. If your UC QP support is complete, send it.
Regarding .create_user_cq(), you are not required to implement it if you prefer not to. Your driver did not support this callback before my series. The purpose of .create_user_cq() is to enable handling of additional UMEM types, such as dmabuf for GPU memory. Later in this cycle, memfd-based UMEMs will be added to improve ib_umem_get() performance.
If you want your driver to support these UMEM types, you will need to follow the API contract: do not call ib_umem_release in the .create_user_cq() or .destroy_cq() paths.
Thanks
Quoted 15 lines
Thanks
Quoted 12 lines
Thanks
KonstantinQuoted 8 lines
Thanks
Quoted 5 lines
Quoted 3 lines
- Konstantin
Konstantin Taranov
maintainerQuoted 329 lines · Konstantin Taranov
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines · Konstantin Taranov
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()Quoted 7 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by: Konstantin Taranov <[email protected]>
---
v2: It is a rework of the patch proposed by LeonQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
I am curious to know what changes were introduced?
It is like your patch, but I kept
get_umeminmana_ib_create_queueand introduced ownership.
It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of theumem.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
With new
mana_ib_create_queue()it is clear from the caller what happens and no special changes in the caller required.Quoted 2 lines
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c | 125+++++++++++++++++---
Quoted 231 lines
Quoted 231 lines
---
Quoted 197 lines
----
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 15 lines
drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a
100644drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structQuoted 1 line
ib_cq_init_attr*attr,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-1struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_udata; struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 22
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +0
-3-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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct
ib_cq_init_attr*attr,Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 31
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +0
-2cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -if (udata) { - if (udata->inlen < offsetof(struct mana_ib_create_cq,flags))
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 34
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - - err = ib_copy_from_udata(&ucmd, udata,min(sizeof(ucmd),
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
udata->inlen));drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 36
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udatafor
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 8 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 27
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 2 lines
Quoted 2 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue forcreate
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
+cq,
%d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr,
cq->cqeQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue forcreate
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq,%d\n",
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
err);
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata,struct
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-4- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ){
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +0
-1- ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size =MANA_PAGE_ALIGN(roundup_pow_of_two(attr-
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernelqueue for
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback,%d\n",
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
err);
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +7
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ; +drivers/infiniband/hw/mana/cq.c
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+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_create_user_cq(struct ib_cq *ibcq, const +struct
ib_cq_init_attr*attr,Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +6
-0+struct ib_udata *udata = &attrs->driver_udata; +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;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +8
-0+bool is_rnic_cq; +u32 doorbell; +int err; + + mdev = container_of(ibdev, struct mana_ib_dev, +ib_dev); + + cq->comp_vector = attr->comp_vector % ibdev-
num_comp_vectors;Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+ cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags))Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +5
-0+return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, +min(sizeof(ucmd), +udata-inlen));
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq,
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
%d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+return err; + } + + if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +6
-0+ attr->cqe > U32_MAX / COMP_ENTRY_SIZE) +return -EINVAL ; + + cq->cqe = attr->cqe; + err =mana_ib_create_queue (mdev, ucmd.buf_addr, +cq->cqe*
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +1
-0+ &cq->queue, &ibcq->umem);I just realized that I forgot to handle the case when
ibcq->umem== NULL and mana fails later after this call. I need to cleanibcq->umeminthis case.
Quoted 7 lines
Quoted 2 lines
I will address that in v3. I am sorry.
Hi Leon,
After re-reading the code, I see that there is no bug in v2 as the umem gets deallocated on failure inside the handler ofUVERBS_METHOD_CQ_CREATE. I also see that you also had the samelogic
Quoted 16 lines
Quoted 6 lines
in v1. So, what is your recommendation? Leave v2 logic as is, so mana would immediately give ownership of umem to
cq->umem, and ifmana_ib_create_user_cq()fails at later stage it should not cleancq->umemand leave it to the caller handle (i.e.,
UVERBS_METHOD_CQ_CREATE) to cleancq->umemregardless of who created it.Quoted 4 lines
Or should I make v3, where I will assign umem to
cq->umemright before return 0, so that ifmana_ib_create_user_cq()fails it does not changecq->umemat all.My suggestion is to stick with my original patch and remove
ib_umem_release(queue->umem)frommana_ib_destroy_queue().Quoted 8 lines
Quoted 8 lines
Unfortunately, this will break the code and will require more boilerplate workarounds.
MANA still needs to allocate umem for many objects. I see that we can generalize for CQs, but mana RC QPs use 4 queues at the moment, and I am preparing a patch to have 5th queue for BIND WQEs for RC. Our UC QP will use 3 queues. Having a nice entity as mana queue allows us to have clean code and do not have extra complex conditions to detect whether a mana queue has an umem and thecleanup of mana queue handles that.
Quoted 8 lines
Quoted 8 lines
My proposal is to keep the nice property of mana queues and just extend the
mana_ib_create_queue()to satisfy your requirements without adding burden of special handling umems. As I understand the new API requirement is that umem for a CQ should be owned by the ib core, and that is what the helper
achieves: the umem pointer is not stored and assigned tocq->umemdirectly.
Quoted 5 lines
Quoted 5 lines
The only open question I have is what the requirement for writing an umem to
cq->umemis. In your patch, I see that you mutatecq->umemeven ifmana_ib_create_user_cq()fails. Is it the behavior you need/want/allow and will it be enforced in other IB objects that have oneumem (e.g., WQs, SRQs)?
Quoted 4 lines
Quoted 4 lines
As it seems to be allowed in the
UVERBS_METHOD_CQ_CREATEcode:if (ib_dev->ops.create_user_cq) ret = ib_dev->ops.create_user_cq(cq, &attr, attrs); elseQuoted 8 lines
Quoted 8 lines
ret = ib_dev->ops.create_cq(cq, &attr, attrs); if (ret) goto err_free; ... err_free: ib_umem_release(cq->umem);If it is not expected, you might enforce it by adding
WARN_ON(cq->umem != umem); beforeib_umem_release()And I amhappy
Quoted 12 lines
Quoted 12 lines
to adjust mana code to satisfy this behavior.
here I am just trying to get a win-win situation where we both can be happy about the code. I looked at your proposal and removing
ib_umem_releasefrom mana destroy queue will just add it aftermana_ib_destroy_queue()in all code paths except the CQ. As well as we would need to add code to handle failures ofib_umem_get, so keeping it in the helper removes the need to have that. Instead, I would like to make the helper to handle the cases when umem is created by upper stack or is not created but want to be owned by the upper stack. What is more, I would like the helper be general enough to be used for other ib core objects and that is why I would like to knowthe model so I adjust the helper accordingly.
Quoted 6 lines
Hi Leon! Could you please respond to the question above so I can resend v2 or suggest a v3 of this patch. I am asking as I would like to send patches for UC QP support in
mana_iband it usesmana_ib_create_queue(). Or should I send UC QP patches now with existingmana_ib_create_queue()signature and send a v3 for this patchlater, where I also fix
mana_ib_create_queue()for UC QP handling?It depends on your readiness. If your UC QP support is complete, send it.
Regarding .create_user_cq(), you are not required to implement it if you prefer not to. Your driver did not support this callback before my series. The purpose of .create_user_cq() is to enable handling of additional UMEM types, such as dmabuf for GPU memory. Later in this cycle, memfd-based UMEMs will be added to improve
ib_umem_get()performance.
Quoted 3 lines
If you want your driver to support these UMEM types, you will need to follow the API contract: do not call
ib_umem_releasein the .create_user_cq() or .destroy_cq() paths.
To confirm that we are on the same page.
It means that when mana gets cq->umem == NULL, I should assign it to ib_umem_get() and if there is an error later, the mana_ib_create_user_cq() should not call ib_umem_release() even though it created it.
Correct?
Konstantin
Quoted 18 lines
Thanks
Quoted 15 lines
Thanks
Quoted 12 lines
Thanks
KonstantinQuoted 8 lines
Thanks
Quoted 5 lines
Quoted 3 lines
- Konstantin
Quoted 333 lines · Konstantin Taranov
Quoted 329 lines · Konstantin Taranov
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines · Konstantin Taranov
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 2 lines
The uverbs CQ creation UAPI allows users to supply their own umem for a
CQ.
Quoted 4 lines
Update mana to support this workflow while preserving support for creating umem through the legacy interface.
To support RDMA objects that own umem, extend
mana_ib_create_queue()Quoted 7 lines
to return the umem to the caller and do not allocate umem if it was allocted by the caller.
Signed-off-by: Konstantin Taranov <[email protected]>
---
v2: It is a rework of the patch proposed by LeonQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
I am curious to know what changes were introduced?
It is like your patch, but I kept
get_umeminmana_ib_create_queueand introduced ownership.
It made the code simpler and extendable. In your proposal, it was hard to track the changes and it led to double free of theumem.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
With new
mana_ib_create_queue()it is clear from the caller what happens and no special changes in the caller required.Quoted 2 lines
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c | 125+++++++++++++++++---
Quoted 231 lines
Quoted 231 lines
---
Quoted 197 lines
----
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 15 lines
drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 30 +++++-- drivers/infiniband/hw/mana/mana_ib.h | 5 +- drivers/infiniband/hw/mana/qp.c | 5 +- drivers/infiniband/hw/mana/wq.c | 3 +- 6 files changed, 111 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindexb2749f971..fa951732a
100644drivers/infiniband/hw/mana/cq.c +0
-0@@ -8,12 +8,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structQuoted 1 line
ib_cq_init_attr*attr,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-1struct uverbs_attr_bundle *attrs) { -struct ib_udata *udata = &attrs->driver_udata; struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 22
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +0
-3-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;@@ -26,48 +22,91 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct
ib_cq_init_attr*attr,Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 31
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +0
-2cq->cq_handle =INVALID_MANA_HANDLE ; is_rnic_cq =mana_ib_is_rnic (mdev); -if (udata) { - if (udata->inlen < offsetof(struct mana_ib_create_cq,flags))
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 34
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - - err = ib_copy_from_udata(&ucmd, udata,min(sizeof(ucmd),
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
udata->inlen));drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 36
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(ibdev, "Failed to copy from udatafor
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 8 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq · line 27
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +2
-2-return err; - } +if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ) +return -EINVAL ;We are talking about kernel verbs. ULPs are not designed to provide attributes and recover from random driver limitations.
I understand, but there was an ask before to add that check as some automated code verifier detected overflow. So if we remote it, I guess we get again an ask to fix the potential overflow.
Quoted 2 lines
Quoted 2 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-1- if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
drivers/infiniband/hw/mana/cq.c +0
-2- attr->cqe > U32_MAX / COMP_ENTRY_SIZE) { - ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +1
-2-return -EINVAL ; - } + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe *
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue forcreate
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
+cq,
%d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-2+return err; + } + doorbell = mdev->gdma_dev->doorbell; - cq->cqe = attr->cqe; - err = mana_ib_create_queue(mdev, ucmd.buf_addr,
cq->cqeQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
*
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +2
-2- &cq->queue); +if (is_rnic_cq) { + err =mana_ib_gd_create_cq (mdev, cq, doorbell);if (err) { - ibdev_dbg(ibdev, "Failed to create queue forcreate
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to create RNIC cq,%d\n",
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
err);
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ goto err_destroy_queue; } - mana_ucontext = rdma_udata_to_drv_context(udata,struct
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +0
-4- ibucontext); - doorbell = mana_ucontext->doorbell; - }else { -if (attr->cqe >U32_MAX /COMP_ENTRY_SIZE /2 +1 ){
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +0
-1- ibdev_dbg(ibdev, "CQE %d exceedinglimit\n", attr-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
cqe);
drivers/infiniband/hw/mana/cq.c +0
-3-return -EINVAL ; - } - buf_size =MANA_PAGE_ALIGN(roundup_pow_of_two(attr-
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +0
-2- cq->cqe = buf_size /COMP_ENTRY_SIZE ; - err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c
Quoted 3 lines
drivers/infiniband/hw/mana/cq.c +1
-1+ err =mana_ib_install_cq_cb (mdev, cq);if (err) { - ibdev_dbg(ibdev, "Failed to create kernelqueue for
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
create cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +1
-1-return err; + ibdev_dbg(ibdev, "Failed to install cq callback,%d\n",
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
err);
Quoted 11 lines
drivers/infiniband/hw/mana/cq.c +7
-1+ goto err_destroy_rnic_cq; } - doorbell = mdev->gdma_dev->doorbell; } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); + +return 0 ; +drivers/infiniband/hw/mana/cq.c
Quoted 10 lines
drivers/infiniband/hw/mana/cq.c +10
-0+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_create_user_cq(struct ib_cq *ibcq, const +struct
ib_cq_init_attr*attr,Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ struct uverbs_attr_bundle *attrs) { + struct mana_ib_cq *cq = container_of(ibcq, struct
mana_ib_cq, ibcq);Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +6
-0+struct ib_udata *udata = &attrs->driver_udata; +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;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +8
-0+bool is_rnic_cq; +u32 doorbell; +int err; + + mdev = container_of(ibdev, struct mana_ib_dev, +ib_dev); + + cq->comp_vector = attr->comp_vector % ibdev-
num_comp_vectors;Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+ cq->cq_handle =INVALID_MANA_HANDLE ; + is_rnic_cq =mana_ib_is_rnic (mdev); + +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags))Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c
Quoted 8 lines
drivers/infiniband/hw/mana/cq.c +5
-0+return -EINVAL ; + + err = ib_copy_from_udata(&ucmd, udata, +min(sizeof(ucmd), +udata-inlen));
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata forcreate cq,
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
%d\n", err);
drivers/infiniband/hw/mana/cq.c
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+return err; + } + + if ((!is_rnic_cq && attr->cqe > mdev-adapter_caps.max_qp_wr) ||
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +6
-0+ attr->cqe > U32_MAX / COMP_ENTRY_SIZE) +return -EINVAL ; + + cq->cqe = attr->cqe; + err =mana_ib_create_queue (mdev, ucmd.buf_addr, +cq->cqe*
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c
Quoted 1 line
drivers/infiniband/hw/mana/cq.c +1
-0+ &cq->queue, &ibcq->umem);I just realized that I forgot to handle the case when
ibcq->umem== NULL and mana fails later after this call. I need to cleanibcq->umeminthis case.
Quoted 7 lines
Quoted 2 lines
I will address that in v3. I am sorry.
Hi Leon,
After re-reading the code, I see that there is no bug in v2 as the umem gets deallocated on failure inside the handler ofUVERBS_METHOD_CQ_CREATE. I also see that you also had the samelogic
Quoted 16 lines
Quoted 6 lines
in v1. So, what is your recommendation? Leave v2 logic as is, so mana would immediately give ownership of umem to
cq->umem, and ifmana_ib_create_user_cq()fails at later stage it should not cleancq->umemand leave it to the caller handle (i.e.,
UVERBS_METHOD_CQ_CREATE) to cleancq->umemregardless of who created it.Quoted 4 lines
Or should I make v3, where I will assign umem to
cq->umemright before return 0, so that ifmana_ib_create_user_cq()fails it does not changecq->umemat all.My suggestion is to stick with my original patch and remove
ib_umem_release(queue->umem)frommana_ib_destroy_queue().Quoted 8 lines
Quoted 8 lines
Unfortunately, this will break the code and will require more boilerplate workarounds.
MANA still needs to allocate umem for many objects. I see that we can generalize for CQs, but mana RC QPs use 4 queues at the moment, and I am preparing a patch to have 5th queue for BIND WQEs for RC. Our UC QP will use 3 queues. Having a nice entity as mana queue allows us to have clean code and do not have extra complex conditions to detect whether a mana queue has an umem and thecleanup of mana queue handles that.
Quoted 8 lines
Quoted 8 lines
My proposal is to keep the nice property of mana queues and just extend the
mana_ib_create_queue()to satisfy your requirements without adding burden of special handling umems. As I understand the new API requirement is that umem for a CQ should be owned by the ib core, and that is what the helper
achieves: the umem pointer is not stored and assigned tocq->umemdirectly.
Quoted 5 lines
Quoted 5 lines
The only open question I have is what the requirement for writing an umem to
cq->umemis. In your patch, I see that you mutatecq->umemeven ifmana_ib_create_user_cq()fails. Is it the behavior you need/want/allow and will it be enforced in other IB objects that have oneumem (e.g., WQs, SRQs)?
Quoted 4 lines
Quoted 4 lines
As it seems to be allowed in the
UVERBS_METHOD_CQ_CREATEcode:if (ib_dev->ops.create_user_cq) ret = ib_dev->ops.create_user_cq(cq, &attr, attrs); elseQuoted 8 lines
Quoted 8 lines
ret = ib_dev->ops.create_cq(cq, &attr, attrs); if (ret) goto err_free; ... err_free: ib_umem_release(cq->umem);If it is not expected, you might enforce it by adding
WARN_ON(cq->umem != umem); beforeib_umem_release()And I amhappy
Quoted 12 lines
Quoted 12 lines
to adjust mana code to satisfy this behavior.
here I am just trying to get a win-win situation where we both can be happy about the code. I looked at your proposal and removing
ib_umem_releasefrom mana destroy queue will just add it aftermana_ib_destroy_queue()in all code paths except the CQ. As well as we would need to add code to handle failures ofib_umem_get, so keeping it in the helper removes the need to have that. Instead, I would like to make the helper to handle the cases when umem is created by upper stack or is not created but want to be owned by the upper stack. What is more, I would like the helper be general enough to be used for other ib core objects and that is why I would like to knowthe model so I adjust the helper accordingly.
Quoted 6 lines
Hi Leon! Could you please respond to the question above so I can resend v2 or suggest a v3 of this patch. I am asking as I would like to send patches for UC QP support in
mana_iband it usesmana_ib_create_queue(). Or should I send UC QP patches now with existingmana_ib_create_queue()signature and send a v3 for this patchlater, where I also fix
mana_ib_create_queue()for UC QP handling?It depends on your readiness. If your UC QP support is complete, send it.
Regarding .create_user_cq(), you are not required to implement it if you prefer not to. Your driver did not support this callback before my series. The purpose of .create_user_cq() is to enable handling of additional UMEM types, such as dmabuf for GPU memory. Later in this cycle, memfd-based UMEMs will be added to improve
ib_umem_get()performance.Quoted 3 lines
If you want your driver to support these UMEM types, you will need to follow the API contract: do not call
ib_umem_releasein the .create_user_cq() or .destroy_cq() paths.
Quoted 5 lines
To confirm that we are on the same page.
It means that when mana getscq->umem== NULL, I should assign it toib_umem_get()and if there is an error later, themana_ib_create_user_cq()should not callib_umem_release()even though it created it.
Correct?
Yes, we have a plan for removing that ib_umem_get() in the future.
Thanks
Quoted 21 lines
Konstantin
Quoted 18 lines
Thanks
Quoted 15 lines
Thanks
Quoted 12 lines
Thanks
KonstantinQuoted 8 lines
Thanks
Quoted 5 lines
Quoted 3 lines
- Konstantin