Skip to content

Commit b41388d

Browse files
committed
ci: Disable lockdep for s390x
s390x's test_map runs slowly in CI due to the different layers of hypervisors involved. CI historical data shows that `test_maps` CI job for s390x, over the last 2 weeks, ran in: mean: 3010s p50: 2860s p90: 4140s p95: 4720s p99: 5580s Ilya suggested disabling lockdep based on flamegraph. Testing in [0] brought down the run time to 516s. Other tests do not seem to benefit/regress. While this will disminish the value of test_maps for s390x, we still have lockdep coverage for others architectures. [0] https://github.com/kernel-patches/bpf/actions/runs/7909828985/job/21591624824 Suggested-by: Ilya Leoshkevich <[email protected]> Signed-off-by: Manu Bretelle <[email protected]>
1 parent f67d5bf commit b41388d

File tree

1 file changed

+48
-0
lines changed

1 file changed

+48
-0
lines changed

ci/diffs/0099-s390x_nolockdep.diff

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
From 470d0c7874ac638ea62cddc3a20ec047fa4ab539 Mon Sep 17 00:00:00 2001
2+
From: Manu Bretelle <[email protected]>
3+
Date: Wed, 14 Feb 2024 17:25:35 -0800
4+
Subject: [PATCH] bpf/selftests: disable lockdep on s390x
5+
6+
Tests are slow to run on s390x, this should make them faster.
7+
8+
Signed-off-by: Manu Bretelle <[email protected]>
9+
---
10+
tools/testing/selftests/bpf/config.s390x | 8 ++++----
11+
1 file changed, 4 insertions(+), 4 deletions(-)
12+
13+
diff --git a/tools/testing/selftests/bpf/config.s390x b/tools/testing/selftests/bpf/config.s390x
14+
index 706931a8c2c69..67bfd62b0b582 100644
15+
--- a/tools/testing/selftests/bpf/config.s390x
16+
+++ b/tools/testing/selftests/bpf/config.s390x
17+
@@ -23,11 +23,11 @@ CONFIG_CPUSETS=y
18+
CONFIG_CRASH_DUMP=y
19+
CONFIG_CRYPTO_USER_API_RNG=y
20+
CONFIG_CRYPTO_USER_API_SKCIPHER=y
21+
-CONFIG_DEBUG_ATOMIC_SLEEP=y
22+
+CONFIG_DEBUG_ATOMIC_SLEEP=n
23+
CONFIG_DEBUG_INFO_BTF=y
24+
CONFIG_DEBUG_INFO_DWARF4=y
25+
CONFIG_DEBUG_LIST=y
26+
-CONFIG_DEBUG_LOCKDEP=y
27+
+CONFIG_DEBUG_LOCKDEP=n
28+
CONFIG_DEBUG_NOTIFIERS=y
29+
CONFIG_DEBUG_PAGEALLOC=y
30+
CONFIG_DEBUG_SECTION_MISMATCH=y
31+
@@ -71,7 +71,7 @@ CONFIG_KRETPROBES=y
32+
CONFIG_KSM=y
33+
CONFIG_LATENCYTOP=y
34+
CONFIG_LIVEPATCH=y
35+
-CONFIG_LOCK_STAT=y
36+
+CONFIG_LOCK_STAT=n
37+
CONFIG_MACVLAN=y
38+
CONFIG_MACVTAP=y
39+
CONFIG_MAGIC_SYSRQ=y
40+
@@ -101,7 +101,7 @@ CONFIG_PCI=y
41+
CONFIG_POSIX_MQUEUE=y
42+
CONFIG_PROC_KCORE=y
43+
CONFIG_PROFILING=y
44+
-CONFIG_PROVE_LOCKING=y
45+
+CONFIG_PROVE_LOCKING=n
46+
CONFIG_PTDUMP_DEBUGFS=y
47+
CONFIG_RC_DEVICES=y
48+
CONFIG_RC_LOOPBACK=y

0 commit comments

Comments
 (0)