From nobody Tue Apr 7 04:21:20 2026 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 EF21933A9D3 for ; Mon, 16 Mar 2026 17:35:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682542; cv=none; b=IhstY7mnOroRcH0/lMVAISie3cMxIYC6QI35s+sEkbzb3M15Hmgbc7E0hzhYAd6Nhc4taKrpdTIWxpdYcchVVJl/gY7M/Z1JdKKOK0UOlzr9O0vF2M/l9paZ71SYVD9DGUlSQ+oPLgIrmX9KyD25+xq2cNzF4wm8nKX07FQ8nxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773682542; c=relaxed/simple; bh=iChkBxKJtcFVZgyq0ui0SMkPSn7JUQJQi+VMec4bY8M=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sXLQtC5w4V0BlekoyMOsqsQLNDvBI12L7aAPs+8MN/jP03wIPrkX9WLzwM+eAQ3FRGUgrlO+wLe36QFQCrHbIrwxe6n7KtHkqjkMA/CnlO91fxaRU9mtqRt3c7SWuHPs39XjxrRh0YPrxoINIeLjWAt1DU31F8+nDdRSlgh9EqE= 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=bsHs28H1; arc=none smtp.client-ip=209.85.221.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="bsHs28H1" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-439c54e0f6aso3739135f8f.0 for ; Mon, 16 Mar 2026 10:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773682536; x=1774287336; 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=2aVMNYqgbLtglfFJK2IfbXVz92dSXKpE2nwANbOIprc=; b=bsHs28H1znGpOUM3WoUga8GXE3AOaEmzlxoFhkLT16b/20O3D9oEYCevZSLSgp0kZ4 MvtxOl1zmw/EbmI///PmObPB/GUe5Pa0xn/qsqnbPuZcPVDc8bDKt5Nq/IIzxfTj4xvP G9g03lwKckV/XEAmYYj1EefNG41qbkqPxBib58IY9ZFDodE7y93qayDvUKWVKUVu7Cj6 G7fHD/widhgzbQEzu2Iuz8yj178tKY/grAiBZCjLYy2vl2LdTi4b7KBxrfL3/4jMcr/f bLuCxL4YrOc2SMFMou8flHrTkt+o7Ilgleqkikn91t5ef8B2oJwzrUT1HUMhPvA5NjDd QL+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773682536; x=1774287336; 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=2aVMNYqgbLtglfFJK2IfbXVz92dSXKpE2nwANbOIprc=; b=IA5IYvRp8N+24hLQtHEPZqDopUK8bpuHCuM+1wF7LkvSdcXwPJ7Yh9MR2mJKHDwr/C VuVC4kWcK87WEyV2z2IzmhL+ysKr/haKVwZ666AEYsg3sCHiryJTXBwy0VUftLt9KBRH NBNPDfmVo3xr/KZlMWzyAOue1fgZbl0IEs2W7nJrPpIf+uuGp7KfFajiv+BbD5HrWyR5 7psahSbGKe3dKDM9iqHGw9R1qo8Y9ykU1lNYMngvbIgi2Na5Esvkf20gCRcmvQmNFhXk 2jG/KYl5sPqN1DS076NQ+pmrXHZJvn8HOvozjkwm0TaglZxWItw03tHn7TWN9oooOI/4 Jz/g== X-Forwarded-Encrypted: i=1; AJvYcCUhWAy/kzMcIdUEAjTiJcb8rZejKdRXassK4/hn9qDZdtIc9B7OjGkkl4oljrntwFaUUYNKIJLIzmv1Ok0=@vger.kernel.org X-Gm-Message-State: AOJu0YwgVRUlgCrZ44ser+FxhLREkZSs8g2tIw7BKg+xCJK3YpY+dJb9 eB1AAA4W0Uel4kFPx/LrfZoPcoEKdwRBPVALCWzNqUIDXEaAFhrQTlHVzWfbwgVGvSMTrhjqPi1 7dg== X-Received: from wrbfu19.prod.google.com ([2002:a05:6000:25f3:b0:43b:458d:a311]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5d09:0:b0:439:c153:ae3d with SMTP id ffacd0b85a97d-43b498127f3mr1058497f8f.6.1773682536058; Mon, 16 Mar 2026 10:35:36 -0700 (PDT) Date: Mon, 16 Mar 2026 17:35:28 +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-7-456875a2c6db@google.com> Subject: [PATCH 07/10] KVM: arm64: Use scoped resource management in arm.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() calls managing mp_state_lock and manual mutex_lock() calls managing kvm->arch.config_lock to use the guard(spinlock) and guard(mutex) macros. This eliminates manual unlock calls on early return paths and simplifies the vCPU suspend/resume control flow. Change-Id: Ifcd8455d08afa5d00fc200daaa3fb13f6736e6ed Signed-off-by: Fuad Tabba --- arch/arm64/kvm/arm.c | 53 ++++++++++++++++++++----------------------------= ---- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 410ffd41fd73..017f5bfabe19 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -274,17 +274,15 @@ static void kvm_destroy_mpidr_data(struct kvm *kvm) { struct kvm_mpidr_data *data; =20 - mutex_lock(&kvm->arch.config_lock); - - data =3D rcu_dereference_protected(kvm->arch.mpidr_data, - lockdep_is_held(&kvm->arch.config_lock)); - if (data) { - rcu_assign_pointer(kvm->arch.mpidr_data, NULL); - synchronize_rcu(); - kfree(data); + scoped_guard(mutex, &kvm->arch.config_lock) { + data =3D rcu_dereference_protected(kvm->arch.mpidr_data, + lockdep_is_held(&kvm->arch.config_lock)); + if (data) { + rcu_assign_pointer(kvm->arch.mpidr_data, NULL); + synchronize_rcu(); + kfree(data); + } } - - mutex_unlock(&kvm->arch.config_lock); } =20 /** @@ -738,9 +736,8 @@ static void __kvm_arm_vcpu_power_off(struct kvm_vcpu *v= cpu) =20 void kvm_arm_vcpu_power_off(struct kvm_vcpu *vcpu) { - spin_lock(&vcpu->arch.mp_state_lock); + guard(spinlock)(&vcpu->arch.mp_state_lock); __kvm_arm_vcpu_power_off(vcpu); - spin_unlock(&vcpu->arch.mp_state_lock); } =20 bool kvm_arm_vcpu_stopped(struct kvm_vcpu *vcpu) @@ -773,7 +770,7 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vc= pu, { int ret =3D 0; =20 - spin_lock(&vcpu->arch.mp_state_lock); + guard(spinlock)(&vcpu->arch.mp_state_lock); =20 switch (mp_state->mp_state) { case KVM_MP_STATE_RUNNABLE: @@ -789,8 +786,6 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vc= pu, ret =3D -EINVAL; } =20 - spin_unlock(&vcpu->arch.mp_state_lock); - return ret; } =20 @@ -828,11 +823,11 @@ static void kvm_init_mpidr_data(struct kvm *kvm) u64 aff_set =3D 0, aff_clr =3D ~0UL; struct kvm_vcpu *vcpu; =20 - mutex_lock(&kvm->arch.config_lock); + guard(mutex)(&kvm->arch.config_lock); =20 if (rcu_access_pointer(kvm->arch.mpidr_data) || atomic_read(&kvm->online_vcpus) =3D=3D 1) - goto out; + return; =20 kvm_for_each_vcpu(c, vcpu, kvm) { u64 aff =3D kvm_vcpu_get_mpidr_aff(vcpu); @@ -857,7 +852,7 @@ static void kvm_init_mpidr_data(struct kvm *kvm) GFP_KERNEL_ACCOUNT); =20 if (!data) - goto out; + return; =20 data->mpidr_mask =3D mask; =20 @@ -869,8 +864,6 @@ static void kvm_init_mpidr_data(struct kvm *kvm) } =20 rcu_assign_pointer(kvm->arch.mpidr_data, data); -out: - mutex_unlock(&kvm->arch.config_lock); } =20 /* @@ -944,9 +937,8 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) return ret; } =20 - mutex_lock(&kvm->arch.config_lock); + guard(mutex)(&kvm->arch.config_lock); set_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags); - mutex_unlock(&kvm->arch.config_lock); =20 return ret; } @@ -1585,29 +1577,26 @@ static int __kvm_vcpu_set_target(struct kvm_vcpu *v= cpu, { unsigned long features =3D init->features[0]; struct kvm *kvm =3D vcpu->kvm; - int ret =3D -EINVAL; + int ret; =20 - mutex_lock(&kvm->arch.config_lock); + guard(mutex)(&kvm->arch.config_lock); =20 if (test_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, &kvm->arch.flags) && kvm_vcpu_init_changed(vcpu, init)) - goto out_unlock; + return -EINVAL; =20 bitmap_copy(kvm->arch.vcpu_features, &features, KVM_VCPU_MAX_FEATURES); =20 ret =3D kvm_setup_vcpu(vcpu); if (ret) - goto out_unlock; + return ret; =20 /* Now we know what it is, we can reset it. */ kvm_reset_vcpu(vcpu); =20 set_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, &kvm->arch.flags); vcpu_set_flag(vcpu, VCPU_INITIALIZED); - ret =3D 0; -out_unlock: - mutex_unlock(&kvm->arch.config_lock); - return ret; + return 0; } =20 static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, @@ -1674,15 +1663,13 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm= _vcpu *vcpu, /* * Handle the "start in power-off" case. */ - spin_lock(&vcpu->arch.mp_state_lock); + guard(spinlock)(&vcpu->arch.mp_state_lock); =20 if (power_off) __kvm_arm_vcpu_power_off(vcpu); else WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_RUNNABLE); =20 - spin_unlock(&vcpu->arch.mp_state_lock); - return 0; } =20 --=20 2.53.0.851.ga537e3e6e9-goog