Fix test_probe_user on s390x
Subsystems (4)
cover Fix test_probe_user on s390x
Hi,
This is a fix for [1]: test_probe_user fails on s390x, because it hooks only connect(), but not socketcall(SYS_CONNECT).
Patch 1 adds this quirk to BPF_KSYSCALL documentation. Patch 2 fixes the test by attaching a prog to socketcall().
Best regards,
Ilya
[1] https://lore.kernel.org/bpf/[email protected]/
Ilya Leoshkevich (2):
libbpf: Extend BPF_KSYSCALL documentation selftests/bpf: Attach to socketcall() in test_probe_user
tools/lib/bpf/bpf_tracing.h | 14 +++++--- .../selftests/bpf/prog_tests/probe_user.c | 35 +++++++++++++------ .../selftests/bpf/progs/test_probe_user.c | 28 +++++++++++++-- 3 files changed, 60 insertions(+), 17 deletions(-)
Signature · 1 line
2.35.3
PATCH 1/2 libbpf: Extend BPF_KSYSCALL documentation
Explicitly list known quirks.
Mention that socket-related syscalls can be invoked via socketcall().
--- tools/lib/bpf/bpf_tracing.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
tools/lib/bpf/bpf_tracing.h +10 -4
@@ -523,10 +523,16 @@ static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args)* Original struct pt_regs * context is preserved as 'ctx' argument. This might * be necessary when using BPF helpers like bpf_perf_event_output(). * -* At the moment BPF_KSYSCALL does not handle all the calling convention -* quirks for mmap(), clone() and compat syscalls transparrently. This may or -* may not change in the future. User needs to take extra measures to handle -* such quirks explicitly, if necessary. +* At the moment BPF_KSYSCALL does not transparently handle all the calling +* convention quirks for the following syscalls: +* +* - mmap(): __ARCH_WANT_SYS_OLD_MMAP. +* - clone(): CLONE_BACKWARDS, CLONE_BACKWARDS2 and CLONE_BACKWARDS3. +* - socket-related syscalls: __ARCH_WANT_SYS_SOCKETCALL. +* - compat syscalls. +* +* This may or may not change in the future. User needs to take extra measures +* to handle such quirks explicitly, if necessary. * * This macro relies on BPF CO-RE support and virtual __kconfig externs. */
Signature · 1 line
2.35.3
PATCH 2/2 selftests/bpf: Attach to socketcall() in test_probe_user
In reply to Ilya Leoshkevichtest_probe_user fails on architectures where libc uses socketcall(SYS_CONNECT) instead of connect(). Fix by attaching to socketcall as well.
--- .../selftests/bpf/prog_tests/probe_user.c | 35 +++++++++++++------ .../selftests/bpf/progs/test_probe_user.c | 28 +++++++++++++-- 2 files changed, 50 insertions(+), 13 deletions(-)
tools/testing/selftests/bpf/prog_tests/probe_user.c +24 -11
@@ -4,25 +4,35 @@/* TODO: corrupts other tests uses connect() */ void serial_test_probe_user (void ) { -const char *prog_name ="handle_sys_connect" ; +const char *prog_names[] = { +"handle_sys_connect" , +#if defined(__s390x__) +"handle_sys_socketcall" , +#endif + }; +const size_t prog_count =ARRAY_SIZE (prog_names);const char *obj_file ="./test_probe_user.o" ; DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts, );int err, results_map_fd, sock_fd, duration =0 ;struct sockaddr curr, orig, tmp;struct sockaddr_in *in = (struct sockaddr_in *)&curr; -struct bpf_link *kprobe_link =NULL ; -struct bpf_program *kprobe_prog; +struct bpf_link *kprobe_links[ARRAY_SIZE (prog_names)] = {}; +struct bpf_program *kprobe_progs[ARRAY_SIZE (prog_names)];struct bpf_object *obj;static const int zero =0 ; +size_t i; obj =bpf_object__open_file (obj_file, &opts);if (!ASSERT_OK_PTR (obj,"obj_open_file" ))return ; - kprobe_prog =bpf_object__find_program_by_name (obj, prog_name); -if (CHECK (!kprobe_prog,"find_probe" , -"prog '%s' not found\n" , prog_name)) - goto cleanup; +for (i =0 ; i < prog_count; i++) { + kprobe_progs[i] = +bpf_object__find_program_by_name (obj, prog_names[i]); +if (CHECK (!kprobe_progs[i],"find_probe" , +"prog '%s' not found\n" , prog_names[i])) + goto cleanup; + } err =bpf_object__load (obj);if (CHECK (err,"obj_load" ,"err %d\n" , err))
@@ -33,9 +43,11 @@ void serial_test_probe_user(void) "err %d\n", results_map_fd)) goto cleanup; - kprobe_link =bpf_program__attach (kprobe_prog); -if (!ASSERT_OK_PTR (kprobe_link,"attach_kprobe" )) - goto cleanup; +for (i =0 ; i < prog_count; i++) { + kprobe_links[i] =bpf_program__attach (kprobe_progs[i]); +if (!ASSERT_OK_PTR (kprobe_links[i],"attach_kprobe" )) + goto cleanup; + }memset (&curr,0 ,sizeof (curr)); in->sin_family =AF_INET ;
@@ -69,6 +81,7 @@ void serial_test_probe_user(void) inet_ntoa(in->sin_addr), ntohs(in->sin_port))) goto cleanup; cleanup: -bpf_link__destroy (kprobe_link); +for (i =0 ; i <ARRAY_SIZE (prog_names); i++) +bpf_link__destroy (kprobe_links[i]);bpf_object__close (obj); }
tools/testing/selftests/bpf/progs/test_probe_user.c +26 -2
@@ -5,10 +5,13 @@#include <bpf/bpf_core_read.h> #include "bpf_misc.h" +#ifndef SYS_CONNECT +#define SYS_CONNECT 3 +#endif +static struct sockaddr_in old; -SEC("ksyscall/connect") -int BPF_KSYSCALL (handle_sys_connect ,int fd,struct sockaddr_in *uservaddr,int addrlen) +static int handle_sys_connect_common (struct sockaddr_in *uservaddr) {struct sockaddr_in new;
@@ -19,4 +22,25 @@ int BPF_KSYSCALL(handle_sys_connect, int fd, struct sockaddr_in *uservaddr, intreturn 0 ; } +SEC("ksyscall/connect") +int BPF_KSYSCALL (handle_sys_connect ,int fd,struct sockaddr_in *uservaddr, +int addrlen) +{ +return handle_sys_connect_common (uservaddr); +} + +SEC("ksyscall/socketcall") +int BPF_KSYSCALL (handle_sys_socketcall ,int call,unsigned long *args) +{ +if (call ==SYS_CONNECT ) { +struct sockaddr_in *uservaddr; + +bpf_probe_read_user (&uservaddr,sizeof (uservaddr), &args[1 ]); + +return handle_sys_connect_common (uservaddr); + } + +return 0 ; +} + char _license[] SEC("license") = "GPL";
Signature · 1 line
2.35.3
Re: [PATCH bpf-next 2/2] selftests/bpf: Attach to socketcall() in test_probe_user
Quoted 73 lines · Ilya Leoshkevich
test_probe_userfails on architectures where libc usessocketcall(SYS_CONNECT)instead ofconnect(). Fix by attaching to socketcall as well.Signed-off-by Ilya Leoshkevich <[email protected]>--- .../selftests/bpf/prog_tests/probe_user.c | 35 +++++++++++++------ .../selftests/bpf/progs/test_probe_user.c | 28 +++++++++++++-- 2 files changed, 50 insertions(+), 13 deletions(-)tools/testing/selftests/bpf/prog_tests/probe_user.c +22
-10@@ -4,25 +4,35 @@/* TODO: corrupts other tests uses connect() */ void serial_test_probe_user (void ) { -const char *prog_name ="handle_sys_connect" ; +const char *prog_names[] = { +"handle_sys_connect" , +#if defined(__s390x__) +"handle_sys_socketcall" , +#endif + }; +const size_t prog_count =ARRAY_SIZE (prog_names);const char *obj_file ="./test_probe_user.o" ; DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts, );int err, results_map_fd, sock_fd, duration =0 ;struct sockaddr curr, orig, tmp;struct sockaddr_in *in = (struct sockaddr_in *)&curr; -struct bpf_link *kprobe_link =NULL ; -struct bpf_program *kprobe_prog; +struct bpf_link *kprobe_links[ARRAY_SIZE (prog_names)] = {}; +struct bpf_program *kprobe_progs[ARRAY_SIZE (prog_names)];struct bpf_object *obj;static const int zero =0 ; +size_t i; obj =bpf_object__open_file (obj_file, &opts);if (!ASSERT_OK_PTR (obj,"obj_open_file" ))return ; - kprobe_prog =bpf_object__find_program_by_name (obj, prog_name); -if (CHECK (!kprobe_prog,"find_probe" , -"prog '%s' not found\n" , prog_name)) - goto cleanup; +for (i =0 ; i < prog_count; i++) { + kprobe_progs[i] = +bpf_object__find_program_by_name (obj, prog_names[i]); +if (CHECK (!kprobe_progs[i],"find_probe" , +"prog '%s' not found\n" , prog_names[i])) + goto cleanup; + } err =bpf_object__load (obj);if (CHECK (err,"obj_load" ,"err %d\n" , err))@@ -33,9 +43,11 @@ void serial_test_probe_user(void) "err %d\n", results_map_fd)) goto cleanup; - kprobe_link =bpf_program__attach (kprobe_prog); -if (!ASSERT_OK_PTR (kprobe_link,"attach_kprobe" )) - goto cleanup; +for (i =0 ; i < prog_count; i++) { + kprobe_links[i] =bpf_program__attach (kprobe_progs[i]); +if (!ASSERT_OK_PTR (kprobe_links[i],"attach_kprobe" )) + goto cleanup; + }memset (&curr,0 ,sizeof (curr)); in->sin_family =AF_INET ;
tools/testing/selftests/bpf/prog_tests/probe_user.c void serial_test_probe_user(void) · line 84
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/probe_user.c +1
-1@@ -69,6 +81,7 @@ void serial_test_probe_user(void) inet_ntoa(in->sin_addr), ntohs(in->sin_port))) goto cleanup; cleanup: -bpf_link__destroy (kprobe_link); +for (i =0 ; i <ARRAY_SIZE (prog_names); i++)
nit, you used prog_count in all places, could be also here
Quoted 37 lines
tools/testing/selftests/bpf/prog_tests/probe_user.c +1
-0+bpf_link__destroy (kprobe_links[i]);bpf_object__close (obj); }tools/testing/selftests/bpf/progs/test_probe_user.c +15
-2@@ -5,10 +5,13 @@#include <bpf/bpf_core_read.h> #include "bpf_misc.h" +#ifndef SYS_CONNECT +#define SYS_CONNECT 3 +#endif +static struct sockaddr_in old; -SEC("ksyscall/connect") -int BPF_KSYSCALL (handle_sys_connect ,int fd,struct sockaddr_in *uservaddr,int addrlen) +static int handle_sys_connect_common (struct sockaddr_in *uservaddr) {struct sockaddr_in new;@@ -19,4 +22,25 @@ int BPF_KSYSCALL(handle_sys_connect, int fd, struct sockaddr_in *uservaddr, intreturn 0 ; } +SEC("ksyscall/connect") +int BPF_KSYSCALL (handle_sys_connect ,int fd,struct sockaddr_in *uservaddr, +int addrlen) +{ +return handle_sys_connect_common (uservaddr); +} + +SEC("ksyscall/socketcall") +int BPF_KSYSCALL (handle_sys_socketcall ,int call,unsigned long *args) +{
tools/testing/selftests/bpf/progs/test_probe_user.c int BPF_KSYSCALL(handle_sys_connect, int fd, struct sockaddr_in *uservaddr, int · line 44
Quoted 10 lines
tools/testing/selftests/bpf/progs/test_probe_user.c +10
-0+if (call ==SYS_CONNECT ) { +struct sockaddr_in *uservaddr; + +bpf_probe_read_user (&uservaddr,sizeof (uservaddr), &args[1 ]); + +return handle_sys_connect_common (uservaddr); + } + +return 0 ; +}
should this function be under __s390x__ ifdef same as in the user side?
jirka
Re: [PATCH bpf-next 1/2] libbpf: Extend BPF_KSYSCALL documentation
In reply to Ilya LeoshkevichQuoted 15 lines · Ilya Leoshkevich
Explicitly list known quirks.
Mention that socket-related syscalls can be invoked viasocketcall().Signed-off-by Ilya Leoshkevich <[email protected]>--- tools/lib/bpf/bpf_tracing.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)tools/lib/bpf/bpf_tracing.h +0
-0@@ -523,10 +523,16 @@ static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args)* Original struct pt_regs * context is preserved as 'ctx' argument. This might * be necessary when using BPF helpers like bpf_perf_event_output().
tools/lib/bpf/bpf_tracing.h static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args) · line 530
Quoted 10 lines
tools/lib/bpf/bpf_tracing.h +5
-4* -* At the moment BPF_KSYSCALL does not handle all the calling convention -* quirks for mmap(), clone() and compat syscalls transparrently. This may or -* may not change in the future. User needs to take extra measures to handle -* such quirks explicitly, if necessary. +* At the moment BPF_KSYSCALL does not transparently handle all the calling +* convention quirks for the following syscalls: +* +* - mmap(): __ARCH_WANT_SYS_OLD_MMAP. +* - clone(): CLONE_BACKWARDS, CLONE_BACKWARDS2 and CLONE_BACKWARDS3.
nit, these could have CONFIG_ prefix to make it more obvious it's config options
jirka
Quoted 11 lines
tools/lib/bpf/bpf_tracing.h +5
-0+* - socket-related syscalls: __ARCH_WANT_SYS_SOCKETCALL. +* - compat syscalls. +* +* This may or may not change in the future. User needs to take extra measures +* to handle such quirks explicitly, if necessary. * * This macro relies on BPF CO-RE support and virtual __kconfig externs. */ Signature · 1 line
2.35.3