misc/habana: Stop using frame_vector helpers

All we need are a pages array, pin_user_pages_fast can give us that
directly. Plus this avoids the entire raw pfn side of get_vaddr_frames.

Note that pin_user_pages_fast is a safe replacement despite the
seeming lack of checking for vma->vm_flasg & (VM_IO | VM_PFNMAP). Such
ptes are marked with pte_mkspecial (which pup_fast rejects in the
fastpath), and only architectures supporting that support the
pin_user_pages_fast fastpath.

Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: linux-mm@kvack.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-media@vger.kernel.org
Cc: Oded Gabbay <oded.gabbay@gmail.com>
Cc: Omer Shpigelman <oshpigelman@habana.ai>
Cc: Ofir Bitton <obitton@habana.ai>
Cc: Tomer Tayar <ttayar@habana.ai>
Cc: Moti Haimovski <mhaimovski@habana.ai>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Pawel Piskorski <ppiskorski@habana.ai>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201127164131.2244124-4-daniel.vetter@ffwll.ch

diff --git a/drivers/misc/habanalabs/Kconfig b/drivers/misc/habanalabs/Kconfig
index 1640340..293d798 100644 (file)
--- a/drivers/misc/habanalabs/Kconfig
+++ b/drivers/misc/habanalabs/Kconfig
@@ -6,7 +6,6 @@
 config HABANA_AI
        tristate "HabanaAI accelerators (habanalabs)"
        depends on PCI && HAS_IOMEM
-       select FRAME_VECTOR
        select GENERIC_ALLOCATOR
        select HWMON
        help

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index e0d7f5f..3ef1c73 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -1089,7 +1089,8 @@ struct hl_ctx_mgr {
  * struct hl_userptr - memory mapping chunk information
  * @vm_type: type of the VM.
  * @job_node: linked-list node for hanging the object on the Job's list.
- * @vec: pointer to the frame vector.
+ * @pages: pointer to struct page array
+ * @npages: size of @pages array
  * @sgt: pointer to the scatter-gather table that holds the pages.
  * @dir: for DMA unmapping, the direction must be supplied, so save it.
  * @debugfs_list: node in debugfs list of command submissions.
@@ -1100,7 +1101,8 @@ struct hl_ctx_mgr {
 struct hl_userptr {
        enum vm_type_t          vm_type; /* must be first */
        struct list_head        job_node;
-       struct frame_vector     *vec;
+       struct page             **pages;
+       unsigned int            npages;
        struct sg_table         *sgt;
        enum dma_data_direction dir;
        struct list_head        debugfs_list;

diff --git a/drivers/misc/habanalabs/common/memory.c b/drivers/misc/habanalabs/common/memory.c
index cbe9da4..c4ddba7 100644 (file)
--- a/drivers/misc/habanalabs/common/memory.c
+++ b/drivers/misc/habanalabs/common/memory.c
@@ -1430,45 +1430,39 @@ static int get_user_memory(struct hl_device *hdev, u64 addr, u64 size,
                return -EFAULT;
        }
 
-       userptr->vec = frame_vector_create(npages);
-       if (!userptr->vec) {
-               dev_err(hdev->dev, "Failed to create frame vector\n");
+       userptr->pages = kvmalloc_array(npages, sizeof(*userptr->pages),
+                                       GFP_KERNEL);
+       if (!userptr->pages)
                return -ENOMEM;
-       }
 
-       rc = get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE,
-                               userptr->vec);
+       rc = pin_user_pages_fast(start, npages, FOLL_FORCE | FOLL_WRITE,
+                                userptr->pages);
 
        if (rc != npages) {
                dev_err(hdev->dev,
                        "Failed to map host memory, user ptr probably wrong\n");
                if (rc < 0)
-                       goto destroy_framevec;
-               rc = -EFAULT;
-               goto put_framevec;
-       }
-
-       if (frame_vector_to_pages(userptr->vec) < 0) {
-               dev_err(hdev->dev,
-                       "Failed to translate frame vector to pages\n");
+                       goto destroy_pages;
+               npages = rc;
                rc = -EFAULT;
-               goto put_framevec;
+               goto put_pages;
        }
+       userptr->npages = npages;
 
        rc = sg_alloc_table_from_pages(userptr->sgt,
-                                       frame_vector_pages(userptr->vec),
-                                       npages, offset, size, GFP_ATOMIC);
+                                      userptr->pages,
+                                      npages, offset, size, GFP_ATOMIC);
        if (rc < 0) {
                dev_err(hdev->dev, "failed to create SG table from pages\n");
-               goto put_framevec;
+               goto put_pages;
        }
 
        return 0;
 
-put_framevec:
-       put_vaddr_frames(userptr->vec);
-destroy_framevec:
-       frame_vector_destroy(userptr->vec);
+put_pages:
+       unpin_user_pages(userptr->pages, npages);
+destroy_pages:
+       kvfree(userptr->pages);
        return rc;
 }
 
@@ -1554,8 +1548,6 @@ free_sgt:
  */
 void hl_unpin_host_memory(struct hl_device *hdev, struct hl_userptr *userptr)
 {
-       struct page **pages;
-
        hl_debugfs_remove_userptr(hdev, userptr);
 
        if (userptr->dma_mapped)
@@ -1563,15 +1555,8 @@ void hl_unpin_host_memory(struct hl_device *hdev, struct hl_userptr *userptr)
                                                        userptr->sgt->nents,
                                                        userptr->dir);
 
-       pages = frame_vector_pages(userptr->vec);
-       if (!IS_ERR(pages)) {
-               int i;
-
-               for (i = 0; i < frame_vector_count(userptr->vec); i++)
-                       set_page_dirty_lock(pages[i]);
-       }
-       put_vaddr_frames(userptr->vec);
-       frame_vector_destroy(userptr->vec);
+       unpin_user_pages_dirty_lock(userptr->pages, userptr->npages, true);
+       kvfree(userptr->pages);
 
        list_del(&userptr->job_node);