| Message ID | 20200311185345.3874602-1-andriin@fb.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] selftests/bpf: guarantee that useep() calls nanosleep() syscall | expand |
On Wed, Mar 11, 2020 at 11:54 AM Andrii Nakryiko <andriin@fb.com> wrote: > > Some implementations of C runtime library won't call nanosleep() syscall from > usleep(). But a bunch of kprobe/tracepoint selftests rely on nanosleep being > called to trigger them. To make this more reliable, "override" usleep > implementation and call nanosleep explicitly. > > Cc: Julia Kartseva <hex@fb.com> > Signed-off-by: Andrii Nakryiko <andriin@fb.com> Applied. Thanks
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index a969c77e9456..2b0bc1171c9c 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -29,6 +29,15 @@ struct prog_test_def { int old_error_cnt; }; +/* Override C runtime library's usleep() implementation to ensure nanosleep() + * is always called. Usleep is frequently used in selftests as a way to + * trigger kprobe and tracepoints. + */ +int usleep(useconds_t usec) +{ + return syscall(__NR_nanosleep, usec * 1000UL); +} + static bool should_run(struct test_selector *sel, int num, const char *name) { int i;
Some implementations of C runtime library won't call nanosleep() syscall from usleep(). But a bunch of kprobe/tracepoint selftests rely on nanosleep being called to trigger them. To make this more reliable, "override" usleep implementation and call nanosleep explicitly. Cc: Julia Kartseva <hex@fb.com> Signed-off-by: Andrii Nakryiko <andriin@fb.com> --- tools/testing/selftests/bpf/test_progs.c | 9 +++++++++ 1 file changed, 9 insertions(+)