selftests/bpf: fix perf_buffer on s390
Subsystems (5)
PATCH 1/1 selftests/bpf: fix perf_buffer on s390
perf_buffer test fails for exactly the same reason test_attach_probe used to fail: different nanosleep syscall kprobe name.
Reuse the test_attach_probe fix.
Fixes ee5cf82ce04a ("selftests/bpf: test perf buffer API")
Signed-off-by Ilya Leoshkevich <[email protected]>
--- .../testing/selftests/bpf/prog_tests/attach_probe.c | 12 ++---------- tools/testing/selftests/bpf/prog_tests/perf_buffer.c | 8 +------- tools/testing/selftests/bpf/test_progs.h | 8 ++++++++ 3 files changed, 11 insertions(+), 17 deletions(-)
tools/testing/selftests/bpf/prog_tests/attach_probe.c +2 -10
@@ -21,14 +21,6 @@ ssize_t get_base_addr() {return -EINVAL ; } -#ifdef __x86_64__ -#define SYS_KPROBE_NAME "__x64_sys_nanosleep" -#elif defined(__s390x__) -#define SYS_KPROBE_NAME "__s390x_sys_nanosleep" -#else -#define SYS_KPROBE_NAME "sys_nanosleep" -#endif -void test_attach_probe (void ) {const char *kprobe_name ="kprobe/sys_nanosleep" ;
@@ -86,7 +78,7 @@ void test_attach_probe(void) kprobe_link =bpf_program__attach_kprobe (kprobe_prog, false/* retprobe */ , -SYS_KPROBE_NAME ); +SYS_NANOSLEEP_KPROBE_NAME );if (CHECK (IS_ERR (kprobe_link),"attach_kprobe" ,"err %ld\n" ,PTR_ERR (kprobe_link))) { kprobe_link =NULL ;
@@ -94,7 +86,7 @@ void test_attach_probe(void) } kretprobe_link =bpf_program__attach_kprobe (kretprobe_prog, true/* retprobe */ , -SYS_KPROBE_NAME ); +SYS_NANOSLEEP_KPROBE_NAME );if (CHECK (IS_ERR (kretprobe_link),"attach_kretprobe" ,"err %ld\n" ,PTR_ERR (kretprobe_link))) { kretprobe_link =NULL ;
tools/testing/selftests/bpf/prog_tests/perf_buffer.c +1 -7
@@ -5,12 +5,6 @@#include <sys/socket.h> #include <test_progs.h> -#ifdef __x86_64__ -#define SYS_KPROBE_NAME "__x64_sys_nanosleep" -#else -#define SYS_KPROBE_NAME "sys_nanosleep" -#endif -static void on_sample (void *ctx,int cpu,void *data,__u32 size) {int cpu_data = *(int *)data, duration =0 ;
@@ -56,7 +50,7 @@ void test_perf_buffer(void)/* attach kprobe */ link =bpf_program__attach_kprobe (prog, false/* retprobe */ , -SYS_KPROBE_NAME ); +SYS_NANOSLEEP_KPROBE_NAME );if (CHECK (IS_ERR (link),"attach_kprobe" ,"err %ld\n" ,PTR_ERR (link))) goto out_close;
tools/testing/selftests/bpf/test_progs.h +8 -0
@@ -92,3 +92,11 @@ int compare_map_keys(int map1_fd, int map2_fd);int compare_stack_ips (int smap_fd,int amap_fd,int stack_trace_len);int extract_build_id (char *build_id,size_t size);void *spin_lock_thread (void *arg); + +#ifdef __x86_64__ +#define SYS_NANOSLEEP_KPROBE_NAME "__x64_sys_nanosleep" +#elif defined(__s390x__) +#define SYS_NANOSLEEP_KPROBE_NAME "__s390x_sys_nanosleep" +#else +#define SYS_NANOSLEEP_KPROBE_NAME "sys_nanosleep" +#endif
Signature · 1 line
2.21.0
Quoted 9 lines · Ilya Leoshkevich
perf_buffertest fails for exactly the same reasontest_attach_probeused to fail: different nanosleep syscall kprobe name.Reuse the
test_attach_probefix.Fixes ee5cf82ce04a ("selftests/bpf: test perf buffer API")Signed-off-by Ilya Leoshkevich <[email protected]>---
Thanks for the fix!
Acked-by Andrii Nakryiko <[email protected]>
Quoted 87 lines
.../testing/selftests/bpf/prog_tests/attach_probe.c | 12 ++---------- tools/testing/selftests/bpf/prog_tests/perf_buffer.c | 8 +------- tools/testing/selftests/bpf/test_progs.h | 8 ++++++++ 3 files changed, 11 insertions(+), 17 deletions(-)tools/testing/selftests/bpf/prog_tests/attach_probe.c +2
-10@@ -21,14 +21,6 @@ ssize_t get_base_addr() {return -EINVAL ; } -#ifdef __x86_64__ -#define SYS_KPROBE_NAME "__x64_sys_nanosleep" -#elif defined(__s390x__) -#define SYS_KPROBE_NAME "__s390x_sys_nanosleep" -#else -#define SYS_KPROBE_NAME "sys_nanosleep" -#endif -void test_attach_probe (void ) {const char *kprobe_name ="kprobe/sys_nanosleep" ;@@ -86,7 +78,7 @@ void test_attach_probe(void) kprobe_link =bpf_program__attach_kprobe (kprobe_prog, false/* retprobe */ , -SYS_KPROBE_NAME ); +SYS_NANOSLEEP_KPROBE_NAME );if (CHECK (IS_ERR (kprobe_link),"attach_kprobe" ,"err %ld\n" ,PTR_ERR (kprobe_link))) { kprobe_link =NULL ;@@ -94,7 +86,7 @@ void test_attach_probe(void) } kretprobe_link =bpf_program__attach_kprobe (kretprobe_prog, true/* retprobe */ , -SYS_KPROBE_NAME ); +SYS_NANOSLEEP_KPROBE_NAME );if (CHECK (IS_ERR (kretprobe_link),"attach_kretprobe" ,"err %ld\n" ,PTR_ERR (kretprobe_link))) { kretprobe_link =NULL ;tools/testing/selftests/bpf/prog_tests/perf_buffer.c +1
-7@@ -5,12 +5,6 @@#include <sys/socket.h> #include <test_progs.h> -#ifdef __x86_64__ -#define SYS_KPROBE_NAME "__x64_sys_nanosleep" -#else -#define SYS_KPROBE_NAME "sys_nanosleep" -#endif -static void on_sample (void *ctx,int cpu,void *data,__u32 size) {int cpu_data = *(int *)data, duration =0 ;@@ -56,7 +50,7 @@ void test_perf_buffer(void)/* attach kprobe */ link =bpf_program__attach_kprobe (prog, false/* retprobe */ , -SYS_KPROBE_NAME ); +SYS_NANOSLEEP_KPROBE_NAME );if (CHECK (IS_ERR (link),"attach_kprobe" ,"err %ld\n" ,PTR_ERR (link))) goto out_close;tools/testing/selftests/bpf/test_progs.h +8
-1@@ -92,3 +92,11 @@ int compare_map_keys(int map1_fd, int map2_fd);int compare_stack_ips (int smap_fd,int amap_fd,int stack_trace_len);int extract_build_id (char *build_id,size_t size);void *spin_lock_thread (void *arg); + +#ifdef __x86_64__ +#define SYS_NANOSLEEP_KPROBE_NAME "__x64_sys_nanosleep" +#elif defined(__s390x__) +#define SYS_NANOSLEEP_KPROBE_NAME "__s390x_sys_nanosleep" +#else +#define SYS_NANOSLEEP_KPROBE_NAME "sys_nanosleep" +#endif --2.21.0
Alexei Starovoitov
AppliedQuoted 8 lines · Andrii Nakryiko
Quoted 6 lines · Ilya Leoshkevich
perf_buffertest fails for exactly the same reasontest_attach_probeused to fail: different nanosleep syscall kprobe name.Reuse the
test_attach_probefix.
Quoted 7 lines
Quoted 3 lines
Fixes ee5cf82ce04a ("selftests/bpf: test perf buffer API")Signed-off-by Ilya Leoshkevich <[email protected]>---
Thanks for the fix!
Acked-by Andrii Nakryiko <[email protected]>
Applied. Thanks!