[PATCH v2 5/5] rust: sync: condvar: add non-exclusive freezable waiting

From: Danilo Krummrich

Date: Wed Nov 04 2026 - 21:51:33 EST


CondVar currently registers all sleeping tasks as exclusive waiters.
Add wait_interruptible_freezable_nonexclusive() for callers that need
non-exclusive waits, using WaitQueue::wait_once().

Document that notify_one() and notify_sync() also wake all non-exclusive
waiters.

This provides non-exclusive waiting support for a subsequent Binder
conversion.

Signed-off-by: Danilo Krummrich <dakr@xxxxxxxxxx>
---
rust/kernel/sync/condvar.rs | 27 +++++++++++++++++++++++++--
rust/kernel/sync/wait.rs | 1 -
2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/rust/kernel/sync/condvar.rs b/rust/kernel/sync/condvar.rs
index fcab90f6ce34..cbc543de214f 100644
--- a/rust/kernel/sync/condvar.rs
+++ b/rust/kernel/sync/condvar.rs
@@ -148,6 +148,29 @@ pub fn wait_interruptible_freezable<T: ?Sized, B: Backend>(
crate::current!().signal_pending()
}

+ /// Releases the lock and waits non-exclusively in interruptible and freezable mode.
+ ///
+ /// Like [`CondVar::wait_interruptible_freezable`], but registers the current task as a
+ /// non-exclusive waiter.
+ ///
+ /// The lock is reacquired before returning. The wait may also end due to a signal or a
+ /// spurious wakeup.
+ ///
+ /// No lock other than the one released through `guard` should be held, since the task may
+ /// be frozen while sleeping.
+ ///
+ /// Returns whether there is a signal pending.
+ #[must_use = "the caller must check whether a signal is pending"]
+ pub fn wait_interruptible_freezable_nonexclusive<T: ?Sized, B: Backend>(
+ &self,
+ guard: &mut Guard<'_, T, B>,
+ ) -> bool {
+ self.wq.wait_once(TASK_INTERRUPTIBLE | TASK_FREEZABLE, || {
+ guard.do_unlocked(|| task::schedule_timeout(Jiffies::MAX))
+ });
+ crate::current!().signal_pending()
+ }
+
/// Releases the lock and waits for a notification in interruptible mode.
///
/// Atomically releases the given lock (whose ownership is proven by the guard) and puts the
@@ -168,7 +191,7 @@ pub fn wait_interruptible_timeout<T: ?Sized, B: Backend>(
}
}

- /// Calls the kernel function to notify one thread synchronously.
+ /// Wakes all non-exclusive waiters and one exclusive waiter synchronously.
///
/// This method behaves like `notify_one`, except that it hints to the scheduler that the
/// current thread expects to sleep soon.
@@ -177,7 +200,7 @@ pub fn notify_sync(&self) {
self.wq.wake_up_sync();
}

- /// Wakes a single waiter up, if any.
+ /// Wakes all non-exclusive waiters and one exclusive waiter, if any.
///
/// This is not 'sticky' in the sense that if no thread is waiting, the notification is lost
/// completely (as opposed to automatically waking up the next waiter).
diff --git a/rust/kernel/sync/wait.rs b/rust/kernel/sync/wait.rs
index 92c1ae93705e..942f96b5cf17 100644
--- a/rust/kernel/sync/wait.rs
+++ b/rust/kernel/sync/wait.rs
@@ -208,7 +208,6 @@ fn wait_event_timeout_internal<F: FnMut() -> bool>(
/// Performs a single non-exclusive prepare-to-wait / finish-wait cycle, calling `schedule_fn`
/// in between. Non-exclusive waiters are all woken by [`wake_up()`](Self::wake_up).
#[inline]
- #[expect(unused)]
pub(super) fn wait_once<F, R>(&self, wait_state: c_int, schedule_fn: F) -> R
where
F: FnOnce() -> R,
--
2.56.0