--- v12
+++ v14
@@ -1,86 +1,51 @@
-From: Boqun Feng <boqun.feng@gmail.com>
-
-The semantics of various irq disabling guards match what
-*_irq_{disable,enable}() provide, i.e. the interrupt disabling is
-properly nested, therefore it's OK to switch to use
-*_irq_{disable,enable}() primitives.
-
-Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
-
----
-V10:
-* Add PREEMPT_RT build fix from Guangbo Cui
+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>
---
- include/linux/spinlock.h | 26 ++++++++++++--------------
- 1 file changed, 12 insertions(+), 14 deletions(-)
+ rust/kernel/sync/lock/global.rs | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
-diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
-index b21da4bd51a42..7ff11c893940b 100644
---- a/include/linux/spinlock.h
-+++ b/include/linux/spinlock.h
-@@ -605,10 +605,10 @@ DEFINE_LOCK_GUARD_1(raw_spinlock_nested, raw_spinlock_t,
- raw_spin_unlock(_T->lock))
+diff --git a/rust/kernel/sync/lock/global.rs b/rust/kernel/sync/lock/global.rs
+index 31264b68086b3..20fbe11d1a04b 100644
+--- a/rust/kernel/sync/lock/global.rs
++++ b/rust/kernel/sync/lock/global.rs
+@@ -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 Backend>::Context<'a>,
++ ) -> GlobalGuard<'a, G, B>
++ where
++ G::Backend: Backend<BackendInContext = 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 Backend>::Context<'a>,
++ ) -> Option<GlobalGuard<'a, G, B>>
++ where
++ G::Backend: Backend<BackendInContext = B>,
++ B: Backend,
++ {
++ Some(GlobalGuard {
++ inner: self.inner.try_lock_with(context)?,
++ })
++ }
+ }
- DEFINE_LOCK_GUARD_1(raw_spinlock_irq, raw_spinlock_t,
-- raw_spin_lock_irq(_T->lock),
-- raw_spin_unlock_irq(_T->lock))
-+ raw_spin_lock_irq_disable(_T->lock),
-+ raw_spin_unlock_irq_enable(_T->lock))
-
--DEFINE_LOCK_GUARD_1_COND(raw_spinlock_irq, _try, raw_spin_trylock_irq(_T->lock))
-+DEFINE_LOCK_GUARD_1_COND(raw_spinlock_irq, _try, raw_spin_trylock_irq_disable(_T->lock))
-
- DEFINE_LOCK_GUARD_1(raw_spinlock_bh, raw_spinlock_t,
- raw_spin_lock_bh(_T->lock),
-@@ -617,12 +617,11 @@ DEFINE_LOCK_GUARD_1(raw_spinlock_bh, raw_spinlock_t,
- DEFINE_LOCK_GUARD_1_COND(raw_spinlock_bh, _try, raw_spin_trylock_bh(_T->lock))
-
- DEFINE_LOCK_GUARD_1(raw_spinlock_irqsave, raw_spinlock_t,
-- raw_spin_lock_irqsave(_T->lock, _T->flags),
-- raw_spin_unlock_irqrestore(_T->lock, _T->flags),
-- unsigned long flags)
-+ raw_spin_lock_irq_disable(_T->lock),
-+ raw_spin_unlock_irq_enable(_T->lock))
-
- DEFINE_LOCK_GUARD_1_COND(raw_spinlock_irqsave, _try,
-- raw_spin_trylock_irqsave(_T->lock, _T->flags))
-+ raw_spin_trylock_irq_disable(_T->lock))
-
- DEFINE_LOCK_GUARD_1(spinlock, spinlock_t,
- spin_lock(_T->lock),
-@@ -631,11 +630,11 @@ DEFINE_LOCK_GUARD_1(spinlock, spinlock_t,
- DEFINE_LOCK_GUARD_1_COND(spinlock, _try, spin_trylock(_T->lock))
-
- DEFINE_LOCK_GUARD_1(spinlock_irq, spinlock_t,
-- spin_lock_irq(_T->lock),
-- spin_unlock_irq(_T->lock))
-+ spin_lock_irq_disable(_T->lock),
-+ spin_unlock_irq_enable(_T->lock))
-
- DEFINE_LOCK_GUARD_1_COND(spinlock_irq, _try,
-- spin_trylock_irq(_T->lock))
-+ spin_trylock_irq_disable(_T->lock))
-
- DEFINE_LOCK_GUARD_1(spinlock_bh, spinlock_t,
- spin_lock_bh(_T->lock),
-@@ -645,12 +644,11 @@ DEFINE_LOCK_GUARD_1_COND(spinlock_bh, _try,
- spin_trylock_bh(_T->lock))
-
- DEFINE_LOCK_GUARD_1(spinlock_irqsave, spinlock_t,
-- spin_lock_irqsave(_T->lock, _T->flags),
-- spin_unlock_irqrestore(_T->lock, _T->flags),
-- unsigned long flags)
-+ spin_lock_irq_disable(_T->lock),
-+ spin_unlock_irq_enable(_T->lock))
-
- DEFINE_LOCK_GUARD_1_COND(spinlock_irqsave, _try,
-- spin_trylock_irqsave(_T->lock, _T->flags))
-+ spin_trylock_irq_disable(_T->lock))
-
- DEFINE_LOCK_GUARD_1(read_lock, rwlock_t,
- read_lock(_T->lock),
+ /// A guard for a [`GlobalLock`].
--
-2.50.0
+2.51.1