Commit 714a3a1e authored by Keith Busch's avatar Keith Busch Committed by Linus Torvalds

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.comSigned-off-by: default avatarKeith Busch <keith.busch@intel.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26db3d09
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#define GUP_FAST_BENCHMARK _IOWR('g', 1, struct gup_benchmark) #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 { struct gup_benchmark {
__u64 get_delta_usec; __u64 get_delta_usec;
...@@ -43,7 +45,23 @@ static int __gup_benchmark_ioctl(unsigned int cmd, ...@@ -43,7 +45,23 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
nr = (next - addr) / PAGE_SIZE; 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) if (nr <= 0)
break; break;
i += nr; i += nr;
...@@ -72,8 +90,14 @@ static long gup_benchmark_ioctl(struct file *filep, unsigned int cmd, ...@@ -72,8 +90,14 @@ static long gup_benchmark_ioctl(struct file *filep, unsigned int cmd,
struct gup_benchmark gup; struct gup_benchmark gup;
int ret; int ret;
if (cmd != GUP_FAST_BENCHMARK) switch (cmd) {
case GUP_FAST_BENCHMARK:
case GUP_LONGTERM_BENCHMARK:
case GUP_BENCHMARK:
break;
default:
return -EINVAL; return -EINVAL;
}
if (copy_from_user(&gup, (void __user *)arg, sizeof(gup))) if (copy_from_user(&gup, (void __user *)arg, sizeof(gup)))
return -EFAULT; return -EFAULT;
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#define PAGE_SIZE sysconf(_SC_PAGESIZE) #define PAGE_SIZE sysconf(_SC_PAGESIZE)
#define GUP_FAST_BENCHMARK _IOWR('g', 1, struct gup_benchmark) #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 { struct gup_benchmark {
__u64 get_delta_usec; __u64 get_delta_usec;
...@@ -30,9 +32,10 @@ int main(int argc, char **argv) ...@@ -30,9 +32,10 @@ int main(int argc, char **argv)
struct gup_benchmark gup; struct gup_benchmark gup;
unsigned long size = 128 * MB; unsigned long size = 128 * MB;
int i, fd, opt, nr_pages = 1, thp = -1, repeats = 1, write = 0; int i, fd, opt, nr_pages = 1, thp = -1, repeats = 1, write = 0;
int cmd = GUP_FAST_BENCHMARK;
char *p; char *p;
while ((opt = getopt(argc, argv, "m:r:n:tT")) != -1) { while ((opt = getopt(argc, argv, "m:r:n:tTLU")) != -1) {
switch (opt) { switch (opt) {
case 'm': case 'm':
size = atoi(optarg) * MB; size = atoi(optarg) * MB;
...@@ -49,6 +52,12 @@ int main(int argc, char **argv) ...@@ -49,6 +52,12 @@ int main(int argc, char **argv)
case 'T': case 'T':
thp = 0; thp = 0;
break; break;
case 'L':
cmd = GUP_LONGTERM_BENCHMARK;
break;
case 'U':
cmd = GUP_BENCHMARK;
break;
case 'w': case 'w':
write = 1; write = 1;
default: default:
...@@ -79,7 +88,7 @@ int main(int argc, char **argv) ...@@ -79,7 +88,7 @@ int main(int argc, char **argv)
for (i = 0; i < repeats; i++) { for (i = 0; i < repeats; i++) {
gup.size = size; gup.size = size;
if (ioctl(fd, GUP_FAST_BENCHMARK, &gup)) if (ioctl(fd, cmd, &gup))
perror("ioctl"), exit(1); perror("ioctl"), exit(1);
printf("Time: get:%lld put:%lld us", gup.get_delta_usec, printf("Time: get:%lld put:%lld us", gup.get_delta_usec,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment