diff options
| author |   Ilya Leoshkevich <iii@linux.ibm.com> | 2022-02-09 03:17:44 +0100 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2022-02-08 21:37:50 -0800 |
| commit | fbca4a2f649730b67488a8b36140ce4d2cf13c63 (patch) | |
| tree | bd85a4c47968388af6f52981ec4dd94e3e02e4ba | |
| parent | libbpf: Allow overriding PT_REGS_PARM1{_CORE}_SYSCALL (diff) | |
| download | linux-dev-fbca4a2f649730b67488a8b36140ce4d2cf13c63.tar.xz linux-dev-fbca4a2f649730b67488a8b36140ce4d2cf13c63.zip | |
libbpf: Fix accessing the first syscall argument on arm64
On arm64, the first syscall argument should be accessed via orig_x0
(see arch/arm64/include/asm/syscall.h). Currently regs[0] is used
instead, leading to bpf_syscall_macro test failure.
orig_x0 cannot be added to struct user_pt_regs, since its layout is a
part of the ABI. Therefore provide access to it only through
PT_REGS_PARM1_CORE_SYSCALL() by using a struct pt_regs flavor.
Reported-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220209021745.2215452-10-iii@linux.ibm.com
| -rw-r--r-- | tools/lib/bpf/bpf_tracing.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h index 276130d811ab..b6453107f75c 100644 --- a/tools/lib/bpf/bpf_tracing.h +++ b/tools/lib/bpf/bpf_tracing.h @@ -146,6 +146,10 @@ #elif defined(bpf_target_arm64) +struct pt_regs___arm64 { + unsigned long orig_x0; +}; + /* arm64 provides struct user_pt_regs instead of struct pt_regs to userspace */ #define __PT_REGS_CAST(x) ((const struct user_pt_regs *)(x)) #define __PT_PARM1_REG regs[0] @@ -158,6 +162,8 @@ #define __PT_RC_REG regs[0] #define __PT_SP_REG sp #define __PT_IP_REG pc +#define PT_REGS_PARM1_SYSCALL(x) ({ _Pragma("GCC error \"use PT_REGS_PARM1_CORE_SYSCALL() instead\""); 0l; }) +#define PT_REGS_PARM1_CORE_SYSCALL(x) BPF_CORE_READ((const struct pt_regs___arm64 *)(x), orig_x0) #elif defined(bpf_target_mips) |