[PATCH 02/10] KVM: arm64: Use guard(hyp_spinlock) in page_alloc.c
From: Fuad Tabba <hidden>
Date: 2026-03-16 17:35:31
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
Migrate the manual hyp_spin_lock() and hyp_spin_unlock() calls in hyp_put_page, hyp_get_page, and hyp_alloc_pages to use the new guard(hyp_spinlock) macro. This eliminates the need for manual unlock calls on return paths. Specifically, in hyp_alloc_pages, this simplifies the early return error path by removing the manual unlock and resolving single-line curly brace styling, reducing the potential for future lock-leak regressions. Change-Id: I37bb8236dbfff9b58bda0937a78d2057036599b4 Signed-off-by: Fuad Tabba <redacted> --- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/page_alloc.c b/arch/arm64/kvm/hyp/nvhe/page_alloc.c
index a1eb27a1a747..f43d8ad507e9 100644
--- a/arch/arm64/kvm/hyp/nvhe/page_alloc.c
+++ b/arch/arm64/kvm/hyp/nvhe/page_alloc.c@@ -167,18 +167,16 @@ void hyp_put_page(struct hyp_pool *pool, void *addr) { struct hyp_page *p = hyp_virt_to_page(addr); - hyp_spin_lock(&pool->lock); + guard(hyp_spinlock)(&pool->lock); __hyp_put_page(pool, p); - hyp_spin_unlock(&pool->lock); } void hyp_get_page(struct hyp_pool *pool, void *addr) { struct hyp_page *p = hyp_virt_to_page(addr); - hyp_spin_lock(&pool->lock); + guard(hyp_spinlock)(&pool->lock); hyp_page_ref_inc(p); - hyp_spin_unlock(&pool->lock); } void hyp_split_page(struct hyp_page *p)
@@ -200,22 +198,19 @@ void *hyp_alloc_pages(struct hyp_pool *pool, u8 order) struct hyp_page *p; u8 i = order; - hyp_spin_lock(&pool->lock); + guard(hyp_spinlock)(&pool->lock); /* Look for a high-enough-order page */ while (i <= pool->max_order && list_empty(&pool->free_area[i])) i++; - if (i > pool->max_order) { - hyp_spin_unlock(&pool->lock); + if (i > pool->max_order) return NULL; - } /* Extract it from the tree at the right order */ p = node_to_page(pool->free_area[i].next); p = __hyp_extract_page(pool, p, order); hyp_set_page_refcounted(p); - hyp_spin_unlock(&pool->lock); return hyp_page_to_virt(p); }
--
2.53.0.851.ga537e3e6e9-goog