]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
video: fbdev: convert get_user_pages() --> pin_user_pages()
authorJohn Hubbard <jhubbard@nvidia.com>
Fri, 22 May 2020 04:15:06 +0000 (21:15 -0700)
committerSam Ravnborg <sam@ravnborg.org>
Sun, 31 May 2020 20:54:37 +0000 (22:54 +0200)
This code was using get_user_pages*(), in a "Case 2" scenario
(DMA/RDMA), using the categorization from [1]. That means that it's
time to convert the get_user_pages*() + put_page() calls to
pin_user_pages*() + unpin_user_pages() calls.

There is some helpful background in [2]: basically, this is a small
part of fixing a long-standing disconnect between pinning pages, and
file systems' use of those pages.

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

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

Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Gustavo A. R. Silva <gustavo@embeddedor.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200522041506.39638-3-jhubbard@nvidia.com
drivers/video/fbdev/pvr2fb.c

index ceb6ef5905975dfc059ff45672d551e7b55e9708..2d9f69b93392a882b3f3b6878c9bbee22e2e31a5 100644 (file)
@@ -652,7 +652,7 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
        if (!pages)
                return -ENOMEM;
 
-       ret = get_user_pages_fast((unsigned long)buf, nr_pages, FOLL_WRITE, pages);
+       ret = pin_user_pages_fast((unsigned long)buf, nr_pages, FOLL_WRITE, pages);
        if (ret < nr_pages) {
                if (ret < 0) {
                        /*
@@ -712,9 +712,7 @@ out:
        ret = count;
 
 out_unmap:
-       for (i = 0; i < nr_pages; i++)
-               put_page(pages[i]);
-
+       unpin_user_pages(pages, nr_pages);
        kfree(pages);
 
        return ret;