From: Leon Romanovsky <[email protected]> Separate the CQ creation logic into distinct kernel and user flows.
Signed-off-by: Leon Romanovsky <[email protected]> --- drivers/infiniband/hw/ocrdma/ocrdma_main.c | 1 + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 56 +++++++++++++++++++---------- drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 3 ++ 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c index 5d4b3bc16493..0d89c5ec9a7a 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c @@ -141,6 +141,7 @@ static const struct ib_device_ops ocrdma_dev_ops = { .create_cq = ocrdma_create_cq, .create_qp = ocrdma_create_qp, .create_user_ah = ocrdma_create_ah, + .create_user_cq = ocrdma_create_user_cq, .dealloc_pd = ocrdma_dealloc_pd, .dealloc_ucontext = ocrdma_dealloc_ucontext, .dereg_mr = ocrdma_dereg_mr, diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index bf9211d8d130..034d8b937a77 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -966,8 +966,9 @@ static int ocrdma_copy_cq_uresp(struct ocrdma_dev *dev, struct ocrdma_cq *cq, return status; } -int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, - struct uverbs_attr_bundle *attrs) +int ocrdma_create_user_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 ib_device *ibdev = ibcq->device; @@ -976,36 +977,29 @@ int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, struct ocrdma_dev *dev = get_ocrdma_dev(ibdev); struct ocrdma_ucontext *uctx = rdma_udata_to_drv_context( udata, struct ocrdma_ucontext, ibucontext); - u16 pd_id = 0; int status; struct ocrdma_create_cq_ureq ureq; - if (attr->flags) + if (attr->flags || ibcq->umem) return -EOPNOTSUPP; - if (udata) { - if (ib_copy_from_udata(&ureq, udata, sizeof(ureq))) - return -EFAULT; - } else - ureq.dpp_cq = 0; + if (ib_copy_from_udata(&ureq, udata, sizeof(ureq))) + return -EFAULT; spin_lock_init(&cq->cq_lock); spin_lock_init(&cq->comp_handler_lock); INIT_LIST_HEAD(&cq->sq_head); INIT_LIST_HEAD(&cq->rq_head); - if (udata) - pd_id = uctx->cntxt_pd->id; - - status = ocrdma_mbx_create_cq(dev, cq, entries, ureq.dpp_cq, pd_id); + status = ocrdma_mbx_create_cq(dev, cq, entries, ureq.dpp_cq, + uctx->cntxt_pd->id); if (status) return status; - if (udata) { - status = ocrdma_copy_cq_uresp(dev, cq, udata); - if (status) - goto ctx_err; - } + status = ocrdma_copy_cq_uresp(dev, cq, udata); + if (status) + goto ctx_err; + cq->phase = OCRDMA_CQE_VALID; dev->cq_tbl[cq->id] = cq; return 0; @@ -1015,6 +1009,32 @@ int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, return status; } +int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, + struct uverbs_attr_bundle *attrs) +{ + struct ib_device *ibdev = ibcq->device; + int entries = attr->cqe; + struct ocrdma_cq *cq = get_ocrdma_cq(ibcq); + struct ocrdma_dev *dev = get_ocrdma_dev(ibdev); + int status; + + if (attr->flags) + return -EOPNOTSUPP; + + spin_lock_init(&cq->cq_lock); + spin_lock_init(&cq->comp_handler_lock); + INIT_LIST_HEAD(&cq->sq_head); + INIT_LIST_HEAD(&cq->rq_head); + + status = ocrdma_mbx_create_cq(dev, cq, entries, 0, 0); + if (status) + return status; + + cq->phase = OCRDMA_CQE_VALID; + dev->cq_tbl[cq->id] = cq; + return 0; +} + int ocrdma_resize_cq(struct ib_cq *ibcq, int new_cnt, struct ib_udata *udata) { diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h index 6c5c3755b8a9..4a572608fd9f 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h @@ -71,6 +71,9 @@ int ocrdma_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata); int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, struct uverbs_attr_bundle *attrs); +int ocrdma_create_user_cq(struct ib_cq *ibcq, + const struct ib_cq_init_attr *attr, + struct uverbs_attr_bundle *attrs); int ocrdma_resize_cq(struct ib_cq *, int cqe, struct ib_udata *); int ocrdma_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata); -- 2.52.0
