Skip to contentSkip to conversation

RDMA/irdma: Add support for dmabuf pin memory regions

PATCH Superseded Zhu Yanjun 3 participants 3 messages Jan 30, 2023 – Feb 1, 2023

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Zhu Yanjun

author
#0 lore raw

PATCH v2 1/1 RDMA/irdma: Add support for dmabuf pin memory regions

From: Zhu Yanjun <[email protected]>

This is a followup to the EFA dmabuf[1]. Irdma driver currently does not support on-demand-paging(ODP). So it uses habanalabs as the dmabuf exporter, and irdma as the importer to allow for peer2peer access through libibverbs.

In this commit, the function ib_umem_dmabuf_get_pinned() is used. This function is introduced in EFA dmabuf[1] which allows the driver to get a dmabuf umem which is pinned and does not require move_notify callback implementation. The returned umem is pinned and DMA mapped like standard cpu umems, and is released through ib_umem_release().

[1]https://lore.kernel.org/lkml/[email protected]/t/

---
V1->V2: Thanks Shiraz Saleem, he gave me a lot of good suggestions.
This commit is based on the shared functions from refactored irdma_reg_user_mr.

---
 drivers/infiniband/hw/irdma/verbs.c | 43 +++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
drivers/infiniband/hw/irdma/verbs.c +43 -0
index 6982f38596c8..a638861689c2 100644
@@ -2977,6 +2977,48 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 	return ERR_PTR(err);
 }
 
