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: 2121cadec45a ("RISCV: KVM: Introduce mp_state_lock to avoid lock inversion")
Signed-off-by: Radim Krčmář <rkrcmar@ventanamicro.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20250523104725.2894546-4-rkrcmar@ventanamicro.com
Signed-off-by: Anup Patel <anup@brainfault.org>

diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c
index 31fd3cc98d667e257fe703efaefef9e5d43bb4be..6e09b518a5d1a8515a4a3511bf7cfc93634d6d78 100644 (file)
--- a/arch/riscv/kvm/vcpu_sbi.c
+++ b/arch/riscv/kvm/vcpu_sbi.c
@@ -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);