From nobody Tue Apr 7 04:21:20 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 F21C733859C for ; Mon, 16 Mar 2026 17:35:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682540; cv=none; b=iAmsSiFMYo7hwW/tYuV6Ef5NHzSjs3V+mW+uPshK3XqJTzUN4CknmS/jHlvjrJgGBFAcFxqAc0N3QNJP5EMO7dKNNOmv23UTyEgYW77/6FISoJTxpMzqoiyG/urZyZpmVKXoElxcr03MHp+WNN27AZjO3CLhBNMBtSNqV0k3YE0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682540; c=relaxed/simple; bh=yNUIHO2NMw8B5EFVSRGekqdFjiqxXTiNYvgnQBnltj4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=L0nDLZMnCJilmv3PiBDlSOiyUcgmM1JoEpE75zeAkRiXOjk/tt018wc81gMu3SIl8fJ3FGl7Rn9pqurAAjrCYwbTUioJwZl6pc93rqQw9RTS1nVADqKtEiytudNlpQoHG+wPQ9s2A8UDVMohbuBS4TtTCI0vyudhfln8xRDWrAc= 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=b0YPp7+F; arc=none smtp.client-ip=209.85.128.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="b0YPp7+F" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-485390246c8so40739465e9.0 for ; Mon, 16 Mar 2026 10:35:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773682537; x=1774287337; 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=cfzLIsn2Q20JghpCHqLQPcreo5Zv/pRgRX5lZKoPSE8=; b=b0YPp7+Fz/+QNypHercqETVzJ1/o0TJVMN/w+F9LyIA+/6fyrTuzG2XbertUqsfZMV pzvq2yE9iefYRuQiTeSEyAIRPurC/ya1oN0jljltpz0msd/t7w1MtsZ7zEbnAqhBbpua 6HUodWIDa+Qjannu7spONeEVSMqEyL5j5/df12Y3lp4vCEN9A591IGjaKcBRqB1nNDaN j3K+Vk+PEhsuexFwZvnDxTkXMuYvpUo9hvJ3bXSjEHz4zGU/2G6I0FVvDuQidFfMCWi+ rK4yW5eFlA8oTEszvCor3qz+kCxY0/yBWZj57LkJDVKNfB+3WyBRN3P7/982h1DJeFAl zuGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773682537; x=1774287337; 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=cfzLIsn2Q20JghpCHqLQPcreo5Zv/pRgRX5lZKoPSE8=; b=atNWreTggEGIotpYQVu1jpbOh4zFEqfP+Sd6V2Z69MMSqTUWyVrf8zw/0HsfX6H9XP Plc3c2QcBSY6TDR1FHcy6HogvA1isuFRdLoFcZkf2NC9s+xj8o/qP4cd/SVAD2rFfcyO 7nIEi/tZVKc0kZHeXkNRyhYG3SdPIi7yy+n285aLiEGMhEzsash2C+EBUy0IcqSuLxKo JKvHdG9hyxuQXjTH6Echl8N47fe9PQwP4Uzbt6tqNskWX98uQChCtydCIlUkFDInrk/C veatsmtYn1VeqabFNuWd4YfmtK7HAx0U5JVor28K4ams335zOZ2vHibqbIsH+ZsnFDCy Siog== X-Forwarded-Encrypted: i=1; AJvYcCX5yxBjlltwTLYu7bXpX8IQef1h6IAyodz/Y9sBDeN368FSKbaoctglm/IvPuk+cnl4aK9j5t90V+h+YuA=@vger.kernel.org X-Gm-Message-State: AOJu0YyHlDpLv+YxWKXAA48UgManPZEJLPr8okhgg6XvawkAAA535Rp9 IjxzuJvXCQ2wYOKbR6UfLMMsUaJHZhJ5xoH647dfCgKb5B5aGMXbWHle3eHWKnWKYj42YIdLpBB 6ZA== X-Received: from wmbh3.prod.google.com ([2002:a05:600c:a103:b0:485:343f:9fb3]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f54:b0:485:49c5:8eb7 with SMTP id 5b1f17b1804b1-485566fd0eamr230387435e9.22.1773682537346; Mon, 16 Mar 2026 10:35:37 -0700 (PDT) Date: Mon, 16 Mar 2026 17:35:29 +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-8-456875a2c6db@google.com> Subject: [PATCH 08/10] KVM: arm64: Use guard(spinlock) in psci.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 spin_lock() and spin_unlock() calls managing the vcpu->arch.mp_state_lock to use the guard(spinlock) macro. This eliminates manual unlock calls on return paths and simplifies error handling during PSCI calls by replacing unlock goto labels with direct returns. Change-Id: Iaf72da18b18aaec8edff91bc30379bed9dd04b2b Signed-off-by: Fuad Tabba --- arch/arm64/kvm/psci.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c index 3b5dbe9a0a0e..04801f8b596a 100644 --- a/arch/arm64/kvm/psci.c +++ b/arch/arm64/kvm/psci.c @@ -62,7 +62,6 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *so= urce_vcpu) struct vcpu_reset_state *reset_state; struct kvm *kvm =3D source_vcpu->kvm; struct kvm_vcpu *vcpu =3D NULL; - int ret =3D PSCI_RET_SUCCESS; unsigned long cpu_id; =20 cpu_id =3D smccc_get_arg1(source_vcpu); @@ -78,14 +77,13 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *= source_vcpu) if (!vcpu) return PSCI_RET_INVALID_PARAMS; =20 - spin_lock(&vcpu->arch.mp_state_lock); + guard(spinlock)(&vcpu->arch.mp_state_lock); + if (!kvm_arm_vcpu_stopped(vcpu)) { if (kvm_psci_version(source_vcpu) !=3D KVM_ARM_PSCI_0_1) - ret =3D PSCI_RET_ALREADY_ON; + return PSCI_RET_ALREADY_ON; else - ret =3D PSCI_RET_INVALID_PARAMS; - - goto out_unlock; + return PSCI_RET_INVALID_PARAMS; } =20 reset_state =3D &vcpu->arch.reset_state; @@ -113,9 +111,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *= source_vcpu) WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_RUNNABLE); kvm_vcpu_wake_up(vcpu); =20 -out_unlock: - spin_unlock(&vcpu->arch.mp_state_lock); - return ret; + return PSCI_RET_SUCCESS; } =20 static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu) @@ -176,9 +172,8 @@ static void kvm_prepare_system_event(struct kvm_vcpu *v= cpu, u32 type, u64 flags) * re-initialized. */ kvm_for_each_vcpu(i, tmp, vcpu->kvm) { - spin_lock(&tmp->arch.mp_state_lock); - WRITE_ONCE(tmp->arch.mp_state.mp_state, KVM_MP_STATE_STOPPED); - spin_unlock(&tmp->arch.mp_state_lock); + scoped_guard(spinlock, &tmp->arch.mp_state_lock) + WRITE_ONCE(tmp->arch.mp_state.mp_state, KVM_MP_STATE_STOPPED); } kvm_make_all_cpus_request(vcpu->kvm, KVM_REQ_SLEEP); =20 --=20 2.53.0.851.ga537e3e6e9-goog