From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii.nakryiko@gmail.com>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Paul Walmsley <paul.walmsley@sifive.com>
Cc: bpf@vger.kernel.org, Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PATCH bpf-next v2 07/10] libbpf: Fix accessing the first syscall argument on arm64
Date: Fri, 4 Feb 2022 05:19:52 +0100 [thread overview]
Message-ID: <20220204041955.1958263-8-iii@linux.ibm.com> (raw)
In-Reply-To: <20220204041955.1958263-1-iii@linux.ibm.com>
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.
Fixes: d084df3b7a4c ("libbpf: Fix the incorrect register read for syscalls on x86_64")
Reported-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
tools/lib/bpf/bpf_tracing.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h
index 400a4f002f77..4a990111d9a8 100644
--- a/tools/lib/bpf/bpf_tracing.h
+++ b/tools/lib/bpf/bpf_tracing.h
@@ -145,6 +145,7 @@
/* 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]
+#define __PT_PARM1_REG_SYSCALL orig_x0
#define __PT_PARM2_REG regs[1]
#define __PT_PARM3_REG regs[2]
#define __PT_PARM4_REG regs[3]
--
2.34.1
next prev parent reply other threads:[~2022-02-04 4:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 4:19 [PATCH bpf-next v2 00/10] libbpf: Fix accessing syscall arguments Ilya Leoshkevich
2022-02-04 4:19 ` [PATCH bpf-next v2 01/10] arm64/bpf: Add orig_x0 to user_pt_regs Ilya Leoshkevich
2022-02-04 4:19 ` [PATCH bpf-next v2 02/10] s390/bpf: Add orig_gpr2 " Ilya Leoshkevich
2022-02-04 5:19 ` Andrii Nakryiko
2022-02-04 10:09 ` Heiko Carstens
2022-02-04 4:19 ` [PATCH bpf-next v2 03/10] selftests/bpf: Fix an endianness issue in bpf_syscall_macro test Ilya Leoshkevich
2022-02-04 4:19 ` [PATCH bpf-next v2 04/10] libbpf: Add __PT_PARM1_REG_SYSCALL macro Ilya Leoshkevich
2022-02-04 4:19 ` [PATCH bpf-next v2 05/10] libbpf: Add PT_REGS_SYSCALL macro Ilya Leoshkevich
2022-02-04 5:22 ` Andrii Nakryiko
2022-02-04 5:23 ` Andrii Nakryiko
2022-02-04 12:29 ` Ilya Leoshkevich
2022-02-04 18:09 ` Andrii Nakryiko
2022-02-04 4:19 ` [PATCH bpf-next v2 06/10] selftests/bpf: Use PT_REGS_SYSCALL in bpf_syscall_macro Ilya Leoshkevich
2022-02-04 4:19 ` Ilya Leoshkevich [this message]
2022-02-04 4:19 ` [PATCH bpf-next v2 08/10] libbpf: Fix accessing syscall arguments on powerpc Ilya Leoshkevich
2022-02-04 4:19 ` [PATCH bpf-next v2 09/10] libbpf: Fix accessing syscall arguments on riscv Ilya Leoshkevich
2022-02-04 5:25 ` Andrii Nakryiko
2022-02-04 4:19 ` [PATCH bpf-next v2 10/10] libbpf: Fix accessing the first syscall argument on s390 Ilya Leoshkevich
2022-02-04 5:28 ` [PATCH bpf-next v2 00/10] libbpf: Fix accessing syscall arguments Andrii Nakryiko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220204041955.1958263-8-iii@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=borntraeger@linux.ibm.com \
--cc=bpf@vger.kernel.org \
--cc=catalin.marinas@arm.com \
--cc=daniel@iogearbox.net \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=paul.walmsley@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox