[PATCH v17 15/16] rust: sync: lock/global: Add ContextualBackend support to GlobalLock

Lyude Paul posted 16 patches 2 weeks, 2 days ago
[PATCH v17 15/16] rust: sync: lock/global: Add ContextualBackend support to GlobalLock
Posted by Lyude Paul 2 weeks, 2 days ago
Now that we have the ability to provide an explicit lifetime for a
GlobalGuard and an explicit Backend for a GlobalGuard, we can finally
implement lock_with() and try_lock_with().

Signed-off-by: Lyude Paul <lyude@redhat.com>
---
 rust/kernel/sync/lock/global.rs | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/rust/kernel/sync/lock/global.rs b/rust/kernel/sync/lock/global.rs
index 94f6b3b21324f..cfc71af7482ed 100644
--- a/rust/kernel/sync/lock/global.rs
+++ b/rust/kernel/sync/lock/global.rs
@@ -6,7 +6,7 @@
 
 use crate::{
     str::{CStr, CStrExt as _},
-    sync::lock::{Backend, Guard, Lock},
+    sync::lock::{Backend, BackendWithContext, Guard, Lock},
     sync::{LockClassKey, LockedBy},
     types::Opaque,
 };
@@ -89,6 +89,34 @@ pub fn try_lock(&'static self) -> Option<GlobalGuard<'static, G, G::Backend>> {
             inner: self.inner.try_lock()?,
         })
     }
+
+    /// Lock this global lock with the provided `context`.
+    pub fn lock_with<'a, B>(
+        &'static self,
+        context: <G::Backend as BackendWithContext>::Context<'a>,
+    ) -> GlobalGuard<'a, G, B>
+    where
+        G::Backend: BackendWithContext<ContextualBackend = B>,
+        B: Backend,
+    {
+        GlobalGuard {
+            inner: self.inner.lock_with(context),
+        }
+    }
+
+    /// Try to lock this global lock with the provided `context`.
+    pub fn try_lock_with<'a, B>(
+        &'static self,
+        context: <G::Backend as BackendWithContext>::Context<'a>,
+    ) -> Option<GlobalGuard<'a, G, B>>
+    where
+        G::Backend: BackendWithContext<ContextualBackend = B>,
+        B: Backend,
+    {
+        Some(GlobalGuard {
+            inner: self.inner.try_lock_with(context)?,
+        })
+    }
 }
 
 /// A guard for a [`GlobalLock`].
-- 
2.52.0