* [PATCH bpf-next] libbpf: Fix register naming in PT_REGS s390 macros
@ 2020-05-13 15:44 Sumanth Korikkar
2020-05-13 18:13 ` Andrii Nakryiko
0 siblings, 1 reply; 3+ messages in thread
From: Sumanth Korikkar @ 2020-05-13 15:44 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, netdev, bpf
Cc: iii, jwi, Martin KaFai Lau, Song Liu, Yonghong Song,
Andrii Nakryiko, John Fastabend, KP Singh, Sumanth Korikkar
Fix register naming in PT_REGS s390 macros
Fixes: b8ebce86ffe6 ("libbpf: Provide CO-RE variants of PT_REGS macros")
Reviewed-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
---
tools/lib/bpf/bpf_tracing.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h
index f3f3c3fb98cb..48a9c7c69ef1 100644
--- a/tools/lib/bpf/bpf_tracing.h
+++ b/tools/lib/bpf/bpf_tracing.h
@@ -148,11 +148,11 @@ struct pt_regs;
#define PT_REGS_PARM3_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[4])
#define PT_REGS_PARM4_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[5])
#define PT_REGS_PARM5_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[6])
-#define PT_REGS_RET_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), grps[14])
+#define PT_REGS_RET_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[14])
#define PT_REGS_FP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[11])
#define PT_REGS_RC_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[2])
#define PT_REGS_SP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[15])
-#define PT_REGS_IP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), pdw.addr)
+#define PT_REGS_IP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), psw.addr)
#elif defined(bpf_target_arm)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] libbpf: Fix register naming in PT_REGS s390 macros
2020-05-13 15:44 [PATCH bpf-next] libbpf: Fix register naming in PT_REGS s390 macros Sumanth Korikkar
@ 2020-05-13 18:13 ` Andrii Nakryiko
2020-05-14 19:45 ` Alexei Starovoitov
0 siblings, 1 reply; 3+ messages in thread
From: Andrii Nakryiko @ 2020-05-13 18:13 UTC (permalink / raw)
To: Sumanth Korikkar
Cc: Alexei Starovoitov, Daniel Borkmann, Networking, bpf,
Ilya Leoshkevich, jwi, Martin KaFai Lau, Song Liu, Yonghong Song,
Andrii Nakryiko, John Fastabend, KP Singh
On Wed, May 13, 2020 at 8:45 AM Sumanth Korikkar <sumanthk@linux.ibm.com> wrote:
>
> Fix register naming in PT_REGS s390 macros
>
> Fixes: b8ebce86ffe6 ("libbpf: Provide CO-RE variants of PT_REGS macros")
> Reviewed-by: Julian Wiedmann <jwi@linux.ibm.com>
> Signed-off-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
> ---
Great, thanks for catching this!
Acked-by: Andrii Nakryiko <andriin@fb.com>
> tools/lib/bpf/bpf_tracing.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h
> index f3f3c3fb98cb..48a9c7c69ef1 100644
> --- a/tools/lib/bpf/bpf_tracing.h
> +++ b/tools/lib/bpf/bpf_tracing.h
> @@ -148,11 +148,11 @@ struct pt_regs;
> #define PT_REGS_PARM3_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[4])
> #define PT_REGS_PARM4_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[5])
> #define PT_REGS_PARM5_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[6])
> -#define PT_REGS_RET_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), grps[14])
> +#define PT_REGS_RET_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[14])
> #define PT_REGS_FP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[11])
> #define PT_REGS_RC_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[2])
> #define PT_REGS_SP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[15])
> -#define PT_REGS_IP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), pdw.addr)
> +#define PT_REGS_IP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), psw.addr)
>
> #elif defined(bpf_target_arm)
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] libbpf: Fix register naming in PT_REGS s390 macros
2020-05-13 18:13 ` Andrii Nakryiko
@ 2020-05-14 19:45 ` Alexei Starovoitov
0 siblings, 0 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2020-05-14 19:45 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: Sumanth Korikkar, Alexei Starovoitov, Daniel Borkmann,
Networking, bpf, Ilya Leoshkevich, jwi, Martin KaFai Lau,
Song Liu, Yonghong Song, Andrii Nakryiko, John Fastabend,
KP Singh
On Wed, May 13, 2020 at 11:14 AM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Wed, May 13, 2020 at 8:45 AM Sumanth Korikkar <sumanthk@linux.ibm.com> wrote:
> >
> > Fix register naming in PT_REGS s390 macros
> >
> > Fixes: b8ebce86ffe6 ("libbpf: Provide CO-RE variants of PT_REGS macros")
> > Reviewed-by: Julian Wiedmann <jwi@linux.ibm.com>
> > Signed-off-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
> > ---
>
> Great, thanks for catching this!
>
> Acked-by: Andrii Nakryiko <andriin@fb.com>
Applied to bpf tree. Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-14 19:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-13 15:44 [PATCH bpf-next] libbpf: Fix register naming in PT_REGS s390 macros Sumanth Korikkar
2020-05-13 18:13 ` Andrii Nakryiko
2020-05-14 19:45 ` Alexei Starovoitov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.