Skip to content

Commit 5ca8e22

Browse files
committed
ci/diffs: add a patch for test_xsk
Some tests from test_xsk occasionally fail on aarch64 and s390x with a timeout in receive_pkts(). Add a CI patch increasing the timeout to verify whether it's too short in this environment. Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
1 parent e4417f9 commit 5ca8e22

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 18839e3a16d1fd37bae386a4f11316c5f67775fe Mon Sep 17 00:00:00 2001
2+
From: Ihor Solodrai <ihor.solodrai@linux.dev>
3+
Date: Wed, 31 Dec 2025 10:06:39 -0800
4+
Subject: [PATCH] selftests/bpf: increase thread timeout in test_xsk
5+
6+
Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
7+
---
8+
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.c b/tools/testing/selftests/bpf/prog_tests/test_xsk.c
12+
index 5af28f359cfd..8dcb60bbfc89 100644
13+
--- a/tools/testing/selftests/bpf/prog_tests/test_xsk.c
14+
+++ b/tools/testing/selftests/bpf/prog_tests/test_xsk.c
15+
@@ -29,7 +29,7 @@
16+
/* Just to align the data in the packet */
17+
#define PKT_HDR_SIZE (sizeof(struct ethhdr) + 2)
18+
#define POLL_TMOUT 1000
19+
-#define THREAD_TMOUT 3
20+
+#define THREAD_TMOUT 16
21+
#define UMEM_HEADROOM_TEST_SIZE 128
22+
#define XSK_DESC__INVALID_OPTION (0xffff)
23+
#define XSK_UMEM__INVALID_FRAME_SIZE (MAX_ETH_JUMBO_SIZE + 1)
24+
--
25+
2.52.0
26+

ci/vmtest/configs/DENYLIST.aarch64

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
map_kptr/success-map
2-
ns_xsk_drv/BIDIRECTIONAL
3-
ns_xsk_skb
42
send_signal
53
unpriv_bpf_disabled

ci/vmtest/configs/DENYLIST.s390x

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
arena_spin_lock
22
map_kptr/success-map
3-
ns_xsk_skb/SEND_RECEIVE_SINGLE_PKT
43
res_spin_lock_stress
54
tc_edt

0 commit comments

Comments
 (0)