Commit 7917be17 authored by Radim Krčmář's avatar Radim Krčmář Committed by Anup Patel
Browse files

RISC-V: KVM: lock the correct mp_state during reset 



Currently, the kvm_riscv_vcpu_sbi_system_reset() function locks
vcpu->arch.mp_state_lock when updating tmp->arch.mp_state.mp_state
which is incorrect hence fix it.

Fixes: 2121cade ("RISCV: KVM: Introduce mp_state_lock to avoid lock inversion")
Signed-off-by: default avatarRadim Krčmář <rkrcmar@ventanamicro.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20250523104725.2894546-4-rkrcmar@ventanamicro.com


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 5b9db9c1

arch/riscv/kvm/vcpu_sbi.c

+2 −2
Original line number Diff line number Diff line
@@ -143,9 +143,9 @@ void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu, 
	struct kvm_vcpu *tmp;



	kvm_for_each_vcpu(i, tmp, vcpu->kvm) {

		spin_lock(&vcpu->arch.mp_state_lock);

		spin_lock(&tmp->arch.mp_state_lock);

		WRITE_ONCE(tmp->arch.mp_state.mp_state, KVM_MP_STATE_STOPPED);

		spin_unlock(&vcpu->arch.mp_state_lock);

		spin_unlock(&tmp->arch.mp_state_lock);

	}

	kvm_make_all_cpus_request(vcpu->kvm, KVM_REQ_SLEEP);