mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-12-09 09:48:57 +00:00
Patch series "selftests/vm: gup_test, hmm-tests, assorted improvements", v3. Summary: This series provides two main things, and a number of smaller supporting goodies. The two main points are: 1) Add a new sub-test to gup_test, which in turn is a renamed version of gup_benchmark. This sub-test allows nicer testing of dump_pages(), at least on user-space pages. For quite a while, I was doing a quick hack to gup_test.c whenever I wanted to try out changes to dump_page(). Then Matthew Wilcox asked me what I meant when I said "I used my dump_page() unit test", and I realized that it might be nice to check in a polished up version of that. Details about how it works and how to use it are in the commit description for patch #6 ("selftests/vm: gup_test: introduce the dump_pages() sub-test"). 2) Fixes a limitation of hmm-tests: these tests are incredibly useful, but only if people actually build and run them. And it turns out that libhugetlbfs is a little too effective at throwing a wrench in the works, there. So I've added a little configuration check that removes just two of the 21 hmm-tests, if libhugetlbfs is not available. Further details in the commit description of patch #8 ("selftests/vm: hmm-tests: remove the libhugetlbfs dependency"). Other smaller things that this series does: a) Remove code duplication by creating gup_test.h. b) Clear up the sub-test organization, and their invocation within run_vmtests.sh. c) Other minor assorted improvements. [1] v2 is here: https://lore.kernel.org/linux-doc/20200929212747.251804-1-jhubbard@nvidia.com/ [2] https://lore.kernel.org/r/CAHk-=wgh-TMPHLY3jueHX7Y2fWh3D+nMBqVS__AZm6-oorquWA@mail.gmail.com This patch (of 9): Rename nearly every "gup_benchmark" reference and file name to "gup_test". The one exception is for the actual gup benchmark test itself. The current code already does a *little* bit more than benchmarking, and definitely covers more than get_user_pages_fast(). More importantly, however, subsequent patches are about to add some functionality that is non-benchmark related. Closely related changes: * Kconfig: in addition to renaming the options from GUP_BENCHMARK to GUP_TEST, update the help text to reflect that it's no longer a benchmark-only test. Link: https://lkml.kernel.org/r/20201026064021.3545418-1-jhubbard@nvidia.com Link: https://lkml.kernel.org/r/20201026064021.3545418-2-jhubbard@nvidia.com Signed-off-by: John Hubbard <jhubbard@nvidia.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Jérôme Glisse <jglisse@redhat.com> Cc: Ralph Campbell <rcampbell@nvidia.com> Cc: Shuah Khan <shuah@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
144 lines
2.8 KiB
C
144 lines
2.8 KiB
C
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
#include <sys/ioctl.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/prctl.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#define MB (1UL << 20)
|
|
#define PAGE_SIZE sysconf(_SC_PAGESIZE)
|
|
|
|
#define GUP_FAST_BENCHMARK _IOWR('g', 1, struct gup_test)
|
|
#define GUP_BENCHMARK _IOWR('g', 2, struct gup_test)
|
|
|
|
/* Similar to above, but use FOLL_PIN instead of FOLL_GET. */
|
|
#define PIN_FAST_BENCHMARK _IOWR('g', 3, struct gup_test)
|
|
#define PIN_BENCHMARK _IOWR('g', 4, struct gup_test)
|
|
#define PIN_LONGTERM_BENCHMARK _IOWR('g', 5, struct gup_test)
|
|
|
|
/* Just the flags we need, copied from mm.h: */
|
|
#define FOLL_WRITE 0x01 /* check pte is writable */
|
|
|
|
struct gup_test {
|
|
__u64 get_delta_usec;
|
|
__u64 put_delta_usec;
|
|
__u64 addr;
|
|
__u64 size;
|
|
__u32 nr_pages_per_call;
|
|
__u32 flags;
|
|
__u64 expansion[10]; /* For future use */
|
|
};
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
struct gup_test gup;
|
|
unsigned long size = 128 * MB;
|
|
int i, fd, filed, opt, nr_pages = 1, thp = -1, repeats = 1, write = 0;
|
|
int cmd = GUP_FAST_BENCHMARK, flags = MAP_PRIVATE;
|
|
char *file = "/dev/zero";
|
|
char *p;
|
|
|
|
while ((opt = getopt(argc, argv, "m:r:n:f:abtTLUuwSH")) != -1) {
|
|
switch (opt) {
|
|
case 'a':
|
|
cmd = PIN_FAST_BENCHMARK;
|
|
break;
|
|
case 'b':
|
|
cmd = PIN_BENCHMARK;
|
|
break;
|
|
case 'L':
|
|
cmd = PIN_LONGTERM_BENCHMARK;
|
|
break;
|
|
case 'm':
|
|
size = atoi(optarg) * MB;
|
|
break;
|
|
case 'r':
|
|
repeats = atoi(optarg);
|
|
break;
|
|
case 'n':
|
|
nr_pages = atoi(optarg);
|
|
break;
|
|
case 't':
|
|
thp = 1;
|
|
break;
|
|
case 'T':
|
|
thp = 0;
|
|
break;
|
|
case 'U':
|
|
cmd = GUP_BENCHMARK;
|
|
break;
|
|
case 'u':
|
|
cmd = GUP_FAST_BENCHMARK;
|
|
break;
|
|
case 'w':
|
|
write = 1;
|
|
break;
|
|
case 'f':
|
|
file = optarg;
|
|
break;
|
|
case 'S':
|
|
flags &= ~MAP_PRIVATE;
|
|
flags |= MAP_SHARED;
|
|
break;
|
|
case 'H':
|
|
flags |= (MAP_HUGETLB | MAP_ANONYMOUS);
|
|
break;
|
|
default:
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
filed = open(file, O_RDWR|O_CREAT);
|
|
if (filed < 0) {
|
|
perror("open");
|
|
exit(filed);
|
|
}
|
|
|
|
gup.nr_pages_per_call = nr_pages;
|
|
if (write)
|
|
gup.flags |= FOLL_WRITE;
|
|
|
|
fd = open("/sys/kernel/debug/gup_test", O_RDWR);
|
|
if (fd == -1) {
|
|
perror("open");
|
|
exit(1);
|
|
}
|
|
|
|
p = mmap(NULL, size, PROT_READ | PROT_WRITE, flags, filed, 0);
|
|
if (p == MAP_FAILED) {
|
|
perror("mmap");
|
|
exit(1);
|
|
}
|
|
gup.addr = (unsigned long)p;
|
|
|
|
if (thp == 1)
|
|
madvise(p, size, MADV_HUGEPAGE);
|
|
else if (thp == 0)
|
|
madvise(p, size, MADV_NOHUGEPAGE);
|
|
|
|
for (; (unsigned long)p < gup.addr + size; p += PAGE_SIZE)
|
|
p[0] = 0;
|
|
|
|
for (i = 0; i < repeats; i++) {
|
|
gup.size = size;
|
|
if (ioctl(fd, cmd, &gup)) {
|
|
perror("ioctl");
|
|
exit(1);
|
|
}
|
|
|
|
printf("Time: get:%lld put:%lld us", gup.get_delta_usec,
|
|
gup.put_delta_usec);
|
|
if (gup.size != size)
|
|
printf(", truncated (size: %lld)", gup.size);
|
|
printf("\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|