mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Abhijit Gangurde <abhijit.gangurde@amd.com>
To: <jgg@ziepe.ca>, <leon@kernel.org>
Cc: <allen.hubbe@amd.com>, <nikhil.agarwal@amd.com>,
	<linux-rdma@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	"Abhijit Gangurde" <abhijit.gangurde@amd.com>
Subject: [for-next v1 1/2] RDMA/ionic: Accept CQ ring buffers as ioctl umem attributes
Date: Wed, 18 Nov 2026 20:53:12 +0530	[thread overview]
Message-ID: <20261118152313.113714-2-abhijit.gangurde@amd.com> (raw)
In-Reply-To: <20261118152313.113714-1-abhijit.gangurde@amd.com>

Userspace can now pass each enabled CQ ring to create_cq as a
struct ib_uverbs_buffer_desc in a per-UDMA driver attribute, instead
of only as a raw address in ionic_cq_req.

Advertise support with IONIC_CTX_CMASK_CQ_QP_BUF_UMEM in the get_context
response. Register two optional UVERBS_ATTR_UMEM attributes,
IONIC_IB_ATTR_CREATE_CQ_BUF_UMEM_0 and _1, on UVERBS_METHOD_CQ_CREATE
through ibdev->driver_def.

For each UDMA index in udma_mask, ionic_cq_get_user_umem() resolves the
ring buffer:

- No attribute: pin req_cq->addr as before, with DMA_FROM_DEVICE.
- VA descriptor: desc.addr must equal req_cq->addr; pin as before.
- DMABUF descriptor: desc.addr is a page-aligned dma-buf offset; pin
  req_cq->size bytes from desc.fd at that offset.

An attribute for a UDMA index that is not in udma_mask, or any other
buffer type, is rejected with -EINVAL. The kernel admin CQ path passes
no attribute bundle and is unchanged.

ionic_cq_req and ionic_cq_resp are not changed, so older providers
continue to use the write command path.

Signed-off-by: Abhijit Gangurde <abhijit.gangurde@amd.com>
---
 drivers/infiniband/hw/ionic/ionic_admin.c     |  2 +-
 .../infiniband/hw/ionic/ionic_controlpath.c   | 89 ++++++++++++++++---
 drivers/infiniband/hw/ionic/ionic_ibdev.c     | 17 ++++
 drivers/infiniband/hw/ionic/ionic_ibdev.h     |  2 +
 include/uapi/rdma/ionic-abi.h                 |  1 +
 include/uapi/rdma/ionic_user_ioctl_cmds.h     | 15 ++++
 6 files changed, 114 insertions(+), 12 deletions(-)
 create mode 100644 include/uapi/rdma/ionic_user_ioctl_cmds.h

