Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: - a bit more MM - procfs updates - dynamic-debug fixes - lib/ updates - checkpatch - epoll - nilfs2 - signals - rapidio - PID management cleanup and optimization - kcov updates - sysvipc updates - quite a few misc things all over the place * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (94 commits) EXPERT Kconfig menu: fix broken EXPERT menu include/asm-generic/topology.h: remove unused parent_node() macro arch/tile/include/asm/topology.h: remove unused parent_node() macro arch/sparc/include/asm/topology_64.h: remove unused parent_node() macro arch/sh/include/asm/topology.h: remove unused parent_node() macro arch/ia64/include/asm/topology.h: remove unused parent_node() macro drivers/pcmcia/sa1111_badge4.c: avoid unused function warning mm: add infrastructure for get_user_pages_fast() benchmarking sysvipc: make get_maxid O(1) again sysvipc: properly name ipc_addid() limit parameter sysvipc: duplicate lock comments wrt ipc_addid() sysvipc: unteach ids->next_id for !CHECKPOINT_RESTORE initramfs: use time64_t timestamps drivers/watchdog: make use of devm_register_reboot_notifier() kernel/reboot.c: add devm_register_reboot_notifier() kcov: update documentation Makefile: support flag -fsanitizer-coverage=trace-cmp kcov: support comparison operands collection kcov: remove pointless current != NULL check kernel/panic.c: add TAINT_AUX ...
This commit is contained in:
@@ -18,6 +18,7 @@ TEST_GEN_FILES += transhuge-stress
|
||||
TEST_GEN_FILES += userfaultfd
|
||||
TEST_GEN_FILES += mlock-random-test
|
||||
TEST_GEN_FILES += virtual_address_range
|
||||
TEST_GEN_FILES += gup_benchmark
|
||||
|
||||
TEST_PROGS := run_vmtests
|
||||
|
||||
|
91
tools/testing/selftests/vm/gup_benchmark.c
Normal file
91
tools/testing/selftests/vm/gup_benchmark.c
Normal file
@@ -0,0 +1,91 @@
|
||||
#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_benchmark)
|
||||
|
||||
struct gup_benchmark {
|
||||
__u64 delta_usec;
|
||||
__u64 addr;
|
||||
__u64 size;
|
||||
__u32 nr_pages_per_call;
|
||||
__u32 flags;
|
||||
};
|
||||
|
||||
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;
|
||||
char *p;
|
||||
|
||||
while ((opt = getopt(argc, argv, "m:r:n:tT")) != -1) {
|
||||
switch (opt) {
|
||||
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 'w':
|
||||
write = 1;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
gup.nr_pages_per_call = nr_pages;
|
||||
gup.flags = write;
|
||||
|
||||
fd = open("/sys/kernel/debug/gup_benchmark", O_RDWR);
|
||||
if (fd == -1)
|
||||
perror("open"), exit(1);
|
||||
|
||||
p = mmap(NULL, size, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 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, GUP_FAST_BENCHMARK, &gup))
|
||||
perror("ioctl"), exit(1);
|
||||
|
||||
printf("Time: %lld us", gup.delta_usec);
|
||||
if (gup.size != size)
|
||||
printf(", truncated (size: %lld)", gup.size);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
Reference in New Issue
Block a user