mm/gup_benchmark.c: add additional pinning methods

Provide new gup benchmark ioctl commands to run different user page
pinning methods, get_user_pages_longterm() and get_user_pages(), in
addition to the existing get_user_pages_fast().

Link: http://lkml.kernel.org/r/20181010195605.10689-2-keith.busch@intel.com
Signed-off-by: Keith Busch <keith.busch@intel.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c
index e6aff102373bec1c7f817f26edf90ba41d8ebbfc..debf11388a600d0f445ed1ac055e14bf0d55790d 100644 (file)
--- a/mm/gup_benchmark.c
+++ b/mm/gup_benchmark.c
@@ -6,6 +6,8 @@
 #include <linux/debugfs.h>
 
 #define GUP_FAST_BENCHMARK     _IOWR('g', 1, struct gup_benchmark)
+#define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark)
+#define GUP_BENCHMARK          _IOWR('g', 3, struct gup_benchmark)
 
 struct gup_benchmark {
        __u64 get_delta_usec;
@@ -43,7 +45,23 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
                        nr = (next - addr) / PAGE_SIZE;
                }
 
-               nr = get_user_pages_fast(addr, nr, gup->flags & 1, pages + i);
+               switch (cmd) {
+               case GUP_FAST_BENCHMARK:
+                       nr = get_user_pages_fast(addr, nr, gup->flags & 1,
+                                                pages + i);
+                       break;
+               case GUP_LONGTERM_BENCHMARK:
+                       nr = get_user_pages_longterm(addr, nr, gup->flags & 1,
+                                                    pages + i, NULL);
+                       break;
+               case GUP_BENCHMARK:
+                       nr = get_user_pages(addr, nr, gup->flags & 1, pages + i,
+                                           NULL);
+                       break;
+               default:
+                       return -1;
+               }
+
                if (nr <= 0)
                        break;
                i += nr;
@@ -72,8 +90,14 @@ static long gup_benchmark_ioctl(struct file *filep, unsigned int cmd,
        struct gup_benchmark gup;
        int ret;
 
-       if (cmd != GUP_FAST_BENCHMARK)
+       switch (cmd) {
+       case GUP_FAST_BENCHMARK:
+       case GUP_LONGTERM_BENCHMARK:
+       case GUP_BENCHMARK:
+               break;
+       default:
                return -EINVAL;
+       }
 
        if (copy_from_user(&gup, (void __user *)arg, sizeof(gup)))
                return -EFAULT;

diff --git a/tools/testing/selftests/vm/gup_benchmark.c b/tools/testing/selftests/vm/gup_benchmark.c
index bdcb97acd0ac63e5ae34451deee1fa4cfee604ee..c2f785ded9b9438ca016e9bd94022d43c1f5eab9 100644 (file)
--- a/tools/testing/selftests/vm/gup_benchmark.c
+++ b/tools/testing/selftests/vm/gup_benchmark.c
@@ -15,6 +15,8 @@
 #define PAGE_SIZE sysconf(_SC_PAGESIZE)
 
 #define GUP_FAST_BENCHMARK     _IOWR('g', 1, struct gup_benchmark)
+#define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark)
+#define GUP_BENCHMARK          _IOWR('g', 3, struct gup_benchmark)
 
 struct gup_benchmark {
        __u64 get_delta_usec;
@@ -30,9 +32,10 @@ int main(int argc, char **argv)
        struct gup_benchmark gup;
        unsigned long size = 128 * MB;
        int i, fd, opt, nr_pages = 1, thp = -1, repeats = 1, write = 0;
+       int cmd = GUP_FAST_BENCHMARK;
        char *p;
 
-       while ((opt = getopt(argc, argv, "m:r:n:tT")) != -1) {
+       while ((opt = getopt(argc, argv, "m:r:n:tTLU")) != -1) {
                switch (opt) {
                case 'm':
                        size = atoi(optarg) * MB;
@@ -49,6 +52,12 @@ int main(int argc, char **argv)
                case 'T':
                        thp = 0;
                        break;
+               case 'L':
+                       cmd = GUP_LONGTERM_BENCHMARK;
+                       break;
+               case 'U':
+                       cmd = GUP_BENCHMARK;
+                       break;
                case 'w':
                        write = 1;
                default:
@@ -79,7 +88,7 @@ int main(int argc, char **argv)
 
        for (i = 0; i < repeats; i++) {
                gup.size = size;
-               if (ioctl(fd, GUP_FAST_BENCHMARK, &gup))
+               if (ioctl(fd, cmd, &gup))
                        perror("ioctl"), exit(1);
 
                printf("Time: get:%lld put:%lld us", gup.get_delta_usec,