IB/rdmavt: Add mmap related functions

The mmap data structure was moved in a previous commit. This patch now
pulls in the related functions.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rdmavt/mmap.c b/drivers/infiniband/sw/rdmavt/mmap.c
index d09f3a05a74777659fd491627adc5bdf60bbbd89..fc30ff7f24ea665127137f57b954f96c93f1a153 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/mmap.c
+++ b/drivers/infiniband/sw/rdmavt/mmap.c
@@ -46,8 +46,61 @@
  */
 
 #include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/mm.h>
+#include <asm/pgtable.h>
 #include "mmap.h"
 
+void rvt_mmap_init(struct rvt_dev_info *rdi)
+{
+       INIT_LIST_HEAD(&rdi->pending_mmaps);
+       spin_lock_init(&rdi->pending_lock);
+       rdi->mmap_offset = PAGE_SIZE;
+       spin_lock_init(&rdi->mmap_offset_lock);
+}
+
+/**
+ * rvt_release_mmap_info - free mmap info structure
+ * @ref: a pointer to the kref within struct rvt_mmap_info
+ */
+void rvt_release_mmap_info(struct kref *ref)
+{
+       struct rvt_mmap_info *ip =
+               container_of(ref, struct rvt_mmap_info, ref);
+       struct rvt_dev_info *rdi = ib_to_rvt(ip->context->device);
+
+       spin_lock_irq(&rdi->pending_lock);
+       list_del(&ip->pending_mmaps);
+       spin_unlock_irq(&rdi->pending_lock);
+
+       vfree(ip->obj);
+       kfree(ip);
+}
+EXPORT_SYMBOL(rvt_release_mmap_info);
+
+/*
+ * open and close keep track of how many times the CQ is mapped,
+ * to avoid releasing it.
+ */
+static void rvt_vma_open(struct vm_area_struct *vma)
+{
+       struct rvt_mmap_info *ip = vma->vm_private_data;
+
+       kref_get(&ip->ref);
+}
+
+static void rvt_vma_close(struct vm_area_struct *vma)
+{
+       struct rvt_mmap_info *ip = vma->vm_private_data;
+
+       kref_put(&ip->ref, rvt_release_mmap_info);
+}
+
+static const struct vm_operations_struct rvt_vm_ops = {
+       .open = rvt_vma_open,
+       .close = rvt_vma_close,
+};
+
 /**
  * rvt_mmap - create a new mmap region
  * @context: the IB user context of the process making the mmap() call
@@ -56,5 +109,90 @@
  */
 int rvt_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
 {
-       return -EOPNOTSUPP;
+       struct rvt_dev_info *rdi = ib_to_rvt(context->device);
+       unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+       unsigned long size = vma->vm_end - vma->vm_start;
+       struct rvt_mmap_info *ip, *pp;
+       int ret = -EINVAL;
+
+       /*
+        * Search the device's list of objects waiting for a mmap call.
+        * Normally, this list is very short since a call to create a
+        * CQ, QP, or SRQ is soon followed by a call to mmap().
+        */
+       spin_lock_irq(&rdi->pending_lock);
+       list_for_each_entry_safe(ip, pp, &rdi->pending_mmaps,
+                                pending_mmaps) {
+               /* Only the creator is allowed to mmap the object */
+               if (context != ip->context || (__u64)offset != ip->offset)
+                       continue;
+               /* Don't allow a mmap larger than the object. */
+               if (size > ip->size)
+                       break;
+
+               list_del_init(&ip->pending_mmaps);
+               spin_unlock_irq(&rdi->pending_lock);
+
+               ret = remap_vmalloc_range(vma, ip->obj, 0);
+               if (ret)
+                       goto done;
+               vma->vm_ops = &rvt_vm_ops;
+               vma->vm_private_data = ip;
+               rvt_vma_open(vma);
+               goto done;
+       }
+       spin_unlock_irq(&rdi->pending_lock);
+done:
+       return ret;
+}
+EXPORT_SYMBOL(rvt_mmap);
+
+/*
+ * Allocate information for hfi1_mmap
+ */
+struct rvt_mmap_info *rvt_create_mmap_info(struct rvt_dev_info *rdi,
+                                          u32 size,
+                                          struct ib_ucontext *context,
+                                          void *obj)
+{
+       struct rvt_mmap_info *ip;
+
+       ip = kmalloc(sizeof(*ip), GFP_KERNEL);
+       if (!ip)
+               return ip;
+
+       size = PAGE_ALIGN(size);
+
+       spin_lock_irq(&rdi->mmap_offset_lock);
+       if (rdi->mmap_offset == 0)
+               rdi->mmap_offset = PAGE_SIZE;
+       ip->offset = rdi->mmap_offset;
+       rdi->mmap_offset += size;
+       spin_unlock_irq(&rdi->mmap_offset_lock);
+
+       INIT_LIST_HEAD(&ip->pending_mmaps);
+       ip->size = size;
+       ip->context = context;
+       ip->obj = obj;
+       kref_init(&ip->ref);
+
+       return ip;
+}
+EXPORT_SYMBOL(rvt_create_mmap_info);
+
+void rvt_update_mmap_info(struct rvt_dev_info *rdi, struct rvt_mmap_info *ip,
+                         u32 size, void *obj)
+{
+       size = PAGE_ALIGN(size);
+
+       spin_lock_irq(&rdi->mmap_offset_lock);
+       if (rdi->mmap_offset == 0)
+               rdi->mmap_offset = PAGE_SIZE;
+       ip->offset = rdi->mmap_offset;
+       rdi->mmap_offset += size;
+       spin_unlock_irq(&rdi->mmap_offset_lock);
+
+       ip->size = size;
+       ip->obj = obj;
 }