+static struct ib_mr *irdma_reg_user_mr_dmabuf(struct ib_pd *pd, u64 start,
+					      u64 len, u64 virt,
+					      int fd, int access,
+					      struct ib_udata *udata)
+{
+	struct irdma_device *iwdev = to_iwdev(pd->device);
+	struct ib_umem_dmabuf *umem_dmabuf = NULL;
+	struct irdma_mr *iwmr = NULL;
+	int err;
+
+	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
+		return ERR_PTR(-EINVAL);
+
+	if (udata->inlen < IRDMA_MEM_REG_MIN_REQ_LEN)
+		return ERR_PTR(-EINVAL);
+
+	umem_dmabuf = ib_umem_dmabuf_get_pinned(pd->device, start, len, fd, access);
+	if (IS_ERR(umem_dmabuf)) {
+		err = PTR_ERR(umem_dmabuf);
+		ibdev_dbg(&iwdev->ibdev, "Failed to get dmabuf umem[%d]\n", err);
+		return ERR_PTR(err);
+	}
+
+	iwmr = irdma_alloc_iwmr(&umem_dmabuf->umem, pd, virt, IRDMA_MEMREG_TYPE_MEM);
+	if (IS_ERR(iwmr)) {
+		ib_umem_release(&umem_dmabuf->umem);
+		return (struct ib_mr *)iwmr;
+	}
+
+	err = irdma_reg_user_mr_type_mem(iwmr, access);
+	if (err)
+		goto error;
+
+	return &iwmr->ibmr;
+
+error:
+	irdma_free_iwmr(iwmr);
+	ib_umem_release(&umem_dmabuf->umem);
+
+	return ERR_PTR(err);
+}
+
 /**
  * irdma_reg_phys_mr - register kernel physical memory
  * @pd: ibpd pointer
@@ -4483,6 +4525,7 @@ static const struct ib_device_ops irdma_dev_ops = {
 	.query_port = irdma_query_port,
 	.query_qp = irdma_query_qp,
 	.reg_user_mr = irdma_reg_user_mr,
+	.reg_user_mr_dmabuf = irdma_reg_user_mr_dmabuf,
 	.req_notify_cq = irdma_req_notify_cq,
 	.resize_cq = irdma_resize_cq,
 	INIT_RDMA_OBJ_SIZE(ib_pd, irdma_pd, ibpd),
Signature · 1 line
2.27.0
maintainer
#1 lore raw
Quoted 30 lines · Zhu Yanjun

From: Zhu Yanjun <[email protected]>

This is a followup to the EFA dmabuf[1]. Irdma driver currently does not support on-demand-paging(ODP). So it uses habanalabs as the dmabuf exporter, and irdma as the importer to allow for peer2peer access through libibverbs.

In this commit, the function ib_umem_dmabuf_get_pinned() is used. This function is introduced in EFA dmabuf[1] which allows the driver to get a dmabuf umem which is pinned and does not require move_notify callback implementation. The returned umem is pinned and DMA mapped like standard cpu umems, and is released through ib_umem_release().

[1]https://lore.kernel.org/lkml/[email protected]/t/

---
V1->V2: Thanks Shiraz Saleem, he gave me a lot of good suggestions.
This commit is based on the shared functions from refactored irdma_reg_user_mr.

---
 drivers/infiniband/hw/irdma/verbs.c | 43 +++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index 6982f38596c8..a638861689c2 100644
@@ -2977,6 +2977,48 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 	return ERR_PTR(err);

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 2987

Quoted 10 lines
drivers/infiniband/hw/irdma/verbs.c +8 -0
 }
 
+static struct ib_mr *irdma_reg_user_mr_dmabuf(struct ib_pd *pd, u64 start,
+					      u64 len, u64 virt,
+					      int fd, int access,
+					      struct ib_udata *udata)
+{
+	struct irdma_device *iwdev = to_iwdev(pd->device);
+	struct ib_umem_dmabuf *umem_dmabuf = NULL;
+	struct irdma_mr *iwmr = NULL;

No reason to null initialize these

Quoted 9 lines
drivers/infiniband/hw/irdma/verbs.c +9 -0
+	int err;
+
+	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
+		return ERR_PTR(-EINVAL);
+
+	if (udata->inlen < IRDMA_MEM_REG_MIN_REQ_LEN)
+		return ERR_PTR(-EINVAL);
+
+	umem_dmabuf = ib_umem_dmabuf_get_pinned(pd->device, start, len, fd, access);

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3006

Quoted 10 lines
drivers/infiniband/hw/irdma/verbs.c +10 -0
+	if (IS_ERR(umem_dmabuf)) {
+		err = PTR_ERR(umem_dmabuf);
+		ibdev_dbg(&iwdev->ibdev, "Failed to get dmabuf umem[%d]\n", err);
+		return ERR_PTR(err);
+	}
+
+	iwmr = irdma_alloc_iwmr(&umem_dmabuf->umem, pd, virt, IRDMA_MEMREG_TYPE_MEM);
+	if (IS_ERR(iwmr)) {
+		ib_umem_release(&umem_dmabuf->umem);
+		return (struct ib_mr *)iwmr;

err = PTR_ERR(iwmr);
goto err_release;

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3015

Quoted 9 lines
drivers/infiniband/hw/irdma/verbs.c +9 -0
+	}
+
+	err = irdma_reg_user_mr_type_mem(iwmr, access);
+	if (err)
+		goto error;
+
+	return &iwmr->ibmr;
+
+error:

err_iwmr:

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3016

Quoted 1 line
drivers/infiniband/hw/irdma/verbs.c +1 -0
+	irdma_free_iwmr(iwmr);

err_release:

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3020

Quoted 4 lines
drivers/infiniband/hw/irdma/verbs.c +4 -0
+	ib_umem_release(&umem_dmabuf->umem);
+
+	return ERR_PTR(err);
+}

Jason

#2 lore raw
Quoted 33 lines · Jason Gunthorpe
Quoted 32 lines · Zhu Yanjun

From: Zhu Yanjun <[email protected]>

This is a followup to the EFA dmabuf[1]. Irdma driver currently does not support on-demand-paging(ODP). So it uses habanalabs as the dmabuf exporter, and irdma as the importer to allow for peer2peer access through libibverbs.

In this commit, the function ib_umem_dmabuf_get_pinned() is used. This function is introduced in EFA dmabuf[1] which allows the driver to get a dmabuf umem which is pinned and does not require move_notify callback implementation. The returned umem is pinned and DMA mapped like standard cpu umems, and is released through ib_umem_release().

[1]https://lore.kernel.org/lkml/[email protected]/t/

---
V1->V2: Thanks Shiraz Saleem, he gave me a lot of good suggestions.
This commit is based on the shared functions from refactored irdma_reg_user_mr.

---
  drivers/infiniband/hw/irdma/verbs.c | 43 +++++++++++++++++++++++++++++
  1 file changed, 43 insertions(+)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index 6982f38596c8..a638861689c2 100644
@@ -2977,6 +2977,48 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
  	return ERR_PTR(err);
  }
 
Quoted 9 lines

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 2987

Quoted 8 lines
drivers/infiniband/hw/irdma/verbs.c +8 -0
+static struct ib_mr *irdma_reg_user_mr_dmabuf(struct ib_pd *pd, u64 start,
+					      u64 len, u64 virt,
+					      int fd, int access,
+					      struct ib_udata *udata)
+{
+	struct irdma_device *iwdev = to_iwdev(pd->device);
+	struct ib_umem_dmabuf *umem_dmabuf = NULL;
+	struct irdma_mr *iwmr = NULL;

No reason to null initialize these

Got it.

Quoted 14 lines
Quoted 14 lines
drivers/infiniband/hw/irdma/verbs.c +13 -0
+	int err;
+
+	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
+		return ERR_PTR(-EINVAL);
+
+	if (udata->inlen < IRDMA_MEM_REG_MIN_REQ_LEN)
+		return ERR_PTR(-EINVAL);
+
+	umem_dmabuf = ib_umem_dmabuf_get_pinned(pd->device, start, len, fd, access);
+	if (IS_ERR(umem_dmabuf)) {
+		err = PTR_ERR(umem_dmabuf);
+		ibdev_dbg(&iwdev->ibdev, "Failed to get dmabuf umem[%d]\n", err);
+		return ERR_PTR(err);
Quoted 8 lines

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3006

Quoted 6 lines
drivers/infiniband/hw/irdma/verbs.c +6 -0
+	}
+
+	iwmr = irdma_alloc_iwmr(&umem_dmabuf->umem, pd, virt, IRDMA_MEMREG_TYPE_MEM);
+	if (IS_ERR(iwmr)) {
+		ib_umem_release(&umem_dmabuf->umem);
+		return (struct ib_mr *)iwmr;

err = PTR_ERR(iwmr);
goto err_release;

Got it.

Quoted 11 lines

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3015

Quoted 10 lines
drivers/infiniband/hw/irdma/verbs.c +9 -0
+	}
+
+	err = irdma_reg_user_mr_type_mem(iwmr, access);
+	if (err)
+		goto error;
+
+	return &iwmr->ibmr;
+
+error:

err_iwmr:

Quoted 2 lines

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3016

Quoted 1 line
drivers/infiniband/hw/irdma/verbs.c +1 -0
+	irdma_free_iwmr(iwmr);

err_release:

Got it. I will send the latest commit very soon.

Zhu Yanjun

Quoted 6 lines

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3020

Quoted 5 lines
drivers/infiniband/hw/irdma/verbs.c +4 -0
+	ib_umem_release(&umem_dmabuf->umem);
+
+	return ERR_PTR(err);
+}

Jason