diff --git a/drivers/infiniband/hw/ionic/ionic_admin.c b/drivers/infiniband/hw/ionic/ionic_admin.c
index 0ccd869ad8e6..67ce56acb4dc 100644
--- a/drivers/infiniband/hw/ionic/ionic_admin.c
+++ b/drivers/infiniband/hw/ionic/ionic_admin.c
@@ -575,7 +575,7 @@ static struct ionic_vcq *ionic_create_rdma_admincq(struct ionic_ibdev *dev,
 	vcq->udma_mask = 1;
 	cq = &vcq->cq[0];
 
-	rc = ionic_create_cq_common(vcq, &buf, &attr, NULL, NULL,
+	rc = ionic_create_cq_common(vcq, &buf, &attr, NULL, NULL, NULL,
 				    NULL, 0);
 	if (rc)
 		goto err_init;
diff --git a/drivers/infiniband/hw/ionic/ionic_controlpath.c b/drivers/infiniband/hw/ionic/ionic_controlpath.c
index 8a0a1575a339..11458262f280 100644
--- a/drivers/infiniband/hw/ionic/ionic_controlpath.c
+++ b/drivers/infiniband/hw/ionic/ionic_controlpath.c
@@ -73,11 +73,70 @@ static void ionic_put_cqid(struct ionic_ibdev *dev, u32 cqid)
 	ionic_resid_put(&dev->inuse_cqid, bitid);
 }
 
+static const u16 ionic_cq_buf_attrs[] = {
+	IONIC_IB_ATTR_CREATE_CQ_BUF_UMEM_0,
+	IONIC_IB_ATTR_CREATE_CQ_BUF_UMEM_1,
+};
+
+static int ionic_cq_get_user_umem(struct ionic_ibdev *dev, struct ionic_cq *cq,
+				  const struct ionic_qdesc *req_cq,
+				  const struct uverbs_attr_bundle *attrs,
+				  int udma_idx)
+{
+	struct ib_umem_dmabuf *umem_dmabuf;
+	struct ib_uverbs_buffer_desc desc;
+	struct ib_umem *umem;
+	u16 attr_id;
+	int rc;
+
+	if (udma_idx < 0 || udma_idx >= ARRAY_SIZE(ionic_cq_buf_attrs))
+		return -EINVAL;
+
+	attr_id = ionic_cq_buf_attrs[udma_idx];
+	if (attrs && uverbs_attr_is_valid(attrs, attr_id)) {
+		rc = uverbs_get_buffer_desc(attrs, attr_id, &desc);
+		if (rc)
+			return rc;
+
+		if (desc.length < req_cq->size)
+			return -EINVAL;
+
+		if (desc.type == IB_UVERBS_BUFFER_TYPE_DMABUF) {
+			if (desc.addr & (PAGE_SIZE - 1))
+				return -EINVAL;
+
+			umem_dmabuf = ib_umem_dmabuf_get_pinned(&dev->ibdev,
+								desc.addr,
+								req_cq->size,
+								desc.fd,
+								IB_ACCESS_LOCAL_WRITE);
+			if (IS_ERR(umem_dmabuf))
+				return PTR_ERR(umem_dmabuf);
+
+			cq->umem = &umem_dmabuf->umem;
+			return 0;
+		}
+
+		if (desc.type != IB_UVERBS_BUFFER_TYPE_VA ||
+		    desc.addr != req_cq->addr)
+			return -EINVAL;
+	}
+
+	umem = ib_umem_get_cq_buf_or_va(&dev->ibdev, NULL, req_cq->addr,
+					req_cq->size, IB_ACCESS_LOCAL_WRITE);
+	if (IS_ERR(umem))
+		return PTR_ERR(umem);
+
+	cq->umem = umem;
+	return 0;
+}
+
 int ionic_create_cq_common(struct ionic_vcq *vcq,
 			   struct ionic_tbl_buf *buf,
 			   const struct ib_cq_init_attr *attr,
 			   struct ionic_ctx *ctx,
 			   struct ib_udata *udata,
+			   const struct uverbs_attr_bundle *attrs,
 			   struct ionic_qdesc *req_cq,
 			   int udma_idx)
 {
@@ -110,13 +169,9 @@ int ionic_create_cq_common(struct ionic_vcq *vcq,
 		if (rc)
 			goto err_qdesc;
 
-		cq->umem = ib_umem_get_cq_buf_or_va(&dev->ibdev, NULL,
-						    req_cq->addr, req_cq->size,
-						    IB_ACCESS_LOCAL_WRITE);
-		if (IS_ERR(cq->umem)) {
-			rc = PTR_ERR(cq->umem);
+		rc = ionic_cq_get_user_umem(dev, cq, req_cq, attrs, udma_idx);
+		if (rc)
 			goto err_qdesc;
-		}
 
 		cq->q.ptr = NULL;
 		cq->q.size = req_cq->size;
@@ -428,7 +483,8 @@ int ionic_alloc_ucontext(struct ib_ucontext *ibctx, struct ib_udata *udata)
 	resp.udma_count = dev->lif_cfg.udma_count;
 	resp.expdb_mask = dev->lif_cfg.expdb_mask;
 	resp.rcq_sign_bit = dev->lif_cfg.rcq_sign_bit;
-	resp.comp_mask |= IONIC_CTX_CMASK_IONIC_FLAGS;
+	resp.comp_mask |= IONIC_CTX_CMASK_IONIC_FLAGS |
+			  IONIC_CTX_CMASK_CQ_QP_BUF_UMEM;
 
 	if (dev->lif_cfg.sq_expdb)
 		resp.expdb_qtypes |= IONIC_EXPDB_SQ;
@@ -1362,13 +1418,24 @@ int ionic_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 		goto err_init;
 	}
 
-	for (; udma_idx < dev->lif_cfg.udma_count; ++udma_idx) {
+	for (udma_idx = 0; udma_idx < ARRAY_SIZE(ionic_cq_buf_attrs);
+	     udma_idx++) {
+		if (vcq->udma_mask & BIT(udma_idx))
+			continue;
+
+		if (uverbs_attr_is_valid(attrs, ionic_cq_buf_attrs[udma_idx])) {
+			rc = -EINVAL;
+			udma_idx = 0;
+			goto err_init;
+		}
+	}
+
+	for (udma_idx = 0; udma_idx < dev->lif_cfg.udma_count; ++udma_idx) {
 		if (!(vcq->udma_mask & BIT(udma_idx)))
 			continue;
 
-		rc = ionic_create_cq_common(vcq, &buf, attr, ctx, udata,
-					    &req.cq[udma_idx],
-					    udma_idx);
+		rc = ionic_create_cq_common(vcq, &buf, attr, ctx, udata, attrs,
+					    &req.cq[udma_idx], udma_idx);
 		if (rc)
 			goto err_init;
 
diff --git a/drivers/infiniband/hw/ionic/ionic_ibdev.c b/drivers/infiniband/hw/ionic/ionic_ibdev.c
index b4d4544bb7ac..e64c8e891f30 100644
--- a/drivers/infiniband/hw/ionic/ionic_ibdev.c
+++ b/drivers/infiniband/hw/ionic/ionic_ibdev.c
@@ -11,6 +11,9 @@
 
 #include "ionic_ibdev.h"
 
+#define UVERBS_MODULE_NAME ionic_rdma
+#include <rdma/uverbs_named_ioctl.h>
+
 #define DRIVER_DESCRIPTION "AMD Pensando RoCE HCA driver"
 #define DEVICE_DESCRIPTION "AMD Pensando RoCE HCA"
 
@@ -217,6 +220,18 @@ static void ionic_disassociate_ucontext(struct ib_ucontext *ibcontext)
 	 */
 }
 
+ADD_UVERBS_ATTRIBUTES_SIMPLE(
+	ionic_cq_create,
+	UVERBS_OBJECT_CQ,
+	UVERBS_METHOD_CQ_CREATE,
+	UVERBS_ATTR_UMEM(IONIC_IB_ATTR_CREATE_CQ_BUF_UMEM_0, UA_OPTIONAL),
+	UVERBS_ATTR_UMEM(IONIC_IB_ATTR_CREATE_CQ_BUF_UMEM_1, UA_OPTIONAL));
+
+static const struct uapi_definition ionic_uapi_defs[] = {
+	UAPI_DEF_CHAIN_OBJ_TREE(UVERBS_OBJECT_CQ, &ionic_cq_create),
+	{},
+};
+
 static const struct ib_device_ops ionic_dev_ops = {
 	.owner = THIS_MODULE,
 	.driver_id = RDMA_DRIVER_IONIC,
@@ -376,6 +391,8 @@ static struct ionic_ibdev *ionic_create_ibdev(struct ionic_aux_dev *ionic_adev)
 
 	ionic_stats_init(dev);
 
+	ibdev->driver_def = ionic_uapi_defs;
+
 	rc = ib_register_device(ibdev, "ionic_%d", ibdev->dev.parent);
 	if (rc)
 		goto err_register;
diff --git a/drivers/infiniband/hw/ionic/ionic_ibdev.h b/drivers/infiniband/hw/ionic/ionic_ibdev.h
index 127b79cdfc45..b25fe2f6c4b1 100644
--- a/drivers/infiniband/hw/ionic/ionic_ibdev.h
+++ b/drivers/infiniband/hw/ionic/ionic_ibdev.h
@@ -10,6 +10,7 @@
 #include <rdma/uverbs_ioctl.h>
 
 #include <rdma/ionic-abi.h>
+#include <rdma/ionic_user_ioctl_cmds.h>
 #include <ionic_api.h>
 #include <ionic_regs.h>
 
@@ -491,6 +492,7 @@ int ionic_create_cq_common(struct ionic_vcq *vcq,
 			   const struct ib_cq_init_attr *attr,
 			   struct ionic_ctx *ctx,
 			   struct ib_udata *udata,
+			   const struct uverbs_attr_bundle *attrs,
 			   struct ionic_qdesc *req_cq,
 			   int udma_idx);
 int ionic_post_create_cq_cmd(struct ionic_cq *cq,
diff --git a/include/uapi/rdma/ionic-abi.h b/include/uapi/rdma/ionic-abi.h
index ac48fcd19a4f..f503552bf23a 100644
--- a/include/uapi/rdma/ionic-abi.h
+++ b/include/uapi/rdma/ionic-abi.h
@@ -24,6 +24,7 @@
 
 enum ionic_ctx_resp_comp_mask {
 	IONIC_CTX_CMASK_IONIC_FLAGS = 1 << 0,
+	IONIC_CTX_CMASK_CQ_QP_BUF_UMEM = 1 << 1,
 };
 
 struct ionic_ctx_req {
diff --git a/include/uapi/rdma/ionic_user_ioctl_cmds.h b/include/uapi/rdma/ionic_user_ioctl_cmds.h
new file mode 100644
index 000000000000..98bb8d7238e6
--- /dev/null
+++ b/include/uapi/rdma/ionic_user_ioctl_cmds.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* Copyright (C) 2026, Advanced Micro Devices, Inc */
+
+#ifndef IONIC_USER_IOCTL_CMDS_H
+#define IONIC_USER_IOCTL_CMDS_H
+
+#include <linux/types.h>
+#include <rdma/ib_user_ioctl_cmds.h>
+
+enum ionic_ib_create_cq_attrs {
+	IONIC_IB_ATTR_CREATE_CQ_BUF_UMEM_0 = UVERBS_ID_DRIVER_NS_WITH_UHW,
+	IONIC_IB_ATTR_CREATE_CQ_BUF_UMEM_1,
+};
+
+#endif
-- 
2.43.0


  reply	other threads:[~2026-11-18 15:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 15:23 [for-next v1 0/2] RDMA/ionic: Accept CQ, SQ, and RQ rings as " Abhijit Gangurde
2026-11-18 15:23 ` Abhijit Gangurde [this message]
2026-11-18 15:23 ` [for-next v1 2/2] RDMA/ionic: Accept QP SQ and RQ rings as ioctl " Abhijit Gangurde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261118152313.113714-2-abhijit.gangurde@amd.com \
    --to=abhijit.gangurde@amd.com \
    --cc=allen.hubbe@amd.com \
    --cc=jgg@ziepe.ca \
    --cc=leon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=nikhil.agarwal@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®