From nobody Tue Apr 7 04:21:20 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DCA933A9DE for ; Mon, 16 Mar 2026 17:35:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682537; cv=none; b=etcq4naxBvk8moe1nHaApZDJOsaraUW4nWo7ELBCsorC4MTOaVZFmOcFdjfplV57zt7v/d0C1avVrKElQeTXWpCptpxg0xaARL+hExatYdEWCw08+T9cwasGqGP0UjytNDWt3eC2bTxU93EqAnx1V0CWR51lDVkLwPDXkO6MmA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682537; c=relaxed/simple; bh=KKz9fbZcZR1mjkh27Sdq1u2YhVQ1XtsFBQXXVHQrNX0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VGdZGpTMMeU4NaJOMkhjf3vukqKL1GPFjDDJHI+hy/X+Ja+Lt/ltp/+wApWHdpqVEImv11XMPZf4x1q9I6Bh3Puz9F9aRSPDjOuhzTDy3ot6YhpszOxa189gztl3hFlwrSILGrIbQwzHVDhm41WG/mG4bPVRMjtfltM6ChGuBG8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=cmavofWH; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cmavofWH" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-48531e6012bso50733175e9.1 for ; Mon, 16 Mar 2026 10:35:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773682534; x=1774287334; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8OL7t7B6X78PqYAbrBfjg/doY6RGS0yWRoav+K4LS08=; b=cmavofWH3Tbhf3A90p2nzfqtX0PFMECi+fk91d0Ya37llXKYAw/Dr8NHKcdC0EFvDL 2U7GztXP3Jp5bZ/o+52WxqIrJbWSQeHnN6DwuD1fSkf9V+MvZlkgO+siTrslDdLUYuiM 9WRNuM+IoobUJRLSNGIhs17oKEG04KTx/K0+0EZdLdr5ZccJTtYA4xeJrLe2nd52Mlae EQkOIDFaWN5huZYDXA/+zTOdrDfYP9AhcN1ELDDaY+7juFAY2MW9yU9J6QPTlXseC0PR n0bjm8+RiNjsGadha8HgxL8ACRBsYjkuVBunr+W6fkfMtgLJHAczvSM1AHaB06/mU8Kl MWbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773682534; x=1774287334; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8OL7t7B6X78PqYAbrBfjg/doY6RGS0yWRoav+K4LS08=; b=EeDoa+om4qe/gZce5RdPisNzfN0q+I5SMI1DAMPpfePLGFLGeDjE0wVEwShjPOIRNa 9uZjqycG/+B5Zle4aMLl+7MtdeTi/V9v4g8YU3DgzHEtGat6UObWXyEl5lU05eCBui1O yQkf21k/oG6i3yNT59dAFmjnrofYdwVY9j6uuT2v7xH98jOwMIYjCkqhmBxz/pWa3MAt mJnbtp7q/R9w0QSXP47D4RAXZgnHxcPR6V4XMVxTcL9usYk3xyjUdAUZ+ip0yE8L3iIi TJinrpWy6wDoAhed9sYfBlUzGzcFJPBDtw9cB/bd/VIek5a+HqZtTlVHlmgkgWBF6bCi n7Pw== X-Forwarded-Encrypted: i=1; AJvYcCW8I36BYNMW8LrcRhGbVKvuA2+ZoDZ5XMb1znoer/A0Le64uFEwopwsB2n2dmSx7bW5BGGSty3KHKtDcec=@vger.kernel.org X-Gm-Message-State: AOJu0YyXIysm7A13xMBJBoRaaSoQK0sAdtyWx5QZeoTpceLjYq6d4ZOB xTH0wqwgkwAl/+NH+T9M9T5n4dLWtsw8cIQn6bbZNnw4wAbjHHwkXRJotQZpXdx2iN0TkjsnDOK Kfg== X-Received: from wmbf24.prod.google.com ([2002:a05:600c:5958:b0:47e:e922:b080]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:45d3:b0:480:1e40:3d2 with SMTP id 5b1f17b1804b1-48556705301mr238355675e9.29.1773682533729; Mon, 16 Mar 2026 10:35:33 -0700 (PDT) Date: Mon, 16 Mar 2026 17:35:26 +0000 In-Reply-To: <20260316-tabba-el2_guard-v1-0-456875a2c6db@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260316-tabba-el2_guard-v1-0-456875a2c6db@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260316-tabba-el2_guard-v1-5-456875a2c6db@google.com> Subject: [PATCH 05/10] KVM: arm64: Use guard(hyp_spinlock) in pkvm.c From: Fuad Tabba To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , "KERNEL VIRTUAL MACHINE FOR ARM64 KVM/arm64" , "KERNEL VIRTUAL MACHINE FOR ARM64 KVM/arm64" , open list Cc: Fuad Tabba Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Migrate manual hyp_spin_lock() and hyp_spin_unlock() calls managing the global vm_table_lock to use the guard(hyp_spinlock) macro. This significantly cleans up validation and error paths during VM creation and manipulation by eliminating the need for goto labels and manual unlock procedures on early returns. Change-Id: I894df69b3cfe053a77dd660dfb70c95640c6d70c Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 122 +++++++++++++++++--------------------= ---- 1 file changed, 51 insertions(+), 71 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 2f029bfe4755..8f901fdead89 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -253,28 +253,23 @@ struct pkvm_hyp_vcpu *pkvm_load_hyp_vcpu(pkvm_handle_= t handle, if (__this_cpu_read(loaded_hyp_vcpu)) return NULL; =20 - hyp_spin_lock(&vm_table_lock); + guard(hyp_spinlock)(&vm_table_lock); hyp_vm =3D get_vm_by_handle(handle); if (!hyp_vm || hyp_vm->kvm.created_vcpus <=3D vcpu_idx) - goto unlock; + return NULL; =20 hyp_vcpu =3D hyp_vm->vcpus[vcpu_idx]; if (!hyp_vcpu) - goto unlock; + return NULL; =20 /* Ensure vcpu isn't loaded on more than one cpu simultaneously. */ - if (unlikely(hyp_vcpu->loaded_hyp_vcpu)) { - hyp_vcpu =3D NULL; - goto unlock; - } + if (unlikely(hyp_vcpu->loaded_hyp_vcpu)) + return NULL; =20 hyp_vcpu->loaded_hyp_vcpu =3D this_cpu_ptr(&loaded_hyp_vcpu); hyp_page_ref_inc(hyp_virt_to_page(hyp_vm)); -unlock: - hyp_spin_unlock(&vm_table_lock); =20 - if (hyp_vcpu) - __this_cpu_write(loaded_hyp_vcpu, hyp_vcpu); + __this_cpu_write(loaded_hyp_vcpu, hyp_vcpu); return hyp_vcpu; } =20 @@ -282,11 +277,10 @@ void pkvm_put_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) { struct pkvm_hyp_vm *hyp_vm =3D pkvm_hyp_vcpu_to_hyp_vm(hyp_vcpu); =20 - hyp_spin_lock(&vm_table_lock); + guard(hyp_spinlock)(&vm_table_lock); hyp_vcpu->loaded_hyp_vcpu =3D NULL; __this_cpu_write(loaded_hyp_vcpu, NULL); hyp_page_ref_dec(hyp_virt_to_page(hyp_vm)); - hyp_spin_unlock(&vm_table_lock); } =20 struct pkvm_hyp_vcpu *pkvm_get_loaded_hyp_vcpu(void) @@ -299,20 +293,18 @@ struct pkvm_hyp_vm *get_pkvm_hyp_vm(pkvm_handle_t han= dle) { struct pkvm_hyp_vm *hyp_vm; =20 - hyp_spin_lock(&vm_table_lock); + guard(hyp_spinlock)(&vm_table_lock); hyp_vm =3D get_vm_by_handle(handle); if (hyp_vm) hyp_page_ref_inc(hyp_virt_to_page(hyp_vm)); - hyp_spin_unlock(&vm_table_lock); =20 return hyp_vm; } =20 void put_pkvm_hyp_vm(struct pkvm_hyp_vm *hyp_vm) { - hyp_spin_lock(&vm_table_lock); + guard(hyp_spinlock)(&vm_table_lock); hyp_page_ref_dec(hyp_virt_to_page(hyp_vm)); - hyp_spin_unlock(&vm_table_lock); } =20 struct pkvm_hyp_vm *get_np_pkvm_hyp_vm(pkvm_handle_t handle) @@ -613,9 +605,8 @@ static int insert_vm_table_entry(pkvm_handle_t handle, { int ret; =20 - hyp_spin_lock(&vm_table_lock); + guard(hyp_spinlock)(&vm_table_lock); ret =3D __insert_vm_table_entry(handle, hyp_vm); - hyp_spin_unlock(&vm_table_lock); =20 return ret; } @@ -692,9 +683,8 @@ int __pkvm_reserve_vm(void) { int ret; =20 - hyp_spin_lock(&vm_table_lock); + guard(hyp_spinlock)(&vm_table_lock); ret =3D allocate_vm_table_entry(); - hyp_spin_unlock(&vm_table_lock); =20 if (ret < 0) return ret; @@ -713,10 +703,9 @@ void __pkvm_unreserve_vm(pkvm_handle_t handle) if (unlikely(!vm_table)) return; =20 - hyp_spin_lock(&vm_table_lock); + guard(hyp_spinlock)(&vm_table_lock); if (likely(idx < KVM_MAX_PVMS && vm_table[idx] =3D=3D RESERVED_ENTRY)) remove_vm_table_entry(handle); - hyp_spin_unlock(&vm_table_lock); } =20 /* @@ -815,35 +804,35 @@ int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm= _vcpu *host_vcpu, if (!hyp_vcpu) return -ENOMEM; =20 - hyp_spin_lock(&vm_table_lock); + scoped_guard(hyp_spinlock, &vm_table_lock) { + hyp_vm =3D get_vm_by_handle(handle); + if (!hyp_vm) { + ret =3D -ENOENT; + goto err_unmap; + } =20 - hyp_vm =3D get_vm_by_handle(handle); - if (!hyp_vm) { - ret =3D -ENOENT; - goto unlock; + ret =3D init_pkvm_hyp_vcpu(hyp_vcpu, hyp_vm, host_vcpu); + if (ret) + goto err_unmap; + + idx =3D hyp_vcpu->vcpu.vcpu_idx; + if (idx >=3D hyp_vm->kvm.created_vcpus) { + ret =3D -EINVAL; + goto err_unmap; + } + + if (hyp_vm->vcpus[idx]) { + ret =3D -EINVAL; + goto err_unmap; + } + + hyp_vm->vcpus[idx] =3D hyp_vcpu; + + return 0; } =20 - ret =3D init_pkvm_hyp_vcpu(hyp_vcpu, hyp_vm, host_vcpu); - if (ret) - goto unlock; - - idx =3D hyp_vcpu->vcpu.vcpu_idx; - if (idx >=3D hyp_vm->kvm.created_vcpus) { - ret =3D -EINVAL; - goto unlock; - } - - if (hyp_vm->vcpus[idx]) { - ret =3D -EINVAL; - goto unlock; - } - - hyp_vm->vcpus[idx] =3D hyp_vcpu; -unlock: - hyp_spin_unlock(&vm_table_lock); - - if (ret) - unmap_donated_memory(hyp_vcpu, sizeof(*hyp_vcpu)); +err_unmap: + unmap_donated_memory(hyp_vcpu, sizeof(*hyp_vcpu)); return ret; } =20 @@ -866,27 +855,22 @@ int __pkvm_teardown_vm(pkvm_handle_t handle) struct kvm *host_kvm; unsigned int idx; size_t vm_size; - int err; =20 - hyp_spin_lock(&vm_table_lock); - hyp_vm =3D get_vm_by_handle(handle); - if (!hyp_vm) { - err =3D -ENOENT; - goto err_unlock; + scoped_guard(hyp_spinlock, &vm_table_lock) { + hyp_vm =3D get_vm_by_handle(handle); + if (!hyp_vm) + return -ENOENT; + + if (WARN_ON(hyp_page_count(hyp_vm))) + return -EBUSY; + + host_kvm =3D hyp_vm->host_kvm; + + /* Ensure the VMID is clean before it can be reallocated */ + __kvm_tlb_flush_vmid(&hyp_vm->kvm.arch.mmu); + remove_vm_table_entry(handle); } =20 - if (WARN_ON(hyp_page_count(hyp_vm))) { - err =3D -EBUSY; - goto err_unlock; - } - - host_kvm =3D hyp_vm->host_kvm; - - /* Ensure the VMID is clean before it can be reallocated */ - __kvm_tlb_flush_vmid(&hyp_vm->kvm.arch.mmu); - remove_vm_table_entry(handle); - hyp_spin_unlock(&vm_table_lock); - /* Reclaim guest pages (including page-table pages) */ mc =3D &host_kvm->arch.pkvm.teardown_mc; stage2_mc =3D &host_kvm->arch.pkvm.stage2_teardown_mc; @@ -917,8 +901,4 @@ int __pkvm_teardown_vm(pkvm_handle_t handle) teardown_donated_memory(mc, hyp_vm, vm_size); hyp_unpin_shared_mem(host_kvm, host_kvm + 1); return 0; - -err_unlock: - hyp_spin_unlock(&vm_table_lock); - return err; } --=20 2.53.0.851.ga537e3e6e9-goog