| Message ID | 20190710115654.44841-1-iii@linux.ibm.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [v2,bpf] selftests/bpf: fix bpf_target_sparc check | expand |
On Wed, Jul 10, 2019 at 4:57 AM Ilya Leoshkevich <iii@linux.ibm.com> wrote: > > bpf_helpers.h fails to compile on sparc: the code should be checking > for defined(bpf_target_sparc), but checks simply for bpf_target_sparc. > > Also change #ifdef bpf_target_powerpc to #if defined() for consistency. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- Thanks! Acked-by: Andrii Nakryiko <andriin@fb.com> > > v1->v2: bpf_target_powerpc change > > tools/testing/selftests/bpf/bpf_helpers.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h > index 5f6f9e7aba2a..0214797518ce 100644 > --- a/tools/testing/selftests/bpf/bpf_helpers.h > +++ b/tools/testing/selftests/bpf/bpf_helpers.h > @@ -440,10 +440,10 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, > > #endif > > -#ifdef bpf_target_powerpc > +#if defined(bpf_target_powerpc) Oh, yeah, that mix of #ifdef and #if definitely threw me off. I prefer consistency, so thanks for this update! > #define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ (ip) = (ctx)->link; }) > #define BPF_KRETPROBE_READ_RET_IP BPF_KPROBE_READ_RET_IP > -#elif bpf_target_sparc > +#elif defined(bpf_target_sparc) > #define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ (ip) = PT_REGS_RET(ctx); }) > #define BPF_KRETPROBE_READ_RET_IP BPF_KPROBE_READ_RET_IP > #else > -- > 2.21.0 >
From: Ilya Leoshkevich <iii@linux.ibm.com> Date: Wed, 10 Jul 2019 13:56:54 +0200 > bpf_helpers.h fails to compile on sparc: the code should be checking > for defined(bpf_target_sparc), but checks simply for bpf_target_sparc. > > Also change #ifdef bpf_target_powerpc to #if defined() for consistency. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> Acked-by: David S. Miller <davem@davemloft.net>
On 07/10/2019 01:56 PM, Ilya Leoshkevich wrote: > bpf_helpers.h fails to compile on sparc: the code should be checking > for defined(bpf_target_sparc), but checks simply for bpf_target_sparc. > > Also change #ifdef bpf_target_powerpc to #if defined() for consistency. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> Applied, thanks!
diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h index 5f6f9e7aba2a..0214797518ce 100644 --- a/tools/testing/selftests/bpf/bpf_helpers.h +++ b/tools/testing/selftests/bpf/bpf_helpers.h @@ -440,10 +440,10 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, #endif -#ifdef bpf_target_powerpc +#if defined(bpf_target_powerpc) #define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ (ip) = (ctx)->link; }) #define BPF_KRETPROBE_READ_RET_IP BPF_KPROBE_READ_RET_IP -#elif bpf_target_sparc +#elif defined(bpf_target_sparc) #define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ (ip) = PT_REGS_RET(ctx); }) #define BPF_KRETPROBE_READ_RET_IP BPF_KPROBE_READ_RET_IP #else
bpf_helpers.h fails to compile on sparc: the code should be checking for defined(bpf_target_sparc), but checks simply for bpf_target_sparc. Also change #ifdef bpf_target_powerpc to #if defined() for consistency. Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- v1->v2: bpf_target_powerpc change tools/testing/selftests/bpf/bpf_helpers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)