fix(sync/wait_condition): deadlock in WaitCondition::wait

Instead of using a simple switch to determine if preemption is enabled
(`is_preemptable: bool`), a counter is used instead. This handles the
case where a function holding a `PreemptGuard` calls another function
that creates a new `PreemptGuard`.

Signed-off-by: Anhad Singh <andypython@protonmail.com>
This commit is contained in:
Anhad Singh
2025-12-15 13:05:29 +11:00
parent 62a572a0f0
commit d9eae6bb75
4 changed files with 20 additions and 8 deletions
+9 -3
View File
@@ -144,8 +144,10 @@ pub struct Context {
pub egid: u32,
pub pid: usize,
// Use PreemptGuard
pub(super) is_preemptable: bool,
// See [`PreemptGuard`]
//
// When > 0, preemption is disabled.
pub(super) preempt_locks: usize,
}
#[derive(Debug)]
@@ -201,12 +203,16 @@ impl Context {
#[cfg(feature = "syscall_debug")]
syscall_debug_info: crate::syscall::debug::SyscallDebugInfo::default(),
is_preemptable: true,
preempt_locks: 0,
};
cpu_stats::add_context();
Ok(this)
}
pub fn is_preemptable(&self) -> bool {
self.preempt_locks == 0
}
/// Block the context, and return true if it was runnable before being blocked
pub fn block(&mut self, reason: &'static str) -> bool {
if self.status.is_runnable() {