+EXPORT_SYMBOL(rvt_update_mmap_info);

diff --git a/drivers/infiniband/sw/rdmavt/mmap.h b/drivers/infiniband/sw/rdmavt/mmap.h
index 94f6377cef3cc2b9cac466c8e0cdd35d49a94cd5..3513e25a8491a781b8d7e1b19e95eb2865afb8b6 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/mmap.h
+++ b/drivers/infiniband/sw/rdmavt/mmap.h
@@ -50,6 +50,6 @@
 
 #include <rdma/rdma_vt.h>
 
-int rvt_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
+void rvt_mmap_init(struct rvt_dev_info *rdi);
 
 #endif          /* DEF_RDMAVTMMAP_H */

diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
index f2d995d2f62cbe44a037952bb477003f4cbe4eb5..ab4105a8d120449f24bb8f5bc8eff5d2bffc698a 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/vt.c
+++ b/drivers/infiniband/sw/rdmavt/vt.c
@@ -241,6 +241,7 @@ int rvt_register_device(struct rvt_dev_info *rdi)
        }
 
        /* Once we get past here we can use the rvt_pr macros */
+       rvt_mmap_init(rdi);
 
        /* Dev Ops */
        CHECK_DRIVER_OVERRIDE(rdi, query_device);

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 950c2910e3f45ade898ede508a8bd01451be8c07..fd25d2309ee3c256567db4363463d0537293f1e0 100644 (file)
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -254,6 +254,12 @@ struct rvt_dev_info {
        struct rvt_ibport **ports;
 
        struct rvt_qp_ibdev *qp_dev;
+
+       /* memory maps */
+       struct list_head pending_mmaps;
+       spinlock_t mmap_offset_lock; /* protect mmap_offset */
+       u32 mmap_offset;
+       spinlock_t pending_lock; /* protect pending mmap list */
 };
 
 static inline struct rvt_pd *ibpd_to_rvtpd(struct ib_pd *ibpd)
@@ -285,4 +291,13 @@ int rvt_rkey_ok(struct rvt_qp *qp, struct rvt_sge *sge,
                u32 len, u64 vaddr, u32 rkey, int acc);
 int rvt_lkey_ok(struct rvt_lkey_table *rkt, struct rvt_pd *pd,
                struct rvt_sge *isge, struct ib_sge *sge, int acc);
+int rvt_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
+void rvt_release_mmap_info(struct kref *ref);
+struct rvt_mmap_info *rvt_create_mmap_info(struct rvt_dev_info *rdi,
+                                          u32 size,
+                                          struct ib_ucontext *context,
+                                          void *obj);
+void rvt_update_mmap_info(struct rvt_dev_info *rdi, struct rvt_mmap_info *ip,
+                         u32 size, void *obj);
+
 #endif          /* DEF_RDMA_VT_H */