From: Pu Lehui Enable callx bpf selftests for RV64 now that the RV64 JIT supports indirect calls to subprogs. Signed-off-by: Pu Lehui --- tools/testing/selftests/bpf/prog_tests/callx_func_ptr_map.c | 3 ++- tools/testing/selftests/bpf/prog_tests/callx_rodata_lskel.c | 3 ++- tools/testing/selftests/bpf/progs/verifier_callx.c | 3 ++- tools/testing/selftests/bpf/progs/verifier_callx_rodata.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/callx_func_ptr_map.c b/tools/testing/selftests/bpf/prog_tests/callx_func_ptr_map.c index 42b33d5876b1..cc63b84e4d94 100644 --- a/tools/testing/selftests/bpf/prog_tests/callx_func_ptr_map.c +++ b/tools/testing/selftests/bpf/prog_tests/callx_func_ptr_map.c @@ -8,7 +8,8 @@ #include #include -#if defined(__x86_64__) || defined(__aarch64__) +#if defined(__x86_64__) || defined(__aarch64__) || \ + (defined(__riscv) && __riscv_xlen == 64) #define CALLEE_INSN 6 #define DATA 0x1234 diff --git a/tools/testing/selftests/bpf/prog_tests/callx_rodata_lskel.c b/tools/testing/selftests/bpf/prog_tests/callx_rodata_lskel.c index fc5181c5b5ba..f6ef67c3141e 100644 --- a/tools/testing/selftests/bpf/prog_tests/callx_rodata_lskel.c +++ b/tools/testing/selftests/bpf/prog_tests/callx_rodata_lskel.c @@ -3,7 +3,8 @@ #include "callx_rodata.lskel.h" -#if defined(__x86_64__) || defined(__aarch64__) +#if defined(__x86_64__) || defined(__aarch64__) || \ + (defined(__riscv) && __riscv_xlen == 64) static void run(int prog_fd, int expected, const char *name) { diff --git a/tools/testing/selftests/bpf/progs/verifier_callx.c b/tools/testing/selftests/bpf/progs/verifier_callx.c index bc31d0221f6a..7e59188d9fca 100644 --- a/tools/testing/selftests/bpf/progs/verifier_callx.c +++ b/tools/testing/selftests/bpf/progs/verifier_callx.c @@ -7,7 +7,8 @@ #include "../../../include/linux/filter.h" /* gcc doesn't support indirect calls */ -#if (defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64)) && defined(__clang__) +#if defined(__clang__) && (defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64) || \ + (defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64)) #define CALLX_INSN(DST, SRC, OFF, IMM) \ BPF_RAW_INSN(BPF_JMP | BPF_CALL | BPF_X, DST, SRC, OFF, IMM) diff --git a/tools/testing/selftests/bpf/progs/verifier_callx_rodata.c b/tools/testing/selftests/bpf/progs/verifier_callx_rodata.c index db3169a1ddf6..3ebd50f9c4b6 100644 --- a/tools/testing/selftests/bpf/progs/verifier_callx_rodata.c +++ b/tools/testing/selftests/bpf/progs/verifier_callx_rodata.c @@ -7,7 +7,8 @@ #include "../../../include/linux/filter.h" /* gcc doesn't support indirect calls */ -#if (defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64)) && defined(__clang__) +#if defined(__clang__) && (defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64) || \ + (defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64)) /* * Read-only data with pointers to functions, where the compiler puts tables -- 2.34.1