]> git.baikalelectronics.ru Git - kernel.git/commitdiff
xen/gntdev.c: Convert get_user_pages*() to pin_user_pages*()
authorSouptick Joarder <jrdr.linux@gmail.com>
Sun, 6 Sep 2020 06:51:54 +0000 (12:21 +0530)
committerBoris Ostrovsky <boris.ostrovsky@oracle.com>
Sun, 4 Oct 2020 23:41:33 +0000 (18:41 -0500)
In 2019, we introduced pin_user_pages*() and now we are converting
get_user_pages*() to the new API as appropriate. [1] & [2] could
be referred for more information. This is case 5 as per document [1].

[1] Documentation/core-api/pin_user_pages.rst

[2] "Explicit pinning of user-space pages":
        https://lwn.net/Articles/807108/

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Link: https://lore.kernel.org/r/1599375114-32360-2-git-send-email-jrdr.linux@gmail.com
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
drivers/xen/gntdev.c

index 1f32db7b72b2cb4e79acfe578f99bddaf5443f7d..a36b71286bcf8fb64c115bd12c2618874fdb127a 100644 (file)
@@ -731,7 +731,7 @@ static int gntdev_get_page(struct gntdev_copy_batch *batch, void __user *virt,
        unsigned long xen_pfn;
        int ret;
 
-       ret = get_user_pages_fast(addr, 1, batch->writeable ? FOLL_WRITE : 0, &page);
+       ret = pin_user_pages_fast(addr, 1, batch->writeable ? FOLL_WRITE : 0, &page);
        if (ret < 0)
                return ret;
 
@@ -745,13 +745,7 @@ static int gntdev_get_page(struct gntdev_copy_batch *batch, void __user *virt,
 
 static void gntdev_put_pages(struct gntdev_copy_batch *batch)
 {
-       unsigned int i;
-
-       for (i = 0; i < batch->nr_pages; i++) {
-               if (batch->writeable && !PageDirty(batch->pages[i]))
-                       set_page_dirty_lock(batch->pages[i]);
-               put_page(batch->pages[i]);
-       }
+       unpin_user_pages_dirty_lock(batch->pages, batch->nr_pages, batch->writeable);
        batch->nr_pages = 0;
        batch->writeable = false;
 }