From nobody Tue Apr 7 04:21:19 2026 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (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 922FE33AD8A for ; Mon, 16 Mar 2026 17:35:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682543; cv=none; b=fKQfvUcAIedhK3K2AnKrlqBIhL36kMbxNJH6XOZ1G1IfBrMS/FdS3IMvCQCfnmGtvEAG8/fsYQqSldTiSX/FVF9JBWzzNuzZMnOHPteoVhS6YKDzk/xP/2jopJtOmLQv9ln4PGVwRd5j6T7oCvm7vgtBDxfZDGnMx+N5WZDjzcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682543; c=relaxed/simple; bh=ZKEWj50MRz8/DTqbCH4vOeWYqo9VuNf8xP835LwJ8AU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EOsgoMK1FWxosdFvC57QdkNIsZXY+j3I2rUZfmTI9oy+7DnKgieW249LeA+p1VE62osnAqzjzYsfTNJOpdk53pczKsMT1DqR7/w09O4Hv0SIxvdAKUfbsQRFgyg5bCtJ3Ac5PWPfaaZg+1VlEgf81WzFMktxRznKfdZ92OeTKbU= 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=XR28iHFA; arc=none smtp.client-ip=209.85.221.73 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="XR28iHFA" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-43b41d45be4so1078598f8f.0 for ; Mon, 16 Mar 2026 10:35:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773682540; x=1774287340; 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=B0JuPFNs4DpwbGKwjvMOJ2DY/fNaxhc2eTovF8AJup0=; b=XR28iHFAc6klrIYQ1DLyNpb7QSzAmKgkUFeHB3ji7Yr1tQoJK8I9Le3A3rpnixeFyu RxoSjDI/s2+cnnv75XBh1uSqlPhB0Fv8OeurHAE10xLQH5UhV+RXLrQdC29PZz/a2DCS a6lCC4pmFgyKSchn+KhU5oCSnypBSYhbul6glEL3PDSezIWsECaOctF4VhT5w7SUMLjj R/tATJDmNAmvW1fK0xRmkGL7FCP5zHdKKYZSKOl8ig3Quu8WSlK8to5FZ3PE5RXsxoLN v6uKtzP6BGmESZsEBwzqfuB7VA83wD6EUARIpho9++Btbil2ZKq08y4EicAk1DsxWdl8 l4nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773682540; x=1774287340; 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=B0JuPFNs4DpwbGKwjvMOJ2DY/fNaxhc2eTovF8AJup0=; b=DWSbG41eBJzhG12qNj+4EAzdenDk6pKbm5735CC4lREwx2B8GHso0/diaFEB+74kUd ychphWpngMu4heY2aHo0z8ZE59IVMVzKKpl2SvisWzdHz6CJfg2KSLXtRVVSuSVWS0gL DsF9DuSY53E+iEBfHeVaH5QQXdxr+9UdRdgMmyV3cMP79uJ7U1ndxhqKQeOy4Qz5fkzV u01D0OsxOEbZWx29RLViMcSD/UXnpCsNC1vOVZ/gaf970NFFo6ZiqO+qCjxhb1Xj9hnh Jme6/Ut6+WUEJKiYmf3btV66gW58nvCRJoMlbaMW/N68FreUgtsasM9SN5eDaeT5Kxbh PC5A== X-Forwarded-Encrypted: i=1; AJvYcCXHsL3ei/2LF9Zr7+rl75yi7D3xKSXtVRnJx9GpaMleWSLGCju3Y/Jk8qykDDAO3kVCUoPbJAXRW1fCce0=@vger.kernel.org X-Gm-Message-State: AOJu0Yyd1dK8ocIT1AZv0EXsditt/NTPNpSge2SLtf8SyxjAm4X9tBF5 /fNbFVXjlROfPd1+GMfTOd6s8bzU7VWOD9RWAS/4Mx7Y0707sX0LyAEFB1bmi2xJNQ/vGJoiY6X 2qw== X-Received: from wmbfl19.prod.google.com ([2002:a05:600c:b93:b0:483:27fd:cf2b]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3e1a:b0:485:3428:774c with SMTP id 5b1f17b1804b1-4856eab522emr8252635e9.4.1773682539787; Mon, 16 Mar 2026 10:35:39 -0700 (PDT) Date: Mon, 16 Mar 2026 17:35:31 +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-10-456875a2c6db@google.com> Subject: [PATCH 10/10] KVM: arm64: Use guard(mutex) 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 mutex_lock() and mutex_unlock() calls managing kvm->arch.config_lock to use the guard(mutex) macro. This eliminates manual unlock calls on early return paths, ensuring the mutex is safely released during early pKVM host-side VM initialization. Change-Id: I902ab100f2deb4de7d6fbf0340d4aec30cf49e56 Signed-off-by: Fuad Tabba --- arch/arm64/kvm/pkvm.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index d7a0f69a9982..4a4a9d0699c8 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -190,33 +190,28 @@ bool pkvm_hyp_vm_is_created(struct kvm *kvm) =20 int pkvm_create_hyp_vm(struct kvm *kvm) { - int ret =3D 0; + guard(mutex)(&kvm->arch.config_lock); =20 - mutex_lock(&kvm->arch.config_lock); if (!pkvm_hyp_vm_is_created(kvm)) - ret =3D __pkvm_create_hyp_vm(kvm); - mutex_unlock(&kvm->arch.config_lock); + return __pkvm_create_hyp_vm(kvm); =20 - return ret; + return 0; } =20 int pkvm_create_hyp_vcpu(struct kvm_vcpu *vcpu) { - int ret =3D 0; + guard(mutex)(&vcpu->kvm->arch.config_lock); =20 - mutex_lock(&vcpu->kvm->arch.config_lock); if (!vcpu_get_flag(vcpu, VCPU_PKVM_FINALIZED)) - ret =3D __pkvm_create_hyp_vcpu(vcpu); - mutex_unlock(&vcpu->kvm->arch.config_lock); + return __pkvm_create_hyp_vcpu(vcpu); =20 - return ret; + return 0; } =20 void pkvm_destroy_hyp_vm(struct kvm *kvm) { - mutex_lock(&kvm->arch.config_lock); + guard(mutex)(&kvm->arch.config_lock); __pkvm_destroy_hyp_vm(kvm); - mutex_unlock(&kvm->arch.config_lock); } =20 int pkvm_init_host_vm(struct kvm *kvm) --=20 2.53.0.851.ga537e3e6e9-goog