Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/bpf: Use nanosleep() syscall instead of sleep() in get_cgroup_id

Glibc's sleep() switched to clock_nanosleep() from nanosleep(), and thus
syscalls:sys_enter_nanosleep tracepoint is not hitting which is causing
testcase failure. Instead of depending on glibc sleep(), call nanosleep()
systemcall directly.

Before:

# ./get_cgroup_id_user
...
main:FAIL:compare_cgroup_id kern cgid 0 user cgid 483

After:

# ./get_cgroup_id_user
...
main:PASS:compare_cgroup_id

Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210316153048.136447-1-ravi.bangoria@linux.ibm.com

authored by

Ravi Bangoria and committed by
Daniel Borkmann
56901d48 ebda107e

+5 -1
+5 -1
tools/testing/selftests/bpf/get_cgroup_id_user.c
··· 57 57 __u32 key = 0, pid; 58 58 int exit_code = 1; 59 59 char buf[256]; 60 + const struct timespec req = { 61 + .tv_sec = 1, 62 + .tv_nsec = 0, 63 + }; 60 64 61 65 cgroup_fd = cgroup_setup_and_join(TEST_CGROUP); 62 66 if (CHECK(cgroup_fd < 0, "cgroup_setup_and_join", "err %d errno %d\n", cgroup_fd, errno)) ··· 119 115 goto close_pmu; 120 116 121 117 /* trigger some syscalls */ 122 - sleep(1); 118 + syscall(__NR_nanosleep, &req, NULL); 123 119 124 120 err = bpf_map_lookup_elem(cgidmap_fd, &key, &kcgid); 125 121 if (CHECK(err, "bpf_map_lookup_elem", "err %d errno %d\n", err, errno))