Merge tag 'char-misc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[sfrench/cifs-2.6.git] / drivers / misc / habanalabs / common / memory.c

diff --git a/drivers/misc/habanalabs/common/memory.c b/drivers/misc/habanalabs/common/memory.c
index 7cadf75ebb814cca37f6e9923fbacb34e6a9fa45..1f5910517b0e3ad565d6179fc8d481598fca57ba 100644 (file)
--- a/drivers/misc/habanalabs/common/memory.c
+++ b/drivers/misc/habanalabs/common/memory.c
@@ -1552,45 +1552,40 @@ 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 | FOLL_LONGTERM,
+                                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;
 }
 
@@ -1676,8 +1671,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)
@@ -1685,15 +1678,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);