]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
LoongArch: KVM: Reload guest CSR registers after sleep
authorBibo Mao <maobibo@loongson.cn>
Sat, 8 Mar 2025 05:52:01 +0000 (13:52 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 12:01:50 +0000 (13:01 +0100)
commit 78d7bc5a02e1468df53896df354fa80727f35b7d upstream.

On host, the HW guest CSR registers are lost after suspend and resume
operation. Since last_vcpu of boot CPU still records latest vCPU pointer
so that the guest CSR register skips to reload when boot CPU resumes and
vCPU is scheduled.

Here last_vcpu is cleared so that guest CSR registers will reload from
scheduled vCPU context after suspend and resume.

Cc: stable@vger.kernel.org
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/loongarch/kvm/main.c

index 7e8f5d6829ef0ce9fee6757f3d1fc69ddbf57671..34fad2c29ee695aa75a937a4455e07041f9d0489 100644 (file)
@@ -297,6 +297,13 @@ int kvm_arch_enable_virtualization_cpu(void)
        kvm_debug("GCFG:%lx GSTAT:%lx GINTC:%lx GTLBC:%lx",
                  read_csr_gcfg(), read_csr_gstat(), read_csr_gintc(), read_csr_gtlbc());
 
+       /*
+        * HW Guest CSR registers are lost after CPU suspend and resume.
+        * Clear last_vcpu so that Guest CSR registers forced to reload
+        * from vCPU SW state.
+        */
+       this_cpu_ptr(vmcs)->last_vcpu = NULL;
+
        return 0;
 }