summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/bpf/prog_tests
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@kernel.org>2025-08-26 16:51:52 -0700
committerAlexei Starovoitov <ast@kernel.org>2025-08-26 16:52:07 -0700
commit2465bb83e0b44e19ae7e3ad07148db61fbe0e2bf (patch)
tree39dd77e4b2fedf1def0a26693a4eb81b48aae3c4 /tools/testing/selftests/bpf/prog_tests
parentd0f27ff27c048a3bdc49877255a7e7f8b49f5603 (diff)
parent21bce56940549a2473134b44cd1d8e21da268e1e (diff)
Merge branch 's390-bpf-add-s390-jit-support-for-timed-may_goto'
Ilya Leoshkevich says: ==================== s390/bpf: Add s390 JIT support for timed may_goto v1: https://lore.kernel.org/bpf/20250821103256.291412-1-iii@linux.ibm.com/ v1 -> v2: Fix test_stream_errors (caught by CI). This series adds timed may_goto implementation to the s390x JIT. Patch 1 is the implementation itself, patches 2-5 are the associated test changes. ==================== Link: https://patch.msgid.link/20250821113339.292434-1-iii@linux.ibm.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests')
-rw-r--r--tools/testing/selftests/bpf/prog_tests/stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/stream.c b/tools/testing/selftests/bpf/prog_tests/stream.c
index d9f0185dca61..36a1a1ebde69 100644
--- a/tools/testing/selftests/bpf/prog_tests/stream.c
+++ b/tools/testing/selftests/bpf/prog_tests/stream.c
@@ -77,7 +77,7 @@ void test_stream_errors(void)
ASSERT_OK(ret, "ret");
ASSERT_OK(opts.retval, "retval");
-#if !defined(__x86_64__)
+#if !defined(__x86_64__) && !defined(__s390x__)
ASSERT_TRUE(1, "Timed may_goto unsupported, skip.");
if (i == 0) {
ret = bpf_prog_stream_read(prog_fd, 2, buf, sizeof(buf), &ropts);