rds: convert get_user_pages() --> pin_user_pages()

This code was using get_user_pages_fast(), in a "Case 2" scenario
(DMA/RDMA), using the categorization from [1]. That means that it's
time to convert the get_user_pages_fast() + put_page() calls to
pin_user_pages_fast() + 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: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org
Cc: linux-rdma@vger.kernel.org
Cc: rds-devel@oss.oracle.com
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/rds/info.c b/net/rds/info.c
index 03f6fd56d2371c31ea2c1dd12d4a66e9b60a7f53..e1d63563e81cf3c38241a756364a363e10ea6aca 100644 (file)
--- a/net/rds/info.c
+++ b/net/rds/info.c
@@ -162,7 +162,6 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval,
        struct rds_info_lengths lens;
        unsigned long nr_pages = 0;
        unsigned long start;
-       unsigned long i;
        rds_info_func func;
        struct page **pages = NULL;
        int ret;
@@ -193,7 +192,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval,
                ret = -ENOMEM;
                goto out;
        }
-       ret = get_user_pages_fast(start, nr_pages, FOLL_WRITE, pages);
+       ret = pin_user_pages_fast(start, nr_pages, FOLL_WRITE, pages);
        if (ret != nr_pages) {
                if (ret > 0)
                        nr_pages = ret;
@@ -235,8 +234,7 @@ call_func:
                ret = -EFAULT;
 
 out:
-       for (i = 0; pages && i < nr_pages; i++)
-               put_page(pages[i]);
+       unpin_user_pages(pages, nr_pages);
        kfree(pages);
 
        return ret;