Commit 4ff910be authored by Reiji Watanabe's avatar Reiji Watanabe Committed by Marc Zyngier
Browse files

KVM: arm64: Acquire mp_state_lock in kvm_arch_vcpu_ioctl_vcpu_init() 



kvm_arch_vcpu_ioctl_vcpu_init() doesn't acquire mp_state_lock
when setting the mp_state to KVM_MP_STATE_RUNNABLE. Fix the
code to acquire the lock.

Signed-off-by: default avatarReiji Watanabe <reijiw@google.com>
[maz: minor refactor]
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230419021852.2981107-2-reijiw@google.com
parent 49e5d16b

arch/arm64/kvm/arm.c

+5 −1
Original line number Diff line number Diff line
@@ -1241,11 +1241,15 @@ 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);



	if (test_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features))

		kvm_arm_vcpu_power_off(vcpu);

		__kvm_arm_vcpu_power_off(vcpu);

	else

		WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_RUNNABLE);



	spin_unlock(&vcpu->arch.mp_state_lock);



	return 0;

}