perf-bench: introduce epoll benchmarks
Subsystems (2)
Davidlohr Bueso
reviewercover perf-bench: introduce epoll benchmarks
Hi,
I've been doing work on epoll, and I've found that most related (micro)benchmarks are either randomly scattered across the net, or simply non-existent. These patches are a start to addressing this (more to come). Similar to what we have for futexes, perf-bench allows kernel developers mainly to quickly test performance changes to the code in question. Similarly, such programs are not intended for comparing different IO polling methods. Hence everything is very adhoc and outputs raw microbenchmark numbers. Also this uses eventfd, similar tools tend to use pipes or sockets, but the result is the same.
Thanks!
Davidlohr Bueso (2):
perf-bench: Add epoll parallel epoll_wait benchmark
perf-bench: Add epoll_ctl(2) benchmark
tools/perf/Documentation/perf-bench.txt | 10 + tools/perf/bench/Build | 3 + tools/perf/bench/bench.h | 3 + tools/perf/bench/epoll-ctl.c | 411 ++++++++++++++++++++++++ tools/perf/bench/epoll-wait.c | 536 ++++++++++++++++++++++++++++++++ tools/perf/builtin-bench.c | 9 + 6 files changed, 972 insertions(+) create mode 100644 tools/perf/bench/epoll-ctl.c create mode 100644 tools/perf/bench/epoll-wait.c
Signature · 1 line
2.16.4
Davidlohr Bueso
reviewerPATCH 1/2 perf-bench: Add epoll parallel epoll_wait benchmark
This program benchmarks concurrent epoll_wait(2) for file descriptors that are monitored with with EPOLLIN along various semantics, by a single epoll instance. Such conditions can be found when using single/combined or multiple queuing when load balancing.
Each thread has a number of private, nonblocking file descriptors, referred to as fdmap. A writer thread will constantly be writing to the fdmaps of all threads, minimizing each threads's chances of epoll_wait not finding any ready read events and blocking as this is not what we want to stress. Full details in the start of the C file.
--- tools/perf/Documentation/perf-bench.txt | 7 + tools/perf/bench/Build | 2 + tools/perf/bench/bench.h | 2 + tools/perf/bench/epoll-wait.c | 536 ++++++++++++++++++++++++++++++++ tools/perf/builtin-bench.c | 8 + 5 files changed, 555 insertions(+) create mode 100644 tools/perf/bench/epoll-wait.c
tools/perf/Documentation/perf-bench.txt +7 -0
@@ -58,6 +58,9 @@ SUBSYSTEM 'futex':: Futex stressing benchmarks. +'epoll':: + Eventpoll (epoll) stressing benchmarks. + 'all':: All benchmark subsystems.
@@ -203,6 +206,10 @@ Suite for evaluating requeue calls. *lock-pi*:: Suite for evaluating futex lock_pi calls. +SUITES FOR 'epoll' +~~~~~~~~~~~~~~~~~~ +*wait*:: +Suite for evaluating concurrent epoll_wait calls. SEE ALSO --------
tools/perf/bench/Build +2 -0
@@ -7,6 +7,8 @@ perf-y += futex-wake-parallel.o perf-y += futex-requeue.o perf-y += futex-lock-pi.o +perf-y += epoll-wait.o + perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-lib.o perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o perf-$(CONFIG_X86_64) += mem-memset-x86-64-asm.o
tools/perf/bench/bench.h +2 -0
@@ -38,6 +38,8 @@ int bench_futex_requeue(int argc, const char **argv);/* pi futexes */ int bench_futex_lock_pi (int argc,const char **argv); +int bench_epoll_wait (int argc,const char **argv); +#define BENCH_FORMAT_DEFAULT_STR "default"#define BENCH_FORMAT_DEFAULT 0#define BENCH_FORMAT_SIMPLE_STR "simple"
tools/perf/bench/epoll-wait.c new file +536 -0
536 lines not on this page · raw message
tools/perf/builtin-bench.c +8 -0
@@ -14,6 +14,7 @@* mem ... memory access performance * numa ... NUMA scheduling and MM performance * futex ... Futex performance +* epoll ... Event poll performance */ #include "perf.h" #include "util/util.h"
@@ -67,6 +68,12 @@ static struct bench futex_benchmarks[] = { { NULL, NULL, NULL } }; +static struct bench epoll_benchmarks[] = { + {"wait" ,"Benchmark epoll concurrent epoll_waits" , bench_epoll_wait }, + {"all" ,"Run all futex benchmarks" ,NULL }, + {NULL ,NULL ,NULL } +}; +struct collection {const char *name;const char *summary;
@@ -80,6 +87,7 @@ static struct collection collections[] = { { "numa", "NUMA scheduling and MM benchmarks", numa_benchmarks }, #endif {"futex", "Futex stressing benchmarks", futex_benchmarks }, + {"epoll", "Epoll stressing benchmarks", epoll_benchmarks }, { "all", "All benchmarks", NULL }, { NULL, NULL, NULL } };
Signature · 1 line
2.16.4
Davidlohr Bueso
reviewerRe: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark
Mind this fixlet for using et/oneshot and the multiq option.
tools/perf/bench/epoll-wait.c +0 -0
@@ -215,13 +215,13 @@ static void *workerfn(void *arg)
if (et) {
ev.events = EPOLLIN | EPOLLET;
- ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev);
+ ret = epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ev);
}
if (oneshot) {
/* rearm the file descriptor with a new event mask */
ev.events |= EPOLLIN | EPOLLONESHOT;
- ret = epoll_ctl(epollfd, EPOLL_CTL_MOD, fd, &ev);
+ ret = epoll_ctl(efd, EPOLL_CTL_MOD, fd, &ev);
}
ops++;@@ -249,7 +249,7 @@ static void nest_epollfd(struct worker *w)
for (i = 0; i < nested; i++) {
epollfdp[i] = epoll_create(1);
- if (epollfd < 0)
+ if (epollfdp[i] < 0)
err(EXIT_FAILURE, "epoll_create");
}Arnaldo Carvalho de Melo
maintainerRe: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark
Em Tue, Nov 06, 2018 at 10:23:49AM -0800, Davidlohr Bueso escreveu:
Quoted 1 line
Mind this fixlet for using et/oneshot and the multiq option.
Yes sir, applied the fixup to the first patch in the series, applied the second, tested, merged.
- Arnaldo
Quoted 29 lines
tools/perf/bench/epoll-wait.c +3
-3@@ -215,13 +215,13 @@ static void *workerfn(void *arg)if (et) { ev.events =EPOLLIN |EPOLLET ; - ret =epoll_ctl (epollfd,EPOLL_CTL_ADD , fd, &ev); + ret =epoll_ctl (efd,EPOLL_CTL_ADD , fd, &ev); }if (oneshot) {/* rearm the file descriptor with a new event mask */ ev.events |=EPOLLIN |EPOLLONESHOT ; - ret =epoll_ctl (epollfd,EPOLL_CTL_MOD , fd, &ev); + ret =epoll_ctl (efd,EPOLL_CTL_MOD , fd, &ev); } ops++;@@ -249,7 +249,7 @@ static void nest_epollfd(struct worker *w)for (i =0 ; i < nested; i++) { epollfdp[i] =epoll_create (1 ); -if (epollfd <0 ) +if (epollfdp[i] <0 )err (EXIT_FAILURE ,"epoll_create" ); }
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark
Em Tue, Nov 06, 2018 at 04:13:25PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 5 lines
Em Tue, Nov 06, 2018 at 10:23:49AM -0800, Davidlohr Bueso escreveu:
Quoted 1 line
Mind this fixlet for using et/oneshot and the multiq option.
Yes sir, applied the fixup to the first patch in the series, applied the second, tested, merged.
So, one of these two is making the build to fail in all the Alpine Linux (3.4 -- 3.8 and edge) and also on some others
On Alpine the error is:
CC /tmp/build/perf/bench/futex-lock-pi.o
CC /tmp/build/perf/bench/epoll-wait.obench/epoll-wait.c: In function 'do_threads':bench/epoll-wait.c:345:10: error: implicit declaration of function 'pthread_attr_setaffinity_np' [-Werror=implicit-function-declaration]
ret = pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpuset);
^
bench/epoll-wait.c:345:4: error: nested extern declaration of 'pthread_attr_setaffinity_np' [-Werror=nested-externs]
ret = pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpuset);
^
bench/epoll-wait.c: In function 'bench_epoll_wait':
bench/epoll-wait.c:462:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n", prevrl.rlim_max, rl.rlim_max);
^
bench/epoll-wait.c:85:31: note: in definition of macro 'printinfo'
do { if (__verbose) { printf(fmt, ## arg); fflush(stdout); } } while (0)
^
bench/epoll-wait.c:462:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n", prevrl.rlim_max, rl.rlim_max);
^
bench/epoll-wait.c:85:31: note: in definition of macro 'printinfo'
do { if (__verbose) { printf(fmt, ## arg); fflush(stdout); } } while (0)
^ CC /tmp/build/perf/util/trace-event-info.o
CC /tmp/build/perf/perf.o
cc1: all warnings being treated as errors
mv: can't rename '/tmp/build/perf/bench/.epoll-wait.o.tmp': No such file or directory /git/linux/tools/build/Makefile.build:96: recipe for target '/tmp/build/perf/bench/epoll-wait.o' failed make[4]: *** [/tmp/build/perf/bench/epoll-wait.o] Error 1 /git/linux/tools/build/Makefile.build:139: recipe for target 'bench' failed
make[3]: *** [bench] Error 2
make[3]: *** Waiting for unfinished jobs....
CC /tmp/build/perf/util/trace-event-scripting.o
On AmazonLinux 1 and 2, oops, these are mine:
LINK /tmp/build/perf/perf/tmp/build/perf/perf-in.o: In function `bpf_map__set_filter_pids':
/git/linux/tools/perf/builtin-trace.c:2573: undefined reference to bpf_map(float, double)' /tmp/build/perf/perf-in.o: In function cmd_trace':
(.text+0x4c71e): undefined reference to bpf_map_update_elem' /tmp/build/perf/perf-in.o: In function cmd_trace':
(.text+0x4cab6): undefined reference to bpf_map(float, double)' /tmp/build/perf/perf-in.o: In function cmd_trace':
(.text+0x4cae8): undefined reference to `bpf_map_update_elem'
collect2: error: ld returned 1 exit status
make[2]: *** [/tmp/build/perf/perf] Error 1
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
make: Leaving directory `/git/linux/tools/perf'
[root@seventh ~]#
I need to do that conditionally, i.e. it seems libbpf is not being built in that distro...
centos:5 is about perf bench:
CC /tmp/build/perf/bench/epoll-wait.obench/epoll-wait.c:74:25: error: sys/eventfd.h: No such file or directory
cc1: warnings being treated as errorsbench/epoll-wait.c: In function 'do_threads':bench/epoll-wait.c:328: warning: implicit declaration of function 'eventfd' bench/epoll-wait.c:328: warning: nested extern declaration of 'eventfd' bench/epoll-wait.c:328: error: 'EFD_NONBLOCK' undeclared (first use in this function) bench/epoll-wait.c:328: error: (Each undeclared identifier is reported only once bench/epoll-wait.c:328: error: for each function it appears in.)
mv: cannot stat `/tmp/build/perf/bench/.epoll-wait.o.tmp': No such file or directory make[4]: *** [/tmp/build/perf/bench/epoll-wait.o] Error 1
make[3]: *** [bench] Error 2
make[3]: *** Waiting for unfinished jobs....
MKDIR /tmp/build/perf/tests/
centos:6 and 7 are ok with perf bench, not so much with my bpf changes :-\
LINK /tmp/build/perf/libperf-gtk.so/tmp/build/perf/perf-in.o: In function `bpf_map__set_filter_pids':
/git/linux/tools/perf/builtin-trace.c:2573: undefined reference to bpf_map(float, double)' /git/linux/tools/perf/builtin-trace.c:2577: undefined reference to bpf_map_update_elem' /git/linux/tools/perf/builtin-trace.c:2573: undefined reference to bpf_map(float, double)' /git/linux/tools/perf/builtin-trace.c:2577: undefined reference to bpf_map_update_elem'
collect2: ld returned 1 exit status
make[2]: *** [/tmp/build/perf/perf] Error 1
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
make: Leaving directory `/git/linux/tools/perf'
[root@seventh ~]#
[root@seventh ~]#
- Arnaldo
Quoted 31 lines
- Arnaldo
Quoted 29 lines
tools/perf/bench/epoll-wait.c +3
-3@@ -215,13 +215,13 @@ static void *workerfn(void *arg)if (et) { ev.events =EPOLLIN |EPOLLET ; - ret =epoll_ctl (epollfd,EPOLL_CTL_ADD , fd, &ev); + ret =epoll_ctl (efd,EPOLL_CTL_ADD , fd, &ev); }if (oneshot) {/* rearm the file descriptor with a new event mask */ ev.events |=EPOLLIN |EPOLLONESHOT ; - ret =epoll_ctl (epollfd,EPOLL_CTL_MOD , fd, &ev); + ret =epoll_ctl (efd,EPOLL_CTL_MOD , fd, &ev); } ops++;@@ -249,7 +249,7 @@ static void nest_epollfd(struct worker *w)for (i =0 ; i < nested; i++) { epollfdp[i] =epoll_create (1 ); -if (epollfd <0 ) +if (epollfdp[i] <0 )err (EXIT_FAILURE ,"epoll_create" ); }
Davidlohr Bueso
reviewerRe: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark
Quoted 6 lines · Arnaldo Carvalho de Melo
Em Tue, Nov 06, 2018 at 04:13:25PM -0300, Arnaldo Carvalho de Melo escreveu:
CC/tmp/build/perf/bench/futex-lock-pi.o
CC/tmp/build/perf/bench/epoll-wait.obench/epoll-wait.c: In function 'do_threads':bench/epoll-wait.c:345:10: error: implicit declaration of function 'pthread_attr_setaffinity_np' [-Werror=implicit-function-declaration]
ret =pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpuset);
Ah, yes, how about the following?
-----8<-----------------------------------------------------
perf-bench: Move HAVE_PTHREAD_ATTR_SETAFFINITY_NP into bench.h
Both futex and epoll need this call, and can cause build failure on systems that don't have it pthread_attr_setaffinity_np().
---tools/perf/bench/bench.h | 11 +++++++++++tools/perf/bench/futex.h | 12 ------------
2 files changed, 11 insertions(+), 12 deletions(-)
tools/perf/bench/bench.h +0 -0
@@ -51,4 +51,15 @@ int bench_epoll_ctl(int argc, const char **argv);
extern int bench_format;
extern unsigned int bench_repeat;
+#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP
+#include <pthread.h>
+#include <linux/compiler.h>
+static inline int pthread_attr_setaffinity_np(pthread_attr_t *attr __maybe_unused,
+ size_t cpusetsize __maybe_unused,
+ cpu_set_t *cpuset __maybe_unused)
+{
+ return 0;
+}
+#endif
+
#endif
tools/perf/bench/futex.h +0 -0
@@ -86,16 +86,4 @@ futex_cmp_requeue(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2, int nr_wak
return futex(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_requeue, uaddr2, val, opflags); }
-
-#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP
-#include <pthread.h>
-#include <linux/compiler.h>
-static inline int pthread_attr_setaffinity_np(pthread_attr_t *attr __maybe_unused,
- size_t cpusetsize __maybe_unused,
- cpu_set_t *cpuset __maybe_unused)
-{
- return 0;
-}
-#endif
-
#endif /* _FUTEX_H */
Signature · 1 line
2.16.4
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark
Em Fri, Nov 09, 2018 at 01:07:19PM -0800, Davidlohr Bueso escreveu:
Quoted 10 lines · Arnaldo Carvalho de Melo
Quoted 7 lines
Em Tue, Nov 06, 2018 at 04:13:25PM -0300, Arnaldo Carvalho de Melo escreveu:
CC/tmp/build/perf/bench/futex-lock-pi.o
CC/tmp/build/perf/bench/epoll-wait.obench/epoll-wait.c: In function 'do_threads':bench/epoll-wait.c:345:10: error: implicit declaration of function 'pthread_attr_setaffinity_np' [-Werror=implicit-function-declaration]
ret =pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpuset);Ah, yes, how about the following?
Gets it a bit further, then we get this, which I think should be fixed using some PRIu64, etc. I'll try to do that at some point, but in short vacations now, then plumbers :-)
CC /tmp/build/perf/bench/epoll-wait.obench/epoll-wait.c: In function 'bench_epoll_wait':bench/epoll-wait.c:462:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n", prevrl.rlim_max, rl.rlim_max);
^
bench/epoll-wait.c:85:31: note: in definition of macro 'printinfo'
do { if (__verbose) { printf(fmt, ## arg); fflush(stdout); } } while (0)
^
bench/epoll-wait.c:462:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n", prevrl.rlim_max, rl.rlim_max);
^
bench/epoll-wait.c:85:31: note: in definition of macro 'printinfo'
do { if (__verbose) { printf(fmt, ## arg); fflush(stdout); } } while (0)
^ CC /tmp/build/perf/bench/epoll-ctl.obench/epoll-ctl.c: In function 'bench_epoll_ctl':bench/epoll-ctl.c:343:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n",
^
bench/epoll-ctl.c:31:29: note: in definition of macro 'printinfo'
do { if (__verbose) printf(fmt, ## arg); } while (0)
^
bench/epoll-ctl.c:343:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n",
^
bench/epoll-ctl.c:31:29: note: in definition of macro 'printinfo'
do { if (__verbose) printf(fmt, ## arg); } while (0)
^cc1: all warnings being treated as errors
mv: can't rename '/tmp/build/perf/bench/.epoll-wait.o.tmp': No such file or directory /git/linux/tools/build/Makefile.build:96: recipe for target '/tmp/build/perf/bench/epoll-wait.o' failed make[4]: *** [/tmp/build/perf/bench/epoll-wait.o] Error 1
make[4]: *** Waiting for unfinished jobs....
CC /tmp/build/perf/perf.o
cc1: all warnings being treated as errors
mv: can't rename '/tmp/build/perf/bench/.epoll-ctl.o.tmp': No such file or directory /git/linux/tools/build/Makefile.build:96: recipe for target '/tmp/build/perf/bench/epoll-ctl.o' failed make[4]: *** [/tmp/build/perf/bench/epoll-ctl.o] Error 1 /git/linux/tools/build/Makefile.build:139: recipe for target 'bench' failed
make[3]: *** [bench] Error 2
make[3]: *** Waiting for unfinished jobs....
CC /tmp/build/perf/tests/attr.o CC /tmp/build/perf/tests/vmlinux-kallsyms.o CC /tmp/build/perf/tests/openat-syscall.o CC /tmp/build/perf/util/map.o
Quoted 55 lines
-----8<-----------------------------------------------------
perf-bench: MoveHAVE_PTHREAD_ATTR_SETAFFINITY_NPintobench.hBoth futex and epoll need this call, and can cause build failure on systems that don't have it
pthread_attr_setaffinity_np().Signed-off-by Davidlohr Bueso <[email protected]>---
tools/perf/bench/bench.h| 11 +++++++++++tools/perf/bench/futex.h| 12 ------------2 files changed, 11 insertions(+), 12 deletions(-)tools/perf/bench/bench.h +11
-0@@ -51,4 +51,15 @@ int bench_epoll_ctl(int argc, const char **argv);extern int bench_format;extern unsigned int bench_repeat; +#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP +#include <pthread.h> +#include <linux/compiler.h> +static inline int pthread_attr_setaffinity_np (pthread_attr_t *attr__maybe_unused , +size_t cpusetsize__maybe_unused , +cpu_set_t *cpuset__maybe_unused ) +{ +return 0 ; +} +#endif +#endif tools/perf/bench/futex.h +0
-12@@ -86,16 +86,4 @@ futex_cmp_requeue(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2, int nr_wakreturn futex (uaddr,FUTEX_CMP_REQUEUE , nr_wake, nr_requeue, uaddr2, val, opflags); } - -#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP -#include <pthread.h> -#include <linux/compiler.h> -static inline int pthread_attr_setaffinity_np (pthread_attr_t *attr__maybe_unused , -size_t cpusetsize__maybe_unused , -cpu_set_t *cpuset__maybe_unused ) -{ -return 0 ; -} -#endif -#endif /* _FUTEX_H */ Signature · 1 line
2.16.4
Davidlohr Bueso
reviewerRe: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark
Quoted 3 lines · Arnaldo Carvalho de Melo
Gets it a bit further, then we get this, which I think should be fixed using some PRIu64, etc. I'll try to do that at some point, but in short vacations now, then plumbers :-)
Yeah sorry, I didn't mean to suggest that was it. I can send the follow up patches, or a v2 altogether if you prefer.
See you at lpc.
Thanks,
Davidlohr
tip-bot for Davidlohr Bueso
merge bot[tip:perf/core] perf bench: Move HAVE_PTHREAD_ATTR_SETAFFINITY_NP into bench.h
In reply to Davidlohr Buesoperf bench: Move HAVE_PTHREAD_ATTR_SETAFFINITY_NP into bench.h
Commit-ID: d47d77c3f008d3cf02c6ce92ef4f6e32ca270351 Gitweb: https://git.kernel.org/tip/d47d77c3f008d3cf02c6ce92ef4f6e32ca270351 Author: Davidlohr Bueso <[email protected]> AuthorDate: Fri, 9 Nov 2018 13:07:19 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 21 Nov 2018 12:00:32 -0300
perf bench: Move HAVE_PTHREAD_ATTR_SETAFFINITY_NP into bench.h
Both futex and epoll need this call, and can cause build failure on systems that don't have it pthread_attr_setaffinity_np().
--- tools/perf/bench/bench.h | 11 +++++++++++ tools/perf/bench/futex.h | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-)
tools/perf/bench/bench.h +11 -0
@@ -48,4 +48,15 @@ int bench_futex_lock_pi(int argc, const char **argv);extern int bench_format;extern unsigned int bench_repeat; +#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP +#include <pthread.h> +#include <linux/compiler.h> +static inline int pthread_attr_setaffinity_np (pthread_attr_t *attr__maybe_unused , +size_t cpusetsize__maybe_unused , +cpu_set_t *cpuset__maybe_unused ) +{ +return 0 ; +} +#endif +#endif
tools/perf/bench/futex.h +0 -12
@@ -86,16 +86,4 @@ futex_cmp_requeue(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2, int nr_wakreturn futex (uaddr,FUTEX_CMP_REQUEUE , nr_wake, nr_requeue, uaddr2, val, opflags); } - -#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP -#include <pthread.h> -#include <linux/compiler.h> -static inline int pthread_attr_setaffinity_np (pthread_attr_t *attr__maybe_unused , -size_t cpusetsize__maybe_unused , -cpu_set_t *cpuset__maybe_unused ) -{ -return 0 ; -} -#endif -#endif /* _FUTEX_H */
tip-bot for Davidlohr Bueso
merge bot[tip:perf/core] perf bench: Add epoll parallel epoll_wait benchmark
In reply to Davidlohr Buesoperf bench: Add epoll parallel epoll_wait benchmark
Commit-ID: 121dd9ea0116de3e79a4903a84018190c595e2b6 Gitweb: https://git.kernel.org/tip/121dd9ea0116de3e79a4903a84018190c595e2b6 Author: Davidlohr Bueso <[email protected]> AuthorDate: Tue, 6 Nov 2018 07:22:25 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 21 Nov 2018 22:38:47 -0300
perf bench: Add epoll parallel epoll_wait benchmark
This program benchmarks concurrent epoll_wait(2) for file descriptors that are monitored with with EPOLLIN along various semantics, by a single epoll instance. Such conditions can be found when using single/combined or multiple queuing when load balancing.
Each thread has a number of private, nonblocking file descriptors, referred to as fdmap. A writer thread will constantly be writing to the fdmaps of all threads, minimizing each threads's chances of epoll_wait not finding any ready read events and blocking as this is not what we want to stress. Full details in the start of the C file.
Committer testing:
# perf bench Usage: perf bench [<common options>] <collection> <benchmark> [<options>]
# List of all available benchmark collections:
sched: Scheduler and IPC benchmarks
mem: Memory access benchmarks
numa: NUMA scheduling and MM benchmarks
futex: Futex stressing benchmarks
epoll: Epoll stressing benchmarks
all: All benchmarks
# perf bench epoll
# List of available benchmarks for collection 'epoll':
wait: Benchmark epoll concurrent epoll_waits
all: Run all futex benchmarks
# perf bench epoll wait # Running 'epoll/wait' benchmark: Run summary [PID 19295]: 3 threads monitoring on 64 file-descriptors for 8 secs.
[thread 0] fdmap: 0xdaa650 ... 0xdaa74c [ 328241 ops/sec ] [thread 1] fdmap: 0xdaa900 ... 0xdaa9fc [ 351695 ops/sec ] [thread 2] fdmap: 0xdaabb0 ... 0xdaacac [ 381423 ops/sec ]
Averaged 353786 operations/sec (+- 4.35%), total secs = 8 #
Committer notes:
Fix the build on debian:experimental-x-mips, debian:experimental-x-mipsel and others:
CC /tmp/build/perf/bench/epoll-wait.o
bench/epoll-wait.c: In function 'writerfn':
bench/epoll-wait.c:399:12: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'size_t' {aka 'unsigned int'} [-Werror=format=]
printinfo("exiting writer-thread (total full-loops: %ld)\n", iter);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~
bench/epoll-wait.c:86:31: note: in definition of macro 'printinfo'
do { if (__verbose) { printf(fmt, ## arg); fflush(stdout); } } while (0)
^~~cc1: all warnings being treated as errors
--- tools/perf/Documentation/perf-bench.txt | 7 + tools/perf/bench/Build | 2 + tools/perf/bench/bench.h | 2 + tools/perf/bench/epoll-wait.c | 540 ++++++++++++++++++++++++++++++++ tools/perf/builtin-bench.c | 12 + 5 files changed, 563 insertions(+)
tools/perf/Documentation/perf-bench.txt +7 -0
@@ -58,6 +58,9 @@ SUBSYSTEM 'futex':: Futex stressing benchmarks. +'epoll':: + Eventpoll (epoll) stressing benchmarks. + 'all':: All benchmark subsystems.
@@ -203,6 +206,10 @@ Suite for evaluating requeue calls. *lock-pi*:: Suite for evaluating futex lock_pi calls. +SUITES FOR 'epoll' +~~~~~~~~~~~~~~~~~~ +*wait*:: +Suite for evaluating concurrent epoll_wait calls. SEE ALSO --------
tools/perf/bench/Build +2 -0
@@ -7,6 +7,8 @@ perf-y += futex-wake-parallel.o perf-y += futex-requeue.o perf-y += futex-lock-pi.o +perf-y += epoll-wait.o + perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-lib.o perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o perf-$(CONFIG_X86_64) += mem-memset-x86-64-asm.o
tools/perf/bench/bench.h +2 -0
@@ -38,6 +38,8 @@ int bench_futex_requeue(int argc, const char **argv);/* pi futexes */ int bench_futex_lock_pi (int argc,const char **argv); +int bench_epoll_wait (int argc,const char **argv); +#define BENCH_FORMAT_DEFAULT_STR "default"#define BENCH_FORMAT_DEFAULT 0#define BENCH_FORMAT_SIMPLE_STR "simple"
tools/perf/bench/epoll-wait.c new file +540 -0
540 lines not on this page · raw message
tools/perf/builtin-bench.c +12 -0
@@ -14,6 +14,7 @@* mem ... memory access performance * numa ... NUMA scheduling and MM performance * futex ... Futex performance +* epoll ... Event poll performance */ #include "perf.h" #include "util/util.h"
@@ -67,6 +68,14 @@ static struct bench futex_benchmarks[] = { { NULL, NULL, NULL } }; +#ifdef HAVE_EVENTFD +static struct bench epoll_benchmarks[] = { + {"wait" ,"Benchmark epoll concurrent epoll_waits" , bench_epoll_wait }, + {"all" ,"Run all futex benchmarks" ,NULL }, + {NULL ,NULL ,NULL } +}; +#endif // HAVE_EVENTFD +struct collection {const char *name;const char *summary;
@@ -80,6 +89,9 @@ static struct collection collections[] = { { "numa", "NUMA scheduling and MM benchmarks", numa_benchmarks }, #endif {"futex", "Futex stressing benchmarks", futex_benchmarks }, +#ifdef HAVE_EVENTFD + {"epoll", "Epoll stressing benchmarks", epoll_benchmarks }, +#endif { "all", "All benchmarks", NULL }, { NULL, NULL, NULL } };
Davidlohr Bueso
reviewerPATCH 2/2 perf-bench: Add epoll_ctl(2) benchmark
In reply to Davidlohr BuesoBenchmark the various operations allowed for epoll_ctl(2). The idea is to concurrently stress a single epoll instance doing add/mod/del operations.
--- tools/perf/Documentation/perf-bench.txt | 3 + tools/perf/bench/Build | 1 + tools/perf/bench/bench.h | 1 + tools/perf/bench/epoll-ctl.c | 411 ++++++++++++++++++++++++++++++++ tools/perf/builtin-bench.c | 1 + 5 files changed, 417 insertions(+) create mode 100644 tools/perf/bench/epoll-ctl.c
tools/perf/Documentation/perf-bench.txt +3 -0
@@ -211,6 +211,9 @@ SUITES FOR 'epoll' *wait*:: Suite for evaluating concurrent epoll_wait calls. +*ctl*:: +Suite for evaluating multiple epoll_ctl calls. + SEE ALSO -------- linkperf:perf[1]
tools/perf/bench/Build +1 -0
@@ -8,6 +8,7 @@ perf-y += futex-requeue.o perf-y += futex-lock-pi.o perf-y += epoll-wait.o +perf-y += epoll-ctl.o perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-lib.o perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o
tools/perf/bench/bench.h +1 -0
@@ -39,6 +39,7 @@ int bench_futex_requeue(int argc, const char **argv);int bench_futex_lock_pi (int argc,const char **argv);int bench_epoll_wait (int argc,const char **argv); +int bench_epoll_ctl (int argc,const char **argv);#define BENCH_FORMAT_DEFAULT_STR "default"#define BENCH_FORMAT_DEFAULT 0
tools/perf/bench/epoll-ctl.c new file +411 -0
411 lines not on this page · raw message
tools/perf/builtin-bench.c +1 -0
@@ -70,6 +70,7 @@ static struct bench futex_benchmarks[] = {static struct bench epoll_benchmarks[] = { {"wait" ,"Benchmark epoll concurrent epoll_waits" , bench_epoll_wait }, + {"ctl" ,"Benchmark epoll concurrent epoll_ctls" , bench_epoll_ctl }, {"all" ,"Run all futex benchmarks" ,NULL }, {NULL ,NULL ,NULL } };
Signature · 1 line
2.16.4
tip-bot for Davidlohr Bueso
merge bot[tip:perf/core] perf bench: Add epoll_ctl(2) benchmark
perf bench: Add epoll_ctl(2) benchmark
Commit-ID: 231457ec707475c71d4e538a3253f1ed9e294cf0 Gitweb: https://git.kernel.org/tip/231457ec707475c71d4e538a3253f1ed9e294cf0 Author: Davidlohr Bueso <[email protected]> AuthorDate: Tue, 6 Nov 2018 07:22:26 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 21 Nov 2018 22:39:55 -0300
perf bench: Add epoll_ctl(2) benchmark
Benchmark the various operations allowed for epoll_ctl(2). The idea is to concurrently stress a single epoll instance doing add/mod/del operations.
Committer testing:
# perf bench epoll ctl # Running 'epoll/ctl' benchmark: Run summary [PID 20344]: 4 threads doing epoll_ctl ops 64 file-descriptors for 8 secs.
[thread 0] fdmap: 0x21a46b0 ... 0x21a47ac [ add: 1680960 ops; mod: 1680960 ops; del: 1680960 ops ] [thread 1] fdmap: 0x21a4960 ... 0x21a4a5c [ add: 1685440 ops; mod: 1685440 ops; del: 1685440 ops ] [thread 2] fdmap: 0x21a4c10 ... 0x21a4d0c [ add: 1674368 ops; mod: 1674368 ops; del: 1674368 ops ] [thread 3] fdmap: 0x21a4ec0 ... 0x21a4fbc [ add: 1677568 ops; mod: 1677568 ops; del: 1677568 ops ]
Averaged 1679584 ADD operations (+- 0.14%)
Averaged 1679584 MOD operations (+- 0.14%)
Averaged 1679584 DEL operations (+- 0.14%)
#
Lets measure those calls with 'perf trace' to get a glympse at what this benchmark is doing in terms of syscalls:
# perf trace -m32768 -s perf bench epoll ctl # Running 'epoll/ctl' benchmark: Run summary [PID 20405]: 4 threads doing epoll_ctl ops 64 file-descriptors for 8 secs.
[thread 0] fdmap: 0x21764e0 ... 0x21765dc [ add: 1100480 ops; mod: 1100480 ops; del: 1100480 ops ] [thread 1] fdmap: 0x2176790 ... 0x217688c [ add: 1250176 ops; mod: 1250176 ops; del: 1250176 ops ] [thread 2] fdmap: 0x2176a40 ... 0x2176b3c [ add: 1022464 ops; mod: 1022464 ops; del: 1022464 ops ] [thread 3] fdmap: 0x2176cf0 ... 0x2176dec [ add: 705472 ops; mod: 705472 ops; del: 705472 ops ]
Averaged 1019648 ADD operations (+- 11.27%)
Averaged 1019648 MOD operations (+- 11.27%)
Averaged 1019648 DEL operations (+- 11.27%)
Summary of events:
epoll-ctl (20405), 1264 events, 0.0%
syscall calls total min avg max stddev
(msec) (msec) (msec) (msec) (%)
--------------- -------- --------- --------- --------- --------- ------ eventfd2 256 9.514 0.001 0.037 5.243 68.00% clone 4 1.245 0.204 0.311 0.531 24.13% mprotect 66 0.345 0.002 0.005 0.021 7.43% openat 45 0.313 0.004 0.007 0.073 21.93% mmap 88 0.302 0.002 0.003 0.013 5.02% futex 4 0.160 0.002 0.040 0.140 83.43% sched_setaffinity 4 0.124 0.005 0.031 0.070 49.39% read 44 0.103 0.001 0.002 0.013 15.54% fstat 40 0.052 0.001 0.001 0.003 5.43% close 39 0.039 0.001 0.001 0.001 1.48% stat 9 0.034 0.003 0.004 0.006 7.30% access 3 0.023 0.007 0.008 0.008 4.25% open 2 0.021 0.008 0.011 0.013 22.60% getdents 4 0.019 0.001 0.005 0.009 37.15% write 2 0.013 0.004 0.007 0.009 38.48% munmap 1 0.010 0.010 0.010 0.010 0.00% brk 3 0.006 0.001 0.002 0.003 26.34% rt_sigprocmask 2 0.004 0.001 0.002 0.003 43.95% rt_sigaction 3 0.004 0.001 0.001 0.002 16.07% prlimit64 3 0.004 0.001 0.001 0.001 5.39% prctl 1 0.003 0.003 0.003 0.003 0.00% epoll_create 1 0.003 0.003 0.003 0.003 0.00% lseek 2 0.002 0.001 0.001 0.001 11.42% sched_getaffinity 1 0.002 0.002 0.002 0.002 0.00% arch_prctl 1 0.002 0.002 0.002 0.002 0.00% set_tid_address 1 0.001 0.001 0.001 0.001 0.00% getpid 1 0.001 0.001 0.001 0.001 0.00% set_robust_list 1 0.001 0.001 0.001 0.001 0.00% execve 1 0.000 0.000 0.000 0.000 0.00%
epoll-ctl (20406), 1245480 events, 14.6%
syscall calls total min avg max stddev
(msec) (msec) (msec) (msec) (%)
--------------- -------- --------- --------- --------- --------- ------
epoll_ctl 619511 1034.927 0.001 0.002 6.691 0.67% nanosleep 3226 616.114 0.006 0.191 10.376 7.57% futex 2 11.336 0.002 5.668 11.334 99.97% set_robust_list 1 0.001 0.001 0.001 0.001 0.00% clone 1 0.000 0.000 0.000 0.000 0.00%
epoll-ctl (20407), 1243151 events, 14.5%
syscall calls total min avg max stddev
(msec) (msec) (msec) (msec) (%)
--------------- -------- --------- --------- --------- --------- ------
epoll_ctl 618350 1042.181 0.001 0.002 2.512 0.40% nanosleep 3220 366.261 0.012 0.114 18.162 9.59% futex 4 5.463 0.001 1.366 5.427 99.12% set_robust_list 1 0.002 0.002 0.002 0.002 0.00%
epoll-ctl (20408), 1801690 events, 21.1%
syscall calls total min avg max stddev
(msec) (msec) (msec) (msec) (%)
--------------- -------- --------- --------- --------- --------- ------
epoll_ctl 896174 1540.581 0.001 0.002 6.987 0.74% nanosleep 4667 783.393 0.006 0.168 10.419 7.10% futex 2 4.682 0.002 2.341 4.681 99.93% set_robust_list 1 0.002 0.002 0.002 0.002 0.00% clone 1 0.000 0.000 0.000 0.000 0.00%
epoll-ctl (20409), 4254890 events, 49.8%
syscall calls total min avg max stddev
(msec) (msec) (msec) (msec) (%)
--------------- -------- --------- --------- --------- --------- ------
epoll_ctl 2116416 3768.097 0.001 0.002 9.956 0.41% nanosleep 11023 1141.778 0.006 0.104 9.447 4.95% futex 3 0.037 0.002 0.012 0.029 70.50% set_robust_list 1 0.008 0.008 0.008 0.008 0.00% madvise 1 0.005 0.005 0.005 0.005 0.00% clone 1 0.000 0.000 0.000 0.000 0.00%
#
Committer notes:
Fix build on fedora:24-x-ARC-uClibc, debian:experimental-x-mips, debian:experimental-x-mipsel, ubuntu:16.04-x-arm and ubuntu:16.04-x-powerpc
CC /tmp/build/perf/bench/epoll-ctl.o
bench/epoll-ctl.c: In function 'init_fdmaps':
bench/epoll-ctl.c:214:16: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
for (i = 0; i < nfds; i+=inc) {
^
bench/epoll-ctl.c: In function 'bench_epoll_ctl':
bench/epoll-ctl.c:377:16: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
for (i = 0; i < nthreads; i++) {
^
bench/epoll-ctl.c:388:16: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
for (i = 0; i < nthreads; i++) {
^cc1: all warnings being treated as errors
--- tools/perf/Documentation/perf-bench.txt | 3 + tools/perf/bench/Build | 1 + tools/perf/bench/bench.h | 1 + tools/perf/bench/epoll-ctl.c | 413 ++++++++++++++++++++++++++++++++ tools/perf/builtin-bench.c | 1 + 5 files changed, 419 insertions(+)
tools/perf/Documentation/perf-bench.txt +3 -0
@@ -211,6 +211,9 @@ SUITES FOR 'epoll' *wait*:: Suite for evaluating concurrent epoll_wait calls. +*ctl*:: +Suite for evaluating multiple epoll_ctl calls. + SEE ALSO -------- linkperf:perf[1]
tools/perf/bench/Build +1 -0
@@ -8,6 +8,7 @@ perf-y += futex-requeue.o perf-y += futex-lock-pi.o perf-y += epoll-wait.o +perf-y += epoll-ctl.o perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-lib.o perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o
tools/perf/bench/bench.h +1 -0
@@ -39,6 +39,7 @@ int bench_futex_requeue(int argc, const char **argv);int bench_futex_lock_pi (int argc,const char **argv);int bench_epoll_wait (int argc,const char **argv); +int bench_epoll_ctl (int argc,const char **argv);#define BENCH_FORMAT_DEFAULT_STR "default"#define BENCH_FORMAT_DEFAULT 0
tools/perf/bench/epoll-ctl.c new file +413 -0
413 lines not on this page · raw message
tools/perf/builtin-bench.c +1 -0
@@ -71,6 +71,7 @@ static struct bench futex_benchmarks[] = {#ifdef HAVE_EVENTFD static struct bench epoll_benchmarks[] = { {"wait" ,"Benchmark epoll concurrent epoll_waits" , bench_epoll_wait }, + {"ctl" ,"Benchmark epoll concurrent epoll_ctls" , bench_epoll_ctl }, {"all" ,"Run all futex benchmarks" ,NULL }, {NULL ,NULL ,NULL } };