samples/bpf: enhance syscall tracing program
Subsystems (4)
v3 cover samples/bpf: enhance syscall tracing program
Syscall tracing using kprobe is quite unstable. Since it uses the exact name of the kernel function, the program might broke due to the rename of a function. The problem can also be caused by a changes in the arguments of the function to which the kprobe connects. This commit enhances syscall tracing program with the following instruments.
In this patchset, ksyscall is used instead of kprobe. By using ksyscall, libbpf will detect the appropriate kernel function name. (e.g. sys_write -> __s390_sys_write). This eliminates the need to worry about which wrapper function to attach in order to parse arguments. Also ksyscall provides more fine method with attaching system call, the coarse SYSCALL helper at trace_common.h can be removed.
Next, BPF_SYSCALL is used to reduce the inconvenience of parsing arguments. Since the nature of SYSCALL_WRAPPER function wraps the argument once, additional process of argument extraction is required to properly parse the argument. The BPF_SYSCALL macro will reduces the hassle of parsing arguments from pt_regs.
Lastly, vmlinux.h is applied to syscall tracing program. This change allows the bpf program to refer to the internal structure as a single "vmlinux.h" instead of including each header referenced by the bpf program.
Additionally, this patchset changes the suffix of _kern to .bpf to make use of the new compile rule (CLANG-BPF) which is more simple and neat. By just changing the _kern suffix to .bpf will inherit the benefit of the new CLANG-BPF compile target.
Also, this commit adds dummy gnu/stub.h to the samples/bpf directory. This will fix the compiling problem with 'clang -target bpf'.
To fix the build error with the s390x, this patchset also includes the fix of libbpf invalid return address register mapping in s390.
---
Changes in V2:
- add gnu/stub.h hack to fix compile error with 'clang -target bpf' Changes in V3:
- fix libbpf invalid return address register mapping in s390
Daniel T. Lee (6):
samples/bpf: use kyscall instead of kprobe in syscall tracing program samples/bpf: use vmlinux.h instead of implicit headers in syscall
tracing program
samples/bpf: change _kern suffix to .bpf with syscall tracing program samples/bpf: fix tracex2 by using BPF_KSYSCALL macro samples/bpf: use BPF_KSYSCALL macro in syscall tracing programs
libbpf: fix invalid return address register in s390
samples/bpf/Makefile | 10 ++--
samples/bpf/gnu/stubs.h | 1 +
...p_perf_test_kern.c => map_perf_test.bpf.c} | 48 ++++++++-----------
samples/bpf/map_perf_test_user.c | 2 +-
...c => test_current_task_under_cgroup.bpf.c} | 11 ++---
.../bpf/test_current_task_under_cgroup_user.c | 2 +-
samples/bpf/test_map_in_map_kern.c | 1 -
...ser_kern.c => test_probe_write_user.bpf.c} | 20 ++++----
samples/bpf/test_probe_write_user_user.c | 2 +-
samples/bpf/trace_common.h | 13 -----
...trace_output_kern.c => trace_output.bpf.c} | 6 +--
samples/bpf/trace_output_user.c | 2 +-
samples/bpf/{tracex2_kern.c => tracex2.bpf.c} | 13 ++---
samples/bpf/tracex2_user.c | 2 +-
tools/lib/bpf/bpf_tracing.h | 2 +-
15 files changed, 53 insertions(+), 82 deletions(-)
create mode 100644 samples/bpf/gnu/stubs.h
rename samples/bpf/{map_perf_test_kern.c => map_perf_test.bpf.c} (85%)
rename samples/bpf/{test_current_task_under_cgroup_kern.c => test_current_task_under_cgroup.bpf.c} (84%)
rename samples/bpf/{test_probe_write_user_kern.c => test_probe_write_user.bpf.c} (71%)
delete mode 100644 samples/bpf/trace_common.h
rename samples/bpf/{trace_output_kern.c => trace_output.bpf.c} (82%)
rename samples/bpf/{tracex2_kern.c => tracex2.bpf.c} (89%)Signature · 1 line
2.34.1
PATCH v3 1/6 samples/bpf: use kyscall instead of kprobe in syscall tracing program
Syscall tracing using kprobe is quite unstable. Since it uses the exact name of the kernel function, the program might broke due to the rename of a function. The problem can also be caused by a changes in the arguments of the function to which the kprobe connects.
In this commit, ksyscall is used instead of kprobe. By using ksyscall, libbpf will detect the appropriate kernel function name. (e.g. sys_write -> __s390_sys_write). This eliminates the need to worry about which wrapper function to attach in order to parse arguments.
In addition, ksyscall provides more fine method with attaching system call, the coarse SYSCALL helper at trace_common.h can be removed.
--- samples/bpf/map_perf_test_kern.c | 17 ++++++++--------- .../bpf/test_current_task_under_cgroup_kern.c | 3 +-- samples/bpf/test_map_in_map_kern.c | 1 - samples/bpf/test_probe_write_user_kern.c | 3 +-- samples/bpf/trace_common.h | 13 ------------- samples/bpf/trace_output_kern.c | 3 +-- samples/bpf/tracex2_kern.c | 3 +-- 7 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 samples/bpf/trace_common.h
samples/bpf/map_perf_test_kern.c +8 -9
@@ -11,7 +11,6 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include <bpf/bpf_core_read.h> -#include "trace_common.h" #define MAX_ENTRIES 1000#define MAX_NR_CPUS 1024
@@ -102,7 +101,7 @@ struct {__uint (max_entries,MAX_ENTRIES ); } lru_hash_lookup_map SEC(".maps"); -SEC("kprobe/" SYSCALL(sys_getuid)) +SEC("ksyscall/getuid")int stress_hmap (struct pt_regs *ctx) {u32 key =bpf_get_current_pid_tgid ();
@@ -120,7 +119,7 @@ int stress_hmap(struct pt_regs *ctx)return 0 ; } -SEC("kprobe/" SYSCALL(sys_geteuid)) +SEC("ksyscall/geteuid")int stress_percpu_hmap (struct pt_regs *ctx) {u32 key =bpf_get_current_pid_tgid ();
@@ -137,7 +136,7 @@ int stress_percpu_hmap(struct pt_regs *ctx)return 0 ; } -SEC("kprobe/" SYSCALL(sys_getgid)) +SEC("ksyscall/getgid")int stress_hmap_alloc (struct pt_regs *ctx) {u32 key =bpf_get_current_pid_tgid ();
@@ -154,7 +153,7 @@ int stress_hmap_alloc(struct pt_regs *ctx)return 0 ; } -SEC("kprobe/" SYSCALL(sys_getegid)) +SEC("ksyscall/getegid")int stress_percpu_hmap_alloc (struct pt_regs *ctx) {u32 key =bpf_get_current_pid_tgid ();
@@ -171,7 +170,7 @@ int stress_percpu_hmap_alloc(struct pt_regs *ctx)return 0 ; } -SEC("kprobe/" SYSCALL(sys_connect)) +SEC("ksyscall/connect")int stress_lru_hmap_alloc (struct pt_regs *ctx) {struct pt_regs *real_regs = (struct pt_regs *)PT_REGS_PARM1_CORE (ctx);
@@ -251,7 +250,7 @@ int stress_lru_hmap_alloc(struct pt_regs *ctx)return 0 ; } -SEC("kprobe/" SYSCALL(sys_gettid)) +SEC("ksyscall/gettid")int stress_lpm_trie_map_alloc (struct pt_regs *ctx) {union {
@@ -273,7 +272,7 @@ int stress_lpm_trie_map_alloc(struct pt_regs *ctx)return 0 ; } -SEC("kprobe/" SYSCALL(sys_getpgid)) +SEC("ksyscall/getpgid")int stress_hash_map_lookup (struct pt_regs *ctx) {u32 key =1 , i;
@@ -286,7 +285,7 @@ int stress_hash_map_lookup(struct pt_regs *ctx)return 0 ; } -SEC("kprobe/" SYSCALL(sys_getppid)) +SEC("ksyscall/getppid")int stress_array_map_lookup (struct pt_regs *ctx) {u32 key =1 , i;
samples/bpf/test_current_task_under_cgroup_kern.c +1 -2
@@ -10,7 +10,6 @@#include <linux/version.h> #include <bpf/bpf_helpers.h> #include <uapi/linux/utsname.h> -#include "trace_common.h" struct { __uint(type, BPF_MAP_TYPE_CGROUP_ARRAY);
@@ -27,7 +26,7 @@ struct { } perf_map SEC(".maps");/* Writes the last PID that called sync to a map at index 0 */ -SEC("kprobe/" SYSCALL(sys_sync)) +SEC("ksyscall/sync")int bpf_prog1 (struct pt_regs *ctx) {u64 pid =bpf_get_current_pid_tgid ();
samples/bpf/test_map_in_map_kern.c +0 -1
@@ -13,7 +13,6 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include <bpf/bpf_core_read.h> -#include "trace_common.h" #define MAX_NR_PORTS 65536
samples/bpf/test_probe_write_user_kern.c +1 -2
@@ -11,7 +11,6 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include <bpf/bpf_core_read.h> -#include "trace_common.h" struct { __uint(type, BPF_MAP_TYPE_HASH);
@@ -28,7 +27,7 @@ struct {* This example sits on a syscall, and the syscall ABI is relatively stable * of course, across platforms, and over time, the ABI may change. */ -SEC("kprobe/" SYSCALL(sys_connect)) +SEC("ksyscall/connect")int bpf_prog1 (struct pt_regs *ctx) {struct pt_regs *real_regs = (struct pt_regs *)PT_REGS_PARM1_CORE (ctx);
samples/bpf/trace_common.h deleted +0 -13
@@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef __TRACE_COMMON_H -#define __TRACE_COMMON_H - -#ifdef __x86_64__ -#define SYSCALL (SYS ) "__x64_" __stringify(SYS) -#elif defined(__s390x__) -#define SYSCALL (SYS ) "__s390x_" __stringify(SYS) -#else -#define SYSCALL (SYS ) __stringify(SYS) -#endif - -#endif
samples/bpf/trace_output_kern.c +1 -2
@@ -2,7 +2,6 @@#include <linux/version.h> #include <uapi/linux/bpf.h> #include <bpf/bpf_helpers.h> -#include "trace_common.h" struct { __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
@@ -11,7 +10,7 @@ struct {__uint (max_entries,2 ); } my_map SEC(".maps"); -SEC("kprobe/" SYSCALL(sys_write)) +SEC("ksyscall/write")int bpf_prog1 (struct pt_regs *ctx) { struct S {
samples/bpf/tracex2_kern.c +1 -2
@@ -10,7 +10,6 @@#include <uapi/linux/bpf.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> -#include "trace_common.h" struct { __uint(type, BPF_MAP_TYPE_HASH);
@@ -78,7 +77,7 @@ struct {__uint (max_entries,1024 ); } my_hist_map SEC(".maps"); -SEC("kprobe/" SYSCALL(sys_write)) +SEC("ksyscall/write")int bpf_prog3 (struct pt_regs *ctx) {long write_size =PT_REGS_PARM3 (ctx);
Signature · 1 line
2.34.1
PATCH v3 2/6 samples/bpf: use vmlinux.h instead of implicit headers in syscall tracing program
In reply to Daniel T. LeeThis commit applies vmlinux.h to syscall tracing program. This change allows the bpf program to refer to the internal structure as a single "vmlinux.h" instead of including each header referenced by the bpf program.
--- samples/bpf/map_perf_test_kern.c | 5 ++--- samples/bpf/test_current_task_under_cgroup_kern.c | 4 +--- samples/bpf/test_probe_write_user_kern.c | 5 ++--- samples/bpf/trace_output_kern.c | 3 +-- samples/bpf/tracex2_kern.c | 4 +--- 5 files changed, 7 insertions(+), 14 deletions(-)
samples/bpf/map_perf_test_kern.c +2 -3
@@ -4,10 +4,9 @@* modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. */ -#include <linux/skbuff.h> -#include <linux/netdevice.h> +#include "vmlinux.h" +#include <errno.h> #include <linux/version.h> -#include <uapi/linux/bpf.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include <bpf/bpf_core_read.h>
samples/bpf/test_current_task_under_cgroup_kern.c +1 -3
@@ -5,11 +5,9 @@* License as published by the Free Software Foundation. */ -#include <linux/ptrace.h> -#include <uapi/linux/bpf.h> +#include "vmlinux.h" #include <linux/version.h> #include <bpf/bpf_helpers.h> -#include <uapi/linux/utsname.h> struct { __uint(type, BPF_MAP_TYPE_CGROUP_ARRAY);
samples/bpf/test_probe_write_user_kern.c +2 -3
@@ -4,9 +4,8 @@* modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. */ -#include <linux/skbuff.h> -#include <linux/netdevice.h> -#include <uapi/linux/bpf.h> +#include "vmlinux.h" +#include <string.h> #include <linux/version.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h>
samples/bpf/trace_output_kern.c +1 -2
@@ -1,6 +1,5 @@ -#include <linux/ptrace.h> +#include "vmlinux.h" #include <linux/version.h> -#include <uapi/linux/bpf.h> #include <bpf/bpf_helpers.h> struct {
samples/bpf/tracex2_kern.c +1 -3
@@ -4,10 +4,8 @@* modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. */ -#include <linux/skbuff.h> -#include <linux/netdevice.h> +#include "vmlinux.h" #include <linux/version.h> -#include <uapi/linux/bpf.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h>
Signature · 1 line
2.34.1
PATCH v3 3/6 samples/bpf: change _kern suffix to .bpf with syscall tracing program
In reply to Daniel T. LeeCurrently old compile rule (CLANG-bpf) doesn't contains VMLINUX_H define flag which is essential for the bpf program that includes "vmlinux.h". Also old compile rule doesn't directly specify the compile target as bpf, instead it uses bunch of extra options with clang followed by long chain of commands. (e.g. clang | opt | llvm-dis | llc)
In Makefile, there is already new compile rule which is more simple and neat. And it also has -D__VMLINUX_H__ option. By just changing the _kern suffix to .bpf will inherit the benefit of the new CLANG-BPF compile target.
Also, this commit adds dummy gnu/stub.h to the samples/bpf directory. As commit 1c2dd16add7e ("selftests/bpf: get rid of -D__x86_64__") noted, compiling with 'clang -target bpf' will raise an error with stubs.h unless workaround (-D__x86_64) is used. This commit solves this problem by adding dummy stub.h to make /usr/include/features.h to follow the expected path as the same way selftests/bpf dealt with.
---
samples/bpf/Makefile | 10 +++++-----
samples/bpf/gnu/stubs.h | 1 +
.../bpf/{map_perf_test_kern.c => map_perf_test.bpf.c} | 0
samples/bpf/map_perf_test_user.c | 2 +-
...oup_kern.c => test_current_task_under_cgroup.bpf.c} | 0
samples/bpf/test_current_task_under_cgroup_user.c | 2 +-
...e_write_user_kern.c => test_probe_write_user.bpf.c} | 0
samples/bpf/test_probe_write_user_user.c | 2 +-
.../bpf/{trace_output_kern.c => trace_output.bpf.c} | 0
samples/bpf/trace_output_user.c | 2 +-
samples/bpf/{tracex2_kern.c => tracex2.bpf.c} | 0
samples/bpf/tracex2_user.c | 2 +-
12 files changed, 11 insertions(+), 10 deletions(-)
create mode 100644 samples/bpf/gnu/stubs.h
rename samples/bpf/{map_perf_test_kern.c => map_perf_test.bpf.c} (100%)
rename samples/bpf/{test_current_task_under_cgroup_kern.c => test_current_task_under_cgroup.bpf.c} (100%)
rename samples/bpf/{test_probe_write_user_kern.c => test_probe_write_user.bpf.c} (100%)
rename samples/bpf/{trace_output_kern.c => trace_output.bpf.c} (100%)
rename samples/bpf/{tracex2_kern.c => tracex2.bpf.c} (100%)samples/bpf/Makefile +5 -5
@@ -125,21 +125,21 @@ always-y += sockex1_kern.o always-y += sockex2_kern.o always-y += sockex3_kern.o always-y += tracex1_kern.o -always-y += tracex2_kern.o +always-y += tracex2.bpf.o always-y += tracex3_kern.o always-y += tracex4_kern.o always-y += tracex5_kern.o always-y += tracex6_kern.o always-y += tracex7_kern.o always-y += sock_flags_kern.o -always-y += test_probe_write_user_kern.o -always-y += trace_output_kern.o +always-y += test_probe_write_user.bpf.o +always-y += trace_output.bpf.o always-y += tcbpf1_kern.o always-y += tc_l2_redirect_kern.o always-y += lathist_kern.o always-y += offwaketime_kern.o always-y += spintest_kern.o -always-y += map_perf_test_kern.o +always-y += map_perf_test.bpf.o always-y += test_overhead_tp_kern.o always-y += test_overhead_raw_tp_kern.o always-y += test_overhead_kprobe_kern.o
@@ -147,7 +147,7 @@ always-y += parse_varlen.o parse_simple.o parse_ldabs.o always-y += test_cgrp2_tc_kern.o always-y += xdp1_kern.o always-y += xdp2_kern.o -always-y += test_current_task_under_cgroup_kern.o +always-y += test_current_task_under_cgroup.bpf.o always-y += trace_event_kern.o always-y += sampleip_kern.o always-y += lwt_len_hist_kern.o
samples/bpf/gnu/stubs.h new file +1 -0
@@ -0,0 +1 @@ +/* dummy .h to trick /usr/include/features.h to work with 'clang -target bpf' */
samples/bpf/map_perf_test.bpf.c renamed from samples/bpf/map_perf_test_kern.c +0 -0
samples/bpf/map_perf_test_user.c +1 -1
@@ -443,7 +443,7 @@ int main(int argc, char **argv)if (argc >4 ) max_cnt =atoi (argv[4 ]); -snprintf (filename,sizeof (filename),"%s_kern.o" , argv[0 ]); +snprintf (filename,sizeof (filename),"%s.bpf.o" , argv[0 ]); obj =bpf_object__open_file (filename,NULL );if (libbpf_get_error (obj)) {fprintf (stderr,"ERROR: opening BPF object file failed\n" );
samples/bpf/test_current_task_under_cgroup.bpf.c renamed from samples/bpf/test_current_task_under_cgroup_kern.c +0 -0
samples/bpf/test_current_task_under_cgroup_user.c +1 -1
@@ -21,7 +21,7 @@ int main(int argc, char **argv)char filename[256 ];int map_fd[2 ]; -snprintf (filename,sizeof (filename),"%s_kern.o" , argv[0 ]); +snprintf (filename,sizeof (filename),"%s.bpf.o" , argv[0 ]); obj =bpf_object__open_file (filename,NULL );if (libbpf_get_error (obj)) {fprintf (stderr,"ERROR: opening BPF object file failed\n" );
samples/bpf/test_probe_write_user.bpf.c renamed from samples/bpf/test_probe_write_user_kern.c +0 -0
samples/bpf/test_probe_write_user_user.c +1 -1
@@ -24,7 +24,7 @@ int main(int ac, char **argv) mapped_addr_in = (struct sockaddr_in *)&mapped_addr; tmp_addr_in = (struct sockaddr_in *)&tmp_addr; -snprintf (filename,sizeof (filename),"%s_kern.o" , argv[0 ]); +snprintf (filename,sizeof (filename),"%s.bpf.o" , argv[0 ]); obj =bpf_object__open_file (filename,NULL );if (libbpf_get_error (obj)) {fprintf (stderr,"ERROR: opening BPF object file failed\n" );
samples/bpf/trace_output.bpf.c renamed from samples/bpf/trace_output_kern.c +0 -0
samples/bpf/trace_output_user.c +1 -1
@@ -51,7 +51,7 @@ int main(int argc, char **argv)char filename[256 ];FILE *f; -snprintf (filename,sizeof (filename),"%s_kern.o" , argv[0 ]); +snprintf (filename,sizeof (filename),"%s.bpf.o" , argv[0 ]); obj =bpf_object__open_file (filename,NULL );if (libbpf_get_error (obj)) {fprintf (stderr,"ERROR: opening BPF object file failed\n" );
samples/bpf/tracex2.bpf.c renamed from samples/bpf/tracex2_kern.c +0 -0
samples/bpf/tracex2_user.c +1 -1
@@ -123,7 +123,7 @@ int main(int ac, char **argv)int i, j =0 ;FILE *f; -snprintf (filename,sizeof (filename),"%s_kern.o" , argv[0 ]); +snprintf (filename,sizeof (filename),"%s.bpf.o" , argv[0 ]); obj =bpf_object__open_file (filename,NULL );if (libbpf_get_error (obj)) {fprintf (stderr,"ERROR: opening BPF object file failed\n" );
Signature · 1 line
2.34.1
PATCH v3 4/6 samples/bpf: fix tracex2 by using BPF_KSYSCALL macro
In reply to Daniel T. LeeCurrently, there is a problem with tracex2, as it doesn't print the histogram properly and the results are misleading. (all results report as 0)
The problem is caused by a change in arguments of the function to which the kprobe connects. This tracex2 bpf program uses kprobe (attached to __x64_sys_write) to figure out the size of the write system call. In order to achieve this, the third argument 'count' must be intact.
The following is a prototype of the sys_write variant. (checked with pfunct)
~/git/linux$ pfunct -P fs/read_write.o | grep sys_write
ssize_t ksys_write(unsigned int fd, const char * buf, size_t count);
long int __x64_sys_write(const struct pt_regs * regs);
... cross compile with s390x ...
long int __s390_sys_write(struct pt_regs * regs);Since the nature of SYSCALL_WRAPPER function wraps the argument once, additional process of argument extraction is required to properly parse the argument.
#define BPF_KSYSCALL(name, args...)
... snip ...
struct pt_regs *regs = LINUX_HAS_SYSCALL_WRAPPER \
? (struct pt_regs *)PT_REGS_PARM1(ctx) \
: ctx; \In order to fix this problem, the BPF_SYSCALL macro has been used. This reduces the hassle of parsing arguments from pt_regs. Since the macro uses the CORE version of argument extraction, additional portability comes too.
--- samples/bpf/tracex2.bpf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
samples/bpf/tracex2.bpf.c +3 -3
@@ -8,6 +8,7 @@#include <linux/version.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> +#include <bpf/bpf_core_read.h> struct { __uint(type, BPF_MAP_TYPE_HASH);
@@ -76,14 +77,13 @@ struct { } my_hist_map SEC(".maps"); SEC("ksyscall/write") -int bpf_prog3 (struct pt_regs *ctx) +int BPF_KSYSCALL (bpf_prog3 ,unsigned int fd,const char *buf,size_t count) { -long write_size =PT_REGS_PARM3 (ctx);long init_val =1 ;long *value;struct hist_key key; - key.index =log2l (write_size); + key.index =log2l (count); key.pid_tgid =bpf_get_current_pid_tgid (); key.uid_gid =bpf_get_current_uid_gid ();bpf_get_current_comm (&key.comm,sizeof (key.comm));
Signature · 1 line
2.34.1
PATCH v3 5/6 samples/bpf: use BPF_KSYSCALL macro in syscall tracing programs
In reply to Daniel T. LeeThis commit enhances the syscall tracing programs by using the BPF_SYSCALL macro to reduce the inconvenience of parsing arguments from pt_regs. By simplifying argument extraction, bpf program will become clear to understand.
--- samples/bpf/map_perf_test.bpf.c | 26 ++++++++----------- .../bpf/test_current_task_under_cgroup.bpf.c | 4 ++- samples/bpf/test_probe_write_user.bpf.c | 12 ++++----- 3 files changed, 19 insertions(+), 23 deletions(-)
samples/bpf/map_perf_test.bpf.c +11 -15
@@ -101,7 +101,7 @@ struct { } lru_hash_lookup_map SEC(".maps"); SEC("ksyscall/getuid") -int stress_hmap (struct pt_regs *ctx) +int BPF_KSYSCALL (stress_hmap ) {u32 key =bpf_get_current_pid_tgid ();long init_val =1 ;
@@ -119,7 +119,7 @@ int stress_hmap(struct pt_regs *ctx) } SEC("ksyscall/geteuid") -int stress_percpu_hmap (struct pt_regs *ctx) +int BPF_KSYSCALL (stress_percpu_hmap ) {u32 key =bpf_get_current_pid_tgid ();long init_val =1 ;
@@ -136,7 +136,7 @@ int stress_percpu_hmap(struct pt_regs *ctx) } SEC("ksyscall/getgid") -int stress_hmap_alloc (struct pt_regs *ctx) +int BPF_KSYSCALL (stress_hmap_alloc ) {u32 key =bpf_get_current_pid_tgid ();long init_val =1 ;
@@ -153,7 +153,7 @@ int stress_hmap_alloc(struct pt_regs *ctx) } SEC("ksyscall/getegid") -int stress_percpu_hmap_alloc (struct pt_regs *ctx) +int BPF_KSYSCALL (stress_percpu_hmap_alloc ) {u32 key =bpf_get_current_pid_tgid ();long init_val =1 ;
@@ -168,11 +168,10 @@ int stress_percpu_hmap_alloc(struct pt_regs *ctx) }return 0 ; } - SEC("ksyscall/connect") -int stress_lru_hmap_alloc (struct pt_regs *ctx) +int BPF_KSYSCALL (stress_lru_hmap_alloc ,int fd,struct sockaddr_in *uservaddr, +int addrlen) { -struct pt_regs *real_regs = (struct pt_regs *)PT_REGS_PARM1_CORE (ctx);char fmt[] ="Failed at stress_lru_hmap_alloc. ret:%dn" ;union {u16 dst6[8 ];
@@ -185,14 +184,11 @@ int stress_lru_hmap_alloc(struct pt_regs *ctx)u32 key; }; } test_params; -struct sockaddr_in6 *in6; +struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)uservaddr;u16 test_case; -int addrlen, ret;long val =1 ;u32 key =0 ; - - in6 = (struct sockaddr_in6 *)PT_REGS_PARM2_CORE (real_regs); - addrlen = (int )PT_REGS_PARM3_CORE (real_regs); +int ret;if (addrlen !=sizeof (*in6))return 0 ;
@@ -250,7 +246,7 @@ int stress_lru_hmap_alloc(struct pt_regs *ctx) } SEC("ksyscall/gettid") -int stress_lpm_trie_map_alloc (struct pt_regs *ctx) +int BPF_KSYSCALL (stress_lpm_trie_map_alloc ) {union {u32 b32[2 ];
@@ -272,7 +268,7 @@ int stress_lpm_trie_map_alloc(struct pt_regs *ctx) } SEC("ksyscall/getpgid") -int stress_hash_map_lookup (struct pt_regs *ctx) +int BPF_KSYSCALL (stress_hash_map_lookup ) {u32 key =1 , i;long *value;
@@ -285,7 +281,7 @@ int stress_hash_map_lookup(struct pt_regs *ctx) } SEC("ksyscall/getppid") -int stress_array_map_lookup (struct pt_regs *ctx) +int BPF_KSYSCALL (stress_array_map_lookup ) {u32 key =1 , i;long *value;
samples/bpf/test_current_task_under_cgroup.bpf.c +3 -1
@@ -8,6 +8,8 @@#include "vmlinux.h" #include <linux/version.h> #include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> +#include <bpf/bpf_core_read.h> struct { __uint(type, BPF_MAP_TYPE_CGROUP_ARRAY);
@@ -25,7 +27,7 @@ struct {/* Writes the last PID that called sync to a map at index 0 */ SEC("ksyscall/sync") -int bpf_prog1 (struct pt_regs *ctx) +int BPF_KSYSCALL (bpf_prog1 ) {u64 pid =bpf_get_current_pid_tgid ();int idx =0 ;
samples/bpf/test_probe_write_user.bpf.c +5 -7
@@ -27,24 +27,22 @@ struct {* of course, across platforms, and over time, the ABI may change. */ SEC("ksyscall/connect") -int bpf_prog1 (struct pt_regs *ctx) +int BPF_KSYSCALL (bpf_prog1 ,int fd,struct sockaddr_in *uservaddr, +int addrlen) { -struct pt_regs *real_regs = (struct pt_regs *)PT_REGS_PARM1_CORE (ctx); -void *sockaddr_arg = (void *)PT_REGS_PARM2_CORE (real_regs); -int sockaddr_len = (int )PT_REGS_PARM3_CORE (real_regs);struct sockaddr_in new_addr, orig_addr = {};struct sockaddr_in *mapped_addr; -if (sockaddr_len >sizeof (orig_addr)) +if (addrlen >sizeof (orig_addr))return 0 ; -if (bpf_probe_read_user (&orig_addr,sizeof (orig_addr), sockaddr_arg) !=0 ) +if (bpf_probe_read_user (&orig_addr,sizeof (orig_addr), uservaddr) !=0 )return 0 ; mapped_addr =bpf_map_lookup_elem (&dnat_map, &orig_addr);if (mapped_addr !=NULL ) {memcpy (&new_addr, mapped_addr,sizeof (new_addr)); -bpf_probe_write_user (sockaddr_arg, &new_addr, +bpf_probe_write_user (uservaddr, &new_addr,sizeof (new_addr)); }return 0 ;
Signature · 1 line
2.34.1
PATCH v3 6/6 libbpf: fix invalid return address register in s390
In reply to Daniel T. LeeThere is currently an invalid register mapping in the s390 return address register. As the manual[1] states, the return address can be found at r14. In bpf_tracing.h, the s390 registers were named gprs(general purpose registers). This commit fixes the problem by correcting the mistyped mapping.
[1]: https://uclibc.org/docs/psABI-s390x.pdf#page=14
--- tools/lib/bpf/bpf_tracing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/bpf_tracing.h +1 -1
@@ -137,7 +137,7 @@ struct pt_regs___s390 {#define __PT_PARM3_REG gprs[4]#define __PT_PARM4_REG gprs[5]#define __PT_PARM5_REG gprs[6] -#define __PT_RET_REG grps[14] +#define __PT_RET_REG gprs[14]#define __PT_FP_REG gprs[11]/* Works only with CONFIG_FRAME_POINTER */ #define __PT_RC_REG gprs[2]#define __PT_SP_REG gprs[15]
Signature · 1 line
2.34.1
Re: [bpf-next v3 6/6] libbpf: fix invalid return address register in s390
Quoted 20 lines · Daniel T. Lee
There is currently an invalid register mapping in the s390 return address register. As the manual[1] states, the return address can be found at r14. In
bpf_tracing.h, the s390 registers were named gprs(general purpose registers). This commit fixes the problem by correcting the mistyped mapping.[1]: https://uclibc.org/docs/psABI-s390x.pdf#page=14
Fixes 3cc31d794097 ("libbpf: Normalize PT_REGS_xxx() macro definitions")Signed-off-by Daniel T. Lee <[email protected]>--- tools/lib/bpf/bpf_tracing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/lib/bpf/bpf_tracing.h +0
-0
tools/lib/bpf/bpf_tracing.h struct pt_regs___s390 { · line 140
Quoted 5 lines
tools/lib/bpf/bpf_tracing.h +1
-1@@ -137,7 +137,7 @@ struct pt_regs___s390 {#define __PT_PARM3_REG gprs[4]#define __PT_PARM4_REG gprs[5]#define __PT_PARM5_REG gprs[6] -#define __PT_RET_REG grps[14] +#define __PT_RET_REG gprs[14]
oh, wow, what a typo. Thanks for fixing this! Applied patch set to bpf-next.
Quoted 6 lines
tools/lib/bpf/bpf_tracing.h +0
-1#define __PT_FP_REG gprs[11]/* Works only with CONFIG_FRAME_POINTER */ #define __PT_RC_REG gprs[2]#define __PT_SP_REG gprs[15] --2.34.1