RDMA/bnxt_re: Use the common mmap helper functions

Replace the mmap handling function with common code in IB core. Create
rdma_user_mmap_entry for each mmap resource and add to the ib_core mmap
list. Add mmap_free verb support. Also, use rdma_user_mmap_io while
mapping Doorbell pages.

Link: https://lore.kernel.org/r/1686679943-17117-2-git-send-email-selvin.xavier@broadcom.com
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index 053afc9f1256bf3bc335526c907f5af1be095240..136133099a3f3f30515b3ea9f1f9408fe151734b 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -533,12 +533,55 @@ fail:
        return rc;
 }
 
+static struct bnxt_re_user_mmap_entry*
+bnxt_re_mmap_entry_insert(struct bnxt_re_ucontext *uctx, u64 mem_offset,
+                         enum bnxt_re_mmap_flag mmap_flag, u64 *offset)
+{
+       struct bnxt_re_user_mmap_entry *entry;
+       int ret;
+
+       entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+       if (!entry)
+               return NULL;
+
+       entry->mem_offset = mem_offset;
+       entry->mmap_flag = mmap_flag;
+
+       switch (mmap_flag) {
+       case BNXT_RE_MMAP_SH_PAGE:
+               ret = rdma_user_mmap_entry_insert_exact(&uctx->ib_uctx,
+                                                       &entry->rdma_entry, PAGE_SIZE, 0);
+               break;
+       case BNXT_RE_MMAP_UC_DB:
+               ret = rdma_user_mmap_entry_insert(&uctx->ib_uctx,
+                                                 &entry->rdma_entry, PAGE_SIZE);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       if (ret) {
+               kfree(entry);
+               return NULL;
+       }
+       if (offset)
+               *offset = rdma_user_mmap_get_offset(&entry->rdma_entry);
+
+       return entry;
+}
+
 /* Protection Domains */
 int bnxt_re_dealloc_pd(struct ib_pd *ib_pd, struct ib_udata *udata)
 {
        struct bnxt_re_pd *pd = container_of(ib_pd, struct bnxt_re_pd, ib_pd);
        struct bnxt_re_dev *rdev = pd->rdev;
 
+       if (udata) {
+               rdma_user_mmap_entry_remove(pd->pd_db_mmap);
+               pd->pd_db_mmap = NULL;
+       }
+
        bnxt_re_destroy_fence_mr(pd);
 
        if (pd->qplib_pd.id) {
@@ -557,7 +600,8 @@ int bnxt_re_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
        struct bnxt_re_ucontext *ucntx = rdma_udata_to_drv_context(
                udata, struct bnxt_re_ucontext, ib_uctx);
        struct bnxt_re_pd *pd = container_of(ibpd, struct bnxt_re_pd, ib_pd);
-       int rc;
+       struct bnxt_re_user_mmap_entry *entry = NULL;
+       int rc = 0;
 
        pd->rdev = rdev;
        if (bnxt_qplib_alloc_pd(&rdev->qplib_res.pd_tbl, &pd->qplib_pd)) {
@@ -567,7 +611,7 @@ int bnxt_re_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
        }
 
        if (udata) {
-               struct bnxt_re_pd_resp resp;
+               struct bnxt_re_pd_resp resp = {};
 
                if (!ucntx->dpi.dbr) {
                        /* Allocate DPI in alloc_pd to avoid failing of
@@ -584,12 +628,21 @@ int bnxt_re_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
                resp.pdid = pd->qplib_pd.id;
                /* Still allow mapping this DBR to the new user PD. */
                resp.dpi = ucntx->dpi.dpi;
-               resp.dbr = (u64)ucntx->dpi.umdbr;
 
-               rc = ib_copy_to_udata(udata, &resp, sizeof(resp));
+               entry = bnxt_re_mmap_entry_insert(ucntx, (u64)ucntx->dpi.umdbr,
+                                                 BNXT_RE_MMAP_UC_DB, &resp.dbr);
+
+               if (!entry) {
+                       rc = -ENOMEM;
+                       goto dbfail;
+               }
+
+               pd->pd_db_mmap = &entry->rdma_entry;
+
+               rc = ib_copy_to_udata(udata, &resp, min(sizeof(resp), udata->outlen));
                if (rc) {
-                       ibdev_err(&rdev->ibdev,
-                                 "Failed to copy user response\n");
+                       rdma_user_mmap_entry_remove(pd->pd_db_mmap);
+                       rc = -EFAULT;
                        goto dbfail;
                }
        }
@@ -3964,6 +4017,7 @@ int bnxt_re_alloc_ucontext(struct ib_ucontext *ctx, struct ib_udata *udata)
                container_of(ctx, struct bnxt_re_ucontext, ib_uctx);
        struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);
        struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;
+       struct bnxt_re_user_mmap_entry *entry;
        struct bnxt_re_uctx_resp resp = {};
        u32 chip_met_rev_num = 0;
        int rc;
@@ -4002,6 +4056,13 @@ int bnxt_re_alloc_ucontext(struct ib_ucontext *ctx, struct ib_udata *udata)
        resp.comp_mask |= BNXT_RE_UCNTX_CMASK_HAVE_MODE;
        resp.mode = rdev->chip_ctx->modes.wqe_mode;
 
+       entry = bnxt_re_mmap_entry_insert(uctx, 0, BNXT_RE_MMAP_SH_PAGE, NULL);
+       if (!entry) {
+               rc = -ENOMEM;
+               goto cfail;
+       }
+       uctx->shpage_mmap = &entry->rdma_entry;
+
        rc = ib_copy_to_udata(udata, &resp, min(udata->outlen, sizeof(resp)));
        if (rc) {
                ibdev_err(ibdev, "Failed to copy user context");
@@ -4025,6 +4086,8 @@ void bnxt_re_dealloc_ucontext(struct ib_ucontext *ib_uctx)
 
        struct bnxt_re_dev *rdev = uctx->rdev;
 
+       rdma_user_mmap_entry_remove(uctx->shpage_mmap);
+       uctx->shpage_mmap = NULL;
        if (uctx->shpg)
                free_page((unsigned long)uctx->shpg);
 
@@ -4044,27 +4107,43 @@ int bnxt_re_mmap(struct ib_ucontext *ib_uctx, struct vm_area_struct *vma)
        struct bnxt_re_ucontext *uctx = container_of(ib_uctx,
                                                   struct bnxt_re_ucontext,
                                                   ib_uctx);
-       struct bnxt_re_dev *rdev = uctx->rdev;
+       struct bnxt_re_user_mmap_entry *bnxt_entry;
+       struct rdma_user_mmap_entry *rdma_entry;
+       int ret = 0;
        u64 pfn;
 
-       if (vma->vm_end - vma->vm_start != PAGE_SIZE)
+       rdma_entry = rdma_user_mmap_entry_get(&uctx->ib_uctx, vma);
+       if (!rdma_entry)
                return -EINVAL;
 
-       if (vma->vm_pgoff) {
-               vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-               if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
-                                      PAGE_SIZE, vma->vm_page_prot)) {
-                       ibdev_err(&rdev->ibdev, "Failed to map DPI");
-                       return -EAGAIN;
-               }
-       } else {
-               pfn = virt_to_phys(uctx->shpg) >> PAGE_SHIFT;
-               if (remap_pfn_range(vma, vma->vm_start,
-                                   pfn, PAGE_SIZE, vma->vm_page_prot)) {
-                       ibdev_err(&rdev->ibdev, "Failed to map shared page");
-                       return -EAGAIN;
-               }
+       bnxt_entry = container_of(rdma_entry, struct bnxt_re_user_mmap_entry,
+                                 rdma_entry);
+
+       switch (bnxt_entry->mmap_flag) {
+       case BNXT_RE_MMAP_UC_DB:
+               pfn = bnxt_entry->mem_offset >> PAGE_SHIFT;
+               ret = rdma_user_mmap_io(ib_uctx, vma, pfn, PAGE_SIZE,
+                                       pgprot_noncached(vma->vm_page_prot),
+                               rdma_entry);
+               break;
+       case BNXT_RE_MMAP_SH_PAGE:
+               ret = vm_insert_page(vma, vma->vm_start, virt_to_page(uctx->shpg));
+               break;
+       default:
+               ret = -EINVAL;
+               break;
        }
 
-       return 0;
+       rdma_user_mmap_entry_put(rdma_entry);
+       return ret;
+}
+
+void bnxt_re_mmap_free(struct rdma_user_mmap_entry *rdma_entry)
+{
+       struct bnxt_re_user_mmap_entry *bnxt_entry;
+
+       bnxt_entry = container_of(rdma_entry, struct bnxt_re_user_mmap_entry,
+                                 rdma_entry);
+
+       kfree(bnxt_entry);
 }

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.h b/drivers/infiniband/hw/bnxt_re/ib_verbs.h
index 31f7e34040f79d25705aa458f64c85554a9b98b5..dcd31aefad4c89ef9469a5d7a466fdc48a6d40a1 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.h
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.h
@@ -60,6 +60,7 @@ struct bnxt_re_pd {
        struct bnxt_re_dev      *rdev;
        struct bnxt_qplib_pd    qplib_pd;
        struct bnxt_re_fence_data fence;
+       struct rdma_user_mmap_entry *pd_db_mmap;
 };
 
 struct bnxt_re_ah {
@@ -136,6 +137,18 @@ struct bnxt_re_ucontext {
        struct bnxt_qplib_dpi   dpi;
        void                    *shpg;
        spinlock_t              sh_lock;        /* protect shpg */
+       struct rdma_user_mmap_entry *shpage_mmap;
+};
+
+enum bnxt_re_mmap_flag {
+       BNXT_RE_MMAP_SH_PAGE,
+       BNXT_RE_MMAP_UC_DB,
+};
+
+struct bnxt_re_user_mmap_entry {
+       struct rdma_user_mmap_entry rdma_entry;
+       u64 mem_offset;
+       u8 mmap_flag;
 };
 
 static inline u16 bnxt_re_get_swqe_size(int nsge)
@@ -213,6 +226,8 @@ struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
 int bnxt_re_alloc_ucontext(struct ib_ucontext *ctx, struct ib_udata *udata);
 void bnxt_re_dealloc_ucontext(struct ib_ucontext *context);
 int bnxt_re_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
+void bnxt_re_mmap_free(struct rdma_user_mmap_entry *rdma_entry);
+
 
 unsigned long bnxt_re_lock_cqs(struct bnxt_re_qp *qp);
 void bnxt_re_unlock_cqs(struct bnxt_re_qp *qp, unsigned long flags);

diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index a2c7d3f212793eb8be625e49bf9e400e63a12a77..acef429ef78a0ff77271e11213bde14ffdfe4203 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -545,6 +545,7 @@ static const struct ib_device_ops bnxt_re_dev_ops = {
        .get_port_immutable = bnxt_re_get_port_immutable,
        .map_mr_sg = bnxt_re_map_mr_sg,
        .mmap = bnxt_re_mmap,
+       .mmap_free = bnxt_re_mmap_free,
        .modify_qp = bnxt_re_modify_qp,
        .modify_srq = bnxt_re_modify_srq,
        .poll_cq = bnxt_re_poll_cq,

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.c b/drivers/infiniband/hw/bnxt_re/qplib_res.c
index 126d4f26f75ad722f9f71857b0711e3e31b0f451..920ab8704c8b567720bab51c39fd3913d72b5e28 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_res.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_res.c
@@ -813,7 +813,7 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res     *res,
        return 0;
 
 unmap_io:
-       pci_iounmap(res->pdev, dpit->dbr_bar_reg_iomem);
+       iounmap(dpit->dbr_bar_reg_iomem);
        dpit->dbr_bar_reg_iomem = NULL;
        return -ENOMEM;
 }