From nobody Tue Apr 7 04:21:20 2026 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.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 4922A3D0921 for ; Mon, 16 Mar 2026 17:35:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682535; cv=none; b=kqeAw1wwRL2SNtVTFNbrTWWP8y4vTOguWimCJ3NRWllnbGAHgwuyAyRsGisSZ2c9PtEP8vg8J45uMjlMroQSK7yfQY7RSwsZjeBWTUULoc9K7m1pbB0B5RUDNMZ8VDT74cv3wlS57yP0EaItcj0cfmzuG99Gu2wiI47pHXrmzdU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682535; c=relaxed/simple; bh=mXyhSE1MRAfCl+4+ivhGrwWepMYiNO9lJZZ3zNL2X4E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sHWlqmWEmGGOKEnvi3YX2fh1b1UuItsn9H1OihZg9jxWnyNn3E57cK4ykPU9TeozEPvpDuze/89WYHx03BB6btuAmnmBLepfRSkl0mZqKG3e6Gu3BfHggldLsV7PTYUE4zm7TBMOlI4OMR70n3YbcDVSjdrzhSGSlqNNEAFUBKI= 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=eKt1Waea; arc=none smtp.client-ip=209.85.218.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="eKt1Waea" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-b844098869cso342583166b.2 for ; Mon, 16 Mar 2026 10:35:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773682533; x=1774287333; 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=tHQqMyuuFlwpT2UE52Jtk7JCykj8I76gbQARj/JlEmo=; b=eKt1Waea3GwFVYxBe3K9/ednKCg6Jt9V9z1AlCjHs6+zIZQGI48BfmNV3QsjYdJDbs yScwPsQeUdwLK8MdTsQYRZOO2cptEgcgfYmHTp5k8kJ363/bRTRXul+wPGF58PL8rYcG pJteybsEV78/GT6m+RJVtMDX4owzibB09hPZN9mwlADTNsnDaC79SmBJKp3tEyB4nLgJ X+2BuVYddg1YfXJitl3hmfa4hGgFg0WACxUrgADAgAh671xbL2bfs7ipibCJ9e2wzb3/ jVjJzp7lZ7qc4R4L6iXHHGs/gVMkVdy8mpkCt0CWYViYC2N3Y5GBbniagSpbP0VUnurO rrlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773682533; x=1774287333; 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=tHQqMyuuFlwpT2UE52Jtk7JCykj8I76gbQARj/JlEmo=; b=ZpIybyN3ybnHfNpgqUcfGI2aySdneLnJGlZ0SJxOYSEJlnriF1j8LWqhPWxEiFyHCt lNtUckqIwXHaEPAO9+XfNT1kqgFdQthzHU9FYwB3v+9tNmhTdJnbn0Db8Xliy5mENIr5 nqtV7XSqtat1zqzq/9QMqpX/GTfmcQtgcsk22aO9IYW0adWn7WM4tZtONuPmyuVPMEZo Dbpy9hG4ZpwWxt/D3Duw9PbezGT3c8EGZQNCdK4yhevvhS4MP/4JqgfSh2GebIK4M5ZC /4YEM84WEQ2kPXqPJodxyleMcIU1/jYY4COhhanpq92t5y/MIjYSovexqno5Pc+t8RUI +t2A== X-Forwarded-Encrypted: i=1; AJvYcCWzBQr7amrJUo92Q7CtWzlL/bBtGNyb8rYxe0YgkG+l+tgVHvq/Jq7F+JMyaN0L59GffFrDy36pPWUy4Gg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyrz7JDQ3cDfBRVFCwjDi0r5VT9BsBpGPDqEwULe6JZNG7ZbfXv TkBd9uc1aBajM+4U3vgduVvuAppA18TBDwUSJG078bq7zQKOGodX3ytkQrd8zz33tsbHL3nA3G3 xNw== X-Received: from edra16.prod.google.com ([2002:aa7:d910:0:b0:661:d31:27ba]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:13d5:b0:666:d8bb:85ec with SMTP id 4fb4d7f45d1cf-666d8bb8808mr1653788a12.0.1773682532416; Mon, 16 Mar 2026 10:35:32 -0700 (PDT) Date: Mon, 16 Mar 2026 17:35:25 +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-4-456875a2c6db@google.com> Subject: [PATCH 04/10] KVM: arm64: Use guard(hyp_spinlock) in mm.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 pkvm_pgd_lock to use the guard(hyp_spinlock) macro. This eliminates manual unlock calls on return paths and simplifies error handling by replacing goto labels with direct returns. Note: hyp_fixblock_lock spans across hyp_fixblock_map/unmap functions, so it retains explicit lock/unlock semantics to avoid RAII violations. Change-Id: I6bb3f4105e95480269e5bf8289d084c8f9981730 Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/mm.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/mm.c b/arch/arm64/kvm/hyp/nvhe/mm.c index 218976287d3f..7a15c9fc15e5 100644 --- a/arch/arm64/kvm/hyp/nvhe/mm.c +++ b/arch/arm64/kvm/hyp/nvhe/mm.c @@ -35,13 +35,8 @@ static DEFINE_PER_CPU(struct hyp_fixmap_slot, fixmap_slo= ts); static int __pkvm_create_mappings(unsigned long start, unsigned long size, unsigned long phys, enum kvm_pgtable_prot prot) { - int err; - - hyp_spin_lock(&pkvm_pgd_lock); - err =3D kvm_pgtable_hyp_map(&pkvm_pgtable, start, size, phys, prot); - hyp_spin_unlock(&pkvm_pgd_lock); - - return err; + guard(hyp_spinlock)(&pkvm_pgd_lock); + return kvm_pgtable_hyp_map(&pkvm_pgtable, start, size, phys, prot); } =20 static int __pkvm_alloc_private_va_range(unsigned long start, size_t size) @@ -80,10 +75,9 @@ int pkvm_alloc_private_va_range(size_t size, unsigned lo= ng *haddr) unsigned long addr; int ret; =20 - hyp_spin_lock(&pkvm_pgd_lock); + guard(hyp_spinlock)(&pkvm_pgd_lock); addr =3D __io_map_base; ret =3D __pkvm_alloc_private_va_range(addr, size); - hyp_spin_unlock(&pkvm_pgd_lock); =20 *haddr =3D addr; =20 @@ -137,13 +131,8 @@ int pkvm_create_mappings_locked(void *from, void *to, = enum kvm_pgtable_prot prot =20 int pkvm_create_mappings(void *from, void *to, enum kvm_pgtable_prot prot) { - int ret; - - hyp_spin_lock(&pkvm_pgd_lock); - ret =3D pkvm_create_mappings_locked(from, to, prot); - hyp_spin_unlock(&pkvm_pgd_lock); - - return ret; + guard(hyp_spinlock)(&pkvm_pgd_lock); + return pkvm_create_mappings_locked(from, to, prot); } =20 int hyp_back_vmemmap(phys_addr_t back) @@ -340,22 +329,17 @@ static int create_fixblock(void) if (i >=3D hyp_memblock_nr) return -EINVAL; =20 - hyp_spin_lock(&pkvm_pgd_lock); + guard(hyp_spinlock)(&pkvm_pgd_lock); addr =3D ALIGN(__io_map_base, PMD_SIZE); ret =3D __pkvm_alloc_private_va_range(addr, PMD_SIZE); if (ret) - goto unlock; + return ret; =20 ret =3D kvm_pgtable_hyp_map(&pkvm_pgtable, addr, PMD_SIZE, phys, PAGE_HYP= ); if (ret) - goto unlock; + return ret; =20 - ret =3D kvm_pgtable_walk(&pkvm_pgtable, addr, PMD_SIZE, &walker); - -unlock: - hyp_spin_unlock(&pkvm_pgd_lock); - - return ret; + return kvm_pgtable_walk(&pkvm_pgtable, addr, PMD_SIZE, &walker); #else return 0; #endif @@ -437,7 +421,7 @@ int pkvm_create_stack(phys_addr_t phys, unsigned long *= haddr) size_t size; int ret; =20 - hyp_spin_lock(&pkvm_pgd_lock); + guard(hyp_spinlock)(&pkvm_pgd_lock); =20 prev_base =3D __io_map_base; /* @@ -463,7 +447,6 @@ int pkvm_create_stack(phys_addr_t phys, unsigned long *= haddr) if (ret) __io_map_base =3D prev_base; } - hyp_spin_unlock(&pkvm_pgd_lock); =20 *haddr =3D addr + size; =20 --=20 2.53.0.851.ga537e3e6e9-goog