[PATCH v1 01/11] KVM: arm64: Add scoped resource management (guard) for hyp_spinlock
From: <hidden>
Date: 2026-06-12 06:59:29
Also in:
kvmarm, lkml
Subsystem:
arm64 port (aarch64 architecture), kernel virtual machine for arm64 (kvm/arm64), the rest · Maintainers:
Catalin Marinas, Will Deacon, Marc Zyngier, Oliver Upton, Linus Torvalds
The nVHE hypervisor manages hyp_spinlock_t locks by hand across error paths, where a missed unlock deadlocks the next CPU to take the lock. Wire hyp_spinlock_t into <linux/cleanup.h> via DEFINE_LOCK_GUARD_1 so callers can use guard(hyp_spinlock) and scoped_guard(hyp_spinlock), letting later patches replace the manual lock/unlock pairs. Signed-off-by: Fuad Tabba <redacted> --- arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/arch/arm64/kvm/hyp/include/nvhe/spinlock.h b/arch/arm64/kvm/hyp/include/nvhe/spinlock.h
index 7c7ea8c55405..63ba826d8e3d 100644
--- a/arch/arm64/kvm/hyp/include/nvhe/spinlock.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/spinlock.h@@ -13,6 +13,8 @@ #ifndef __ARM64_KVM_NVHE_SPINLOCK_H__ #define __ARM64_KVM_NVHE_SPINLOCK_H__ +#include <linux/cleanup.h> + #include <asm/alternative.h> #include <asm/lse.h> #include <asm/rwonce.h>
@@ -98,6 +100,10 @@ static inline void hyp_spin_unlock(hyp_spinlock_t *lock) : "memory"); } +DEFINE_LOCK_GUARD_1(hyp_spinlock, hyp_spinlock_t, + hyp_spin_lock(_T->lock), + hyp_spin_unlock(_T->lock)) + static inline bool hyp_spin_is_locked(hyp_spinlock_t *lock) { hyp_spinlock_t lockval = READ_ONCE(*lock);
--
2.54.0.1136.gdb2ca164c4-goog