| Message ID | 20200513154414.29972-1-sumanthk@linux.ibm.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] libbpf: Fix register naming in PT_REGS s390 macros | expand |
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 >
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
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)
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(-)