From nobody Thu Apr 2 22:12:31 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 5ED351F03EF; Fri, 13 Feb 2026 11:00:38 +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=1770980438; cv=none; b=E3fw5D71xqxQUvgaYZZ1Oe/Q5KuzilqmnkETH/rqZpvVonc0v8BvV2Frgk5m2zjn4pliE7jmJJvYMdRggxS4+3Gde6ZdGedn7b+UXzTbTmNtaWTdu6fQee5SuI+ZwWpbnlqC5Jrtgw25f6d9elNMO6jjPuIYTpH7qNx+ra8yA9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770980438; c=relaxed/simple; bh=lO34ijZAFdv5MXws8lPiMPsCemhr7GqNyljZmJLSdMo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T/E6rAORBFZqInz0aw7HzJ3HfVc6/O2eTLEU/4ALK+nzERQtaVfzp9MmpPMTmEj9GdFzJHckdrY4SBtEMdMk8I41Z+NVdoZIxUoS4/VozRWuJ5EMq0o3OdicOaIkWzq8SCdS2JhJOBleA3Owjm61719xe4BqxH7WeCMNyMEjAXA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OQsyLbX0; 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="OQsyLbX0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 363B2C16AAE; Fri, 13 Feb 2026 11:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770980437; bh=lO34ijZAFdv5MXws8lPiMPsCemhr7GqNyljZmJLSdMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OQsyLbX07Wd4X+KOi9GPiRxqhZqgk47Pm1cOoHdR7jbavG0svkRZu7FCg+cIYcmGK /2ATr4WULSKbyztLNbV5MdldX1QQltX6LTnQcp6VIja2goeY1gduWa1NUQiQ5w9saf 4efkmrJX9uNDXSxBmDzjXVTAOor/plFlRURBv35cJBAK8l97uuRBh/52WWRbXd2OK7 2c6N11HDk0xAo0ije+0M5ppYh6M41Qhk1V6ludoxSTwiwmTw5xJ3+Gi7cQxcPjs+tI TK7PCyrxDXU19bYClVh/5b4sYcJ+qxinnU9ZjGeXjFmB+DK6z1VoEzhGKCWWyrA7AO ycanOFk9Lwr0g== 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 28/50] RDMA/siw: Split user and kernel CQ creation paths Date: Fri, 13 Feb 2026 12:58:04 +0200 Message-ID: <20260213-refactor-umem-v1-28-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/sw/siw/siw_main.c | 1 + drivers/infiniband/sw/siw/siw_verbs.c | 111 +++++++++++++++++++++++-------= ---- drivers/infiniband/sw/siw/siw_verbs.h | 2 + 3 files changed, 80 insertions(+), 34 deletions(-) diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/s= iw/siw_main.c index 5168307229a9..75dcf3578eac 100644 --- a/drivers/infiniband/sw/siw/siw_main.c +++ b/drivers/infiniband/sw/siw/siw_main.c @@ -232,6 +232,7 @@ static const struct ib_device_ops siw_device_ops =3D { .alloc_pd =3D siw_alloc_pd, .alloc_ucontext =3D siw_alloc_ucontext, .create_cq =3D siw_create_cq, + .create_user_cq =3D siw_create_user_cq, .create_qp =3D siw_create_qp, .create_srq =3D siw_create_srq, .dealloc_driver =3D siw_device_cleanup, diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/= siw/siw_verbs.c index efa2f097b582..92b25b389b69 100644 --- a/drivers/infiniband/sw/siw/siw_verbs.c +++ b/drivers/infiniband/sw/siw/siw_verbs.c @@ -1139,15 +1139,15 @@ int siw_destroy_cq(struct ib_cq *base_cq, struct ib= _udata *udata) * @attrs: uverbs bundle */ =20 -int siw_create_cq(struct ib_cq *base_cq, const struct ib_cq_init_attr *att= r, - struct uverbs_attr_bundle *attrs) +int siw_create_user_cq(struct ib_cq *base_cq, const struct ib_cq_init_attr= *attr, + struct uverbs_attr_bundle *attrs) { struct ib_udata *udata =3D &attrs->driver_udata; struct siw_device *sdev =3D to_siw_dev(base_cq->device); struct siw_cq *cq =3D to_siw_cq(base_cq); int rv, size =3D attr->cqe; =20 - if (attr->flags) + if (attr->flags || base_cq->umem) return -EOPNOTSUPP; =20 if (atomic_inc_return(&sdev->num_cq) > SIW_MAX_CQ) { @@ -1155,7 +1155,7 @@ int siw_create_cq(struct ib_cq *base_cq, const struct= ib_cq_init_attr *attr, rv =3D -ENOMEM; goto err_out; } - if (size < 1 || size > sdev->attrs.max_cqe) { + if (attr->cqe > sdev->attrs.max_cqe) { siw_dbg(base_cq->device, "CQ size error: %d\n", size); rv =3D -EINVAL; goto err_out; @@ -1164,13 +1164,8 @@ int siw_create_cq(struct ib_cq *base_cq, const struc= t ib_cq_init_attr *attr, cq->base_cq.cqe =3D size; cq->num_cqe =3D size; =20 - if (udata) - cq->queue =3D vmalloc_user(size * sizeof(struct siw_cqe) + - sizeof(struct siw_cq_ctrl)); - else - cq->queue =3D vzalloc(size * sizeof(struct siw_cqe) + - sizeof(struct siw_cq_ctrl)); - + cq->queue =3D vmalloc_user(size * sizeof(struct siw_cqe) + + sizeof(struct siw_cq_ctrl)); if (cq->queue =3D=3D NULL) { rv =3D -ENOMEM; goto err_out; @@ -1182,33 +1177,32 @@ int siw_create_cq(struct ib_cq *base_cq, const stru= ct ib_cq_init_attr *attr, =20 cq->notify =3D (struct siw_cq_ctrl *)&cq->queue[size]; =20 - if (udata) { - struct siw_uresp_create_cq uresp =3D {}; - struct siw_ucontext *ctx =3D - rdma_udata_to_drv_context(udata, struct siw_ucontext, - base_ucontext); - size_t length =3D size * sizeof(struct siw_cqe) + - sizeof(struct siw_cq_ctrl); + struct siw_uresp_create_cq uresp =3D {}; + struct siw_ucontext *ctx =3D + rdma_udata_to_drv_context(udata, struct siw_ucontext, + base_ucontext); + size_t length =3D size * sizeof(struct siw_cqe) + + sizeof(struct siw_cq_ctrl); =20 - cq->cq_entry =3D - siw_mmap_entry_insert(ctx, cq->queue, - length, &uresp.cq_key); - if (!cq->cq_entry) { - rv =3D -ENOMEM; - goto err_out; - } + cq->cq_entry =3D + siw_mmap_entry_insert(ctx, cq->queue, + length, &uresp.cq_key); + if (!cq->cq_entry) { + rv =3D -ENOMEM; + goto err_out; + } =20 - uresp.cq_id =3D cq->id; - uresp.num_cqe =3D size; + uresp.cq_id =3D cq->id; + uresp.num_cqe =3D size; =20 - if (udata->outlen < sizeof(uresp)) { - rv =3D -EINVAL; - goto err_out; - } - rv =3D ib_copy_to_udata(udata, &uresp, sizeof(uresp)); - if (rv) - goto err_out; + if (udata->outlen < sizeof(uresp)) { + rv =3D -EINVAL; + goto err_out; } + rv =3D ib_copy_to_udata(udata, &uresp, sizeof(uresp)); + if (rv) + goto err_out; + return 0; =20 err_out: @@ -1227,6 +1221,55 @@ int siw_create_cq(struct ib_cq *base_cq, const struc= t ib_cq_init_attr *attr, return rv; } =20 +int siw_create_cq(struct ib_cq *base_cq, const struct ib_cq_init_attr *att= r, + struct uverbs_attr_bundle *attrs) +{ + struct siw_device *sdev =3D to_siw_dev(base_cq->device); + struct siw_cq *cq =3D to_siw_cq(base_cq); + int rv, size =3D attr->cqe; + + if (attr->flags) + return -EOPNOTSUPP; + + if (atomic_inc_return(&sdev->num_cq) > SIW_MAX_CQ) { + siw_dbg(base_cq->device, "too many CQ's\n"); + rv =3D -ENOMEM; + goto err_out; + } + if (size < 1 || size > sdev->attrs.max_cqe) { + siw_dbg(base_cq->device, "CQ size error: %d\n", size); + rv =3D -EINVAL; + goto err_out; + } + size =3D roundup_pow_of_two(size); + cq->base_cq.cqe =3D size; + cq->num_cqe =3D size; + + cq->queue =3D vzalloc(size * sizeof(struct siw_cqe) + + sizeof(struct siw_cq_ctrl)); + if (cq->queue =3D=3D NULL) { + rv =3D -ENOMEM; + goto err_out; + } + get_random_bytes(&cq->id, 4); + siw_dbg(base_cq->device, "new CQ [%u]\n", cq->id); + + spin_lock_init(&cq->lock); + + cq->notify =3D (struct siw_cq_ctrl *)&cq->queue[size]; + + return 0; + +err_out: + siw_dbg(base_cq->device, "CQ creation failed: %d", rv); + + if (cq->queue) + vfree(cq->queue); + atomic_dec(&sdev->num_cq); + + return rv; +} + /* * siw_poll_cq() * diff --git a/drivers/infiniband/sw/siw/siw_verbs.h b/drivers/infiniband/sw/= siw/siw_verbs.h index e9f4463aecdc..527c356b55af 100644 --- a/drivers/infiniband/sw/siw/siw_verbs.h +++ b/drivers/infiniband/sw/siw/siw_verbs.h @@ -44,6 +44,8 @@ int siw_query_device(struct ib_device *base_dev, struct i= b_device_attr *attr, struct ib_udata *udata); int siw_create_cq(struct ib_cq *base_cq, const struct ib_cq_init_attr *att= r, struct uverbs_attr_bundle *attrs); +int siw_create_user_cq(struct ib_cq *base_cq, const struct ib_cq_init_attr= *attr, + struct uverbs_attr_bundle *attrs); int siw_query_port(struct ib_device *base_dev, u32 port, struct ib_port_attr *attr); int siw_query_gid(struct ib_device *base_dev, u32 port, int idx, --=20 2.52.0