From nobody Thu Apr 2 22:08:39 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E29E635BDB4; Fri, 13 Feb 2026 11:00:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770980431; cv=none; b=KjconfMflw/LnS4eE1CGC6/kj+vDuA6nfjJdhhCz31LZ9EwUDKoV5s39NILKPoEOrjHff5CpOzCgV/NEZIQhyB+7PFl2MJURU0/UHDxl0zCW5lXVH6cUnPtqeJKj4k6pq7RS6I0yloEoFMD2MLeuqAyxGESbLkORP4khGulkEvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770980431; c=relaxed/simple; bh=Ak3RmCVq6jtpD2K0Q8PWZX2hCkziroyuibiIfLhK4qA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GOV/QSGVh3kjAdU5wdeJfGybAUjgOarEHXA6J2J/Qzd7uZeT5klWeix/IDU16t7M2Dmrd1Znc7LSHkn0/LLMnd/oetCXzOhozlHX7+fcUC1Y7Lj6l3OMs7pGr4kbYJsYilAgmVKsXmOkf7GbXkI0nw0oJmBpGOn/AIDZckUFzaY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oGxmmSU6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oGxmmSU6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEE85C16AAE; Fri, 13 Feb 2026 11:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770980430; bh=Ak3RmCVq6jtpD2K0Q8PWZX2hCkziroyuibiIfLhK4qA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oGxmmSU6isRSNDBomgG5ajckBArUA7EwDs5ppPEPXkdoQKC52wPUf2z8Wpf6ZgCSQ xANqp56bWpVa2408k5MS3aXmOV/DPa5WKkzu+YQR5ZRta1i5zinnjhW5FWRNxpGTLG 8WWN/n7wwQu415CoBHNYsZf6wOWsNXMW5zpvhvNTMYGNik+7VpM7dU3sRdcGBhbkmu ujx6f9k5pv4C9mYqufOO7Fkdw7wWhVz1qEU/j8puOhlxqPizXrEQmktYRyAOrmr8Nq Eb41g9nJMKcfwNzK/eEY1YVuFLxVRQex1IsRvGVtrFe8UZjXqkkJLwk31gV0DUIMCo Td0bo5lTnsqQw== From: Leon Romanovsky To: Jason Gunthorpe , Leon Romanovsky , Selvin Xavier , Kalesh AP , Potnuri Bharat Teja , Michael Margolin , Gal Pressman , Yossi Leybovich , Cheng Xu , Kai Shen , Chengchang Tang , Junxian Huang , Abhijit Gangurde , Allen Hubbe , Krzysztof Czurylo , Tatyana Nikolova , Long Li , Konstantin Taranov , Yishai Hadas , Michal Kalderon , Bryan Tan , Vishnu Dasa , Broadcom internal kernel review list , Christian Benvenuti , Nelson Escobar , Dennis Dalessandro , Bernard Metzler , Zhu Yanjun Cc: linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-hyperv@vger.kernel.org Subject: [PATCH rdma-next 22/50] RDMA/ocrdma: Split user and kernel CQ creation paths Date: Fri, 13 Feb 2026 12:57:58 +0200 Message-ID: <20260213-refactor-umem-v1-22-f3be85847922@nvidia.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260213-refactor-umem-v1-0-f3be85847922@nvidia.com> References: <20260213-refactor-umem-v1-0-f3be85847922@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.15-dev-47773 Content-Transfer-Encoding: quoted-printable From: Leon Romanovsky Separate the CQ creation logic into distinct kernel and user flows. Signed-off-by: Leon Romanovsky --- 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/infiniban= d/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 =3D { .create_cq =3D ocrdma_create_cq, .create_qp =3D ocrdma_create_qp, .create_user_ah =3D ocrdma_create_ah, + .create_user_cq =3D ocrdma_create_user_cq, .dealloc_pd =3D ocrdma_dealloc_pd, .dealloc_ucontext =3D ocrdma_dealloc_ucontext, .dereg_mr =3D ocrdma_dereg_mr, diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniba= nd/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; } =20 -int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *att= r, - 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 =3D &attrs->driver_udata; struct ib_device *ibdev =3D 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 =3D get_ocrdma_dev(ibdev); struct ocrdma_ucontext *uctx =3D rdma_udata_to_drv_context( udata, struct ocrdma_ucontext, ibucontext); - u16 pd_id =3D 0; int status; struct ocrdma_create_cq_ureq ureq; =20 - if (attr->flags) + if (attr->flags || ibcq->umem) return -EOPNOTSUPP; =20 - if (udata) { - if (ib_copy_from_udata(&ureq, udata, sizeof(ureq))) - return -EFAULT; - } else - ureq.dpp_cq =3D 0; + if (ib_copy_from_udata(&ureq, udata, sizeof(ureq))) + return -EFAULT; =20 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); =20 - if (udata) - pd_id =3D uctx->cntxt_pd->id; - - status =3D ocrdma_mbx_create_cq(dev, cq, entries, ureq.dpp_cq, pd_id); + status =3D ocrdma_mbx_create_cq(dev, cq, entries, ureq.dpp_cq, + uctx->cntxt_pd->id); if (status) return status; =20 - if (udata) { - status =3D ocrdma_copy_cq_uresp(dev, cq, udata); - if (status) - goto ctx_err; - } + status =3D ocrdma_copy_cq_uresp(dev, cq, udata); + if (status) + goto ctx_err; + cq->phase =3D OCRDMA_CQE_VALID; dev->cq_tbl[cq->id] =3D cq; return 0; @@ -1015,6 +1009,32 @@ int ocrdma_create_cq(struct ib_cq *ibcq, const struc= t ib_cq_init_attr *attr, return status; } =20 +int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *att= r, + struct uverbs_attr_bundle *attrs) +{ + struct ib_device *ibdev =3D ibcq->device; + int entries =3D attr->cqe; + struct ocrdma_cq *cq =3D get_ocrdma_cq(ibcq); + struct ocrdma_dev *dev =3D 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 =3D ocrdma_mbx_create_cq(dev, cq, entries, 0, 0); + if (status) + return status; + + cq->phase =3D OCRDMA_CQE_VALID; + dev->cq_tbl[cq->id] =3D 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/infiniba= nd/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); =20 int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *att= r, 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); =20 --=20 2.52.0