Skip to content

Commit 48c4323

Browse files
iii-iAlexei Starovoitov
authored andcommitted
selftests/bpf: Enable the cpuv4 tests for s390x
Now that all the cpuv4 support is in place, enable the tests. Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> Link: https://lore.kernel.org/r/20230919101336.2223655-10-iii@linux.ibm.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent 91d2ad7 commit 48c4323

6 files changed

Lines changed: 12 additions & 6 deletions

File tree

tools/testing/selftests/bpf/progs/test_ldsx_insn.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#include <bpf/bpf_tracing.h>
77

88
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \
9-
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64)) && __clang_major__ >= 18
9+
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || \
10+
defined(__TARGET_ARCH_s390)) && __clang_major__ >= 18
1011
const volatile int skip = 0;
1112
#else
1213
const volatile int skip = 1;

tools/testing/selftests/bpf/progs/verifier_bswap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#include "bpf_misc.h"
66

77
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \
8-
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || defined(__TARGET_ARCH_arm)) && \
8+
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || \
9+
defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_s390)) && \
910
__clang_major__ >= 18
1011

1112
SEC("socket")

tools/testing/selftests/bpf/progs/verifier_gotol.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#include "bpf_misc.h"
66

77
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \
8-
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || defined(__TARGET_ARCH_arm)) && \
8+
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || \
9+
defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_s390)) && \
910
__clang_major__ >= 18
1011

1112
SEC("socket")

tools/testing/selftests/bpf/progs/verifier_ldsx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#include "bpf_misc.h"
66

77
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \
8-
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || defined(__TARGET_ARCH_arm)) && \
8+
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || \
9+
defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_s390)) && \
910
__clang_major__ >= 18
1011

1112
SEC("socket")

tools/testing/selftests/bpf/progs/verifier_movsx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#include "bpf_misc.h"
66

77
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \
8-
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || defined(__TARGET_ARCH_arm)) && \
8+
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || \
9+
defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_s390)) && \
910
__clang_major__ >= 18
1011

1112
SEC("socket")

tools/testing/selftests/bpf/progs/verifier_sdiv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#include "bpf_misc.h"
66

77
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \
8-
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || defined(__TARGET_ARCH_arm)) && \
8+
(defined(__TARGET_ARCH_riscv) && __riscv_xlen == 64) || \
9+
defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_s390)) && \
910
__clang_major__ >= 18
1011

1112
SEC("socket")

0 commit comments

Comments
 (0)