test again, this time by changing the trace points to the potential s…

…ymbols
sched-ext · Nov 1, 2024 · 24b8e41 · 24b8e41
1 parent 08e53ef
commit 24b8e41
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/sched-ext.config b/.github/workflows/sched-ext.config
@@ -29,6 +29,12 @@ CONFIG_PREEMPTION=y
 CONFIG_PREEMPT_DYNAMIC=y
 CONFIG_PREEMPT_RCU=y
 
+# Additional debugging information (useful to catch potential locking issues)
+#
+CONFIG_DEBUG_LOCKDEP=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_PROVE_LOCKING=y
+
 # Bpftrace headers (for additional debug info)
 CONFIG_BPF=y
 CONFIG_BPF_SYSCALL=y

diff --git a/scheds/rust/scx_lavd/src/bpf/lock.bpf.c b/scheds/rust/scx_lavd/src/bpf/lock.bpf.c
@@ -310,7 +310,7 @@ int BPF_PROG(fexit_ww_mutex_unlock, struct ww_mutex *lock)
 #ifdef LAVD_TRACE_RT_MUTEX
 struct rt_mutex;
 
-SEC("fexit/rt_mutex_lock")
+SEC("fexit/rt_mutex_lock_nested")
 int BPF_PROG(fexit_rt_mutex_lock, struct rt_mutex *lock)
 {
 	/*
@@ -320,7 +320,7 @@ int BPF_PROG(fexit_rt_mutex_lock, struct rt_mutex *lock)
 	return 0;
 }
 
-SEC("fexit/rt_mutex_lock_interruptible")
+SEC("fexit/rt_mutex_lock_interruptible_nested")
 int BPF_PROG(fexit_rt_mutex_lock_interruptible, struct rt_mutex *lock, int ret)
 {
 	if (ret == 0) {
@@ -332,7 +332,7 @@ int BPF_PROG(fexit_rt_mutex_lock_interruptible, struct rt_mutex *lock, int ret)
 	return 0;
 }
 
-SEC("fexit/rt_mutex_lock_killable")
+SEC("fexit/rt_mutex_lock_killable_nested")
 int BPF_PROG(fexit_rt_mutex_lock_killable, struct rt_mutex *lock, int ret)
 {
 	if (ret == 0) {