selftests/bpf: fix compiling loop{1,2,3}.c on s390
Subsystems (5)
v2 cover selftests/bpf: fix compiling loop{1,2,3}.c on s390
Use PT_REGS_RC(ctx) instead of ctx->rax, which is not present on s390.
This patch series consists of preparatory commits, which make it possible to use PT_REGS_RC in BPF selftests, followed by the actual fix.
PATCH v2 1/4 selftests/bpf: compile progs with -D__TARGET_ARCH_$(ARCH)
This opens up the possibility of accessing registers in an arch-independent way.
--- tools/testing/selftests/bpf/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/Makefile +3 -1
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 +include ../../../scripts/Makefile.arch LIBDIR := ../../../lib BPFDIR := $(LIBDIR)/bpf
@@ -137,7 +138,8 @@ CLANG_SYS_INCLUDES := $(shell $(CLANG) -v -E - </dev/null 2>&1 \ CLANG_FLAGS = -I. -I./include/uapi -I../../../include/uapi \ $(CLANG_SYS_INCLUDES) \ - -Wno-compare-distinct-pointer-types + -Wno-compare-distinct-pointer-types \ + -D__TARGET_ARCH_$(ARCH) $(OUTPUT)/test_l4lb_noinline.o: CLANG_FLAGS += -fno-inline $(OUTPUT)/test_xdp_noinline.o: CLANG_FLAGS += -fno-inline
Signature · 1 line
2.21.0
PATCH v2 2/4 selftests/bpf: fix s390 -> s390 typo
In reply to Ilya LeoshkevichAlso check for __s390__ instead of __s390x__, just in case bpf_helpers.h is ever used by 32-bit userspace.
--- tools/testing/selftests/bpf/bpf_helpers.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/bpf_helpers.h +5 -5
@@ -312,8 +312,8 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode,#if defined(__TARGET_ARCH_x86)#define bpf_target_x86#define bpf_target_defined -#elif defined(__TARGET_ARCH_s930x) -#define bpf_target_s930x +#elif defined(__TARGET_ARCH_s390) +#define bpf_target_s390#define bpf_target_defined#elif defined(__TARGET_ARCH_arm)#define bpf_target_arm
@@ -338,8 +338,8 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode,#ifndef bpf_target_defined#if defined(__x86_64__)#define bpf_target_x86 -#elif defined(__s390x__) -#define bpf_target_s930x +#elif defined(__s390__) +#define bpf_target_s390#elif defined(__arm__)#define bpf_target_arm#elif defined(__aarch64__)
@@ -366,7 +366,7 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode,#define PT_REGS_SP (x) ((x)->sp)#define PT_REGS_IP (x) ((x)->ip) -#elif defined(bpf_target_s390x) +#elif defined(bpf_target_s390)#define PT_REGS_PARM1 (x) ((x)->gprs[2])#define PT_REGS_PARM2 (x) ((x)->gprs[3])
Signature · 1 line
2.21.0
PATCH v2 3/4 selftests/bpf: make PT_REGS_* work in userspace
In reply to Ilya LeoshkevichRight now, at least on s390 and x86_64, these macros are usable only with kernel headers. This patch makes it possible to use them with userspace headers and, as a consequence, in BPF selftests.
On s390, provide the forward declaration of struct pt_regs and cast it to user_pt_regs in PT_REGS_* macros. This is necessary, because instead of the full struct pt_regs, s390 exposes only its first member user_pt_regs to userspace, and bpf_helpers.h is used with both userspace (in selftests) and kernel (in samples) headers. It was added in commit 466698e654e8 ("s390/bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type").
On x86, provide userspace versions of PT_REGS_* macros. Unlike s390, x86 provides struct pt_regs to both userspace and kernel, however, with different member names.
--- tools/testing/selftests/bpf/bpf_helpers.h | 36 ++++++++++++++++------- 1 file changed, 26 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/bpf_helpers.h +26 -10
@@ -355,6 +355,7 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode,#if defined(bpf_target_x86) +#ifdef __KERNEL__#define PT_REGS_PARM1 (x) ((x)->di)#define PT_REGS_PARM2 (x) ((x)->si)#define PT_REGS_PARM3 (x) ((x)->dx)
@@ -365,19 +366,34 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode,#define PT_REGS_RC (x) ((x)->ax)#define PT_REGS_SP (x) ((x)->sp)#define PT_REGS_IP (x) ((x)->ip) +#else +#define PT_REGS_PARM1 (x) ((x)->rdi) +#define PT_REGS_PARM2 (x) ((x)->rsi) +#define PT_REGS_PARM3 (x) ((x)->rdx) +#define PT_REGS_PARM4 (x) ((x)->rcx) +#define PT_REGS_PARM5 (x) ((x)->r8) +#define PT_REGS_RET (x) ((x)->rsp) +#define PT_REGS_FP (x) ((x)->rbp) +#define PT_REGS_RC (x) ((x)->rax) +#define PT_REGS_SP (x) ((x)->rsp) +#define PT_REGS_IP (x) ((x)->rip) +#endif #elif defined(bpf_target_s390) -#define PT_REGS_PARM1 (x) ((x)->gprs[2]) -#define PT_REGS_PARM2 (x) ((x)->gprs[3]) -#define PT_REGS_PARM3 (x) ((x)->gprs[4]) -#define PT_REGS_PARM4 (x) ((x)->gprs[5]) -#define PT_REGS_PARM5 (x) ((x)->gprs[6]) -#define PT_REGS_RET (x) ((x)->gprs[14]) -#define PT_REGS_FP (x) ((x)->gprs[11])/* Works only with CONFIG_FRAME_POINTER */ -#define PT_REGS_RC (x) ((x)->gprs[2]) -#define PT_REGS_SP (x) ((x)->gprs[15]) -#define PT_REGS_IP (x) ((x)->psw.addr) +/* s390 provides user_pt_regs instead of struct pt_regs to userspace */ +struct pt_regs ; +#define PT_REGS_PARM1 (x) (((const volatile user_pt_regs *)(x))->gprs[2]) +#define PT_REGS_PARM2 (x) (((const volatile user_pt_regs *)(x))->gprs[3]) +#define PT_REGS_PARM3 (x) (((const volatile user_pt_regs *)(x))->gprs[4]) +#define PT_REGS_PARM4 (x) (((const volatile user_pt_regs *)(x))->gprs[5]) +#define PT_REGS_PARM5 (x) (((const volatile user_pt_regs *)(x))->gprs[6]) +#define PT_REGS_RET (x) (((const volatile user_pt_regs *)(x))->gprs[14]) +/* Works only with CONFIG_FRAME_POINTER */ +#define PT_REGS_FP (x) (((const volatile user_pt_regs *)(x))->gprs[11]) +#define PT_REGS_RC (x) (((const volatile user_pt_regs *)(x))->gprs[2]) +#define PT_REGS_SP (x) (((const volatile user_pt_regs *)(x))->gprs[15]) +#define PT_REGS_IP (x) (((const volatile user_pt_regs *)(x))->psw.addr)#elif defined(bpf_target_arm)
Signature · 1 line
2.21.0
PATCH v2 4/4 selftests/bpf: fix compiling loop{1,2,3}.c on s390
In reply to Ilya LeoshkevichUse PT_REGS_RC(ctx) instead of ctx->rax, which is not present on s390.
--- tools/testing/selftests/bpf/progs/loop1.c | 2 +- tools/testing/selftests/bpf/progs/loop2.c | 2 +- tools/testing/selftests/bpf/progs/loop3.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/loop1.c +1 -1
@@ -18,7 +18,7 @@ int nested_loops(volatile struct pt_regs* ctx)for (j =0 ; j <300 ; j++)for (i =0 ; i < j; i++) {if (j &1 ) - m = ctx->rax; + m =PT_REGS_RC (ctx);else m = j; sum += i * m;
tools/testing/selftests/bpf/progs/loop2.c +1 -1
@@ -16,7 +16,7 @@ int while_true(volatile struct pt_regs* ctx)int i =0 ;while (true) { -if (ctx->rax &1 ) +if (PT_REGS_RC (ctx) &1 ) i +=3 ;else i +=7 ;
tools/testing/selftests/bpf/progs/loop3.c +1 -1
@@ -16,7 +16,7 @@ int while_true(volatile struct pt_regs* ctx)__u64 i =0 , sum =0 ;do { i++; - sum += ctx->rax; + sum +=PT_REGS_RC (ctx); }while (i <0x100000000ULL );return sum; }
Signature · 1 line
2.21.0