95 lines
3.1 KiB
Diff
95 lines
3.1 KiB
Diff
|
From 46e54544c3480658111d6f111d6c265dcea2e19b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
Date: Thu, 18 Aug 2022 17:01:12 +0200
|
||
|
|
Subject: [PATCH 2/3] i386: reset KVM nested state upon CPU reset
|
||
|
|
|
||
|
|
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-MergeRequest: 219: Synchronize qemu-6.2.0-20.el8.1 build from RHEL 8.7 to RHEL 8.8
|
||
|
|
RH-Bugzilla: 2125271
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
RH-Commit: [1/2] de4db7bceb6baaf69aec8b0ae9aa8887aa869e15
|
||
|
|
|
||
|
|
Make sure env->nested_state is cleaned up when a vCPU is reset, it may
|
||
|
|
be stale after an incoming migration, kvm_arch_put_registers() may
|
||
|
|
end up failing or putting vCPU in a weird state.
|
||
|
|
|
||
|
|
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||
|
|
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
Message-Id: <20220818150113.479917-2-vkuznets@redhat.com>
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
(cherry picked from commit 3cafdb67504a34a0305260f0c86a73d5a3fb000b)
|
||
|
|
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
---
|
||
|
|
target/i386/kvm/kvm.c | 37 +++++++++++++++++++++++++++----------
|
||
|
|
1 file changed, 27 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
||
|
|
index bd439e56ad..81d729dc40 100644
|
||
|
|
--- a/target/i386/kvm/kvm.c
|
||
|
|
+++ b/target/i386/kvm/kvm.c
|
||
|
|
@@ -1615,6 +1615,30 @@ static void kvm_init_xsave(CPUX86State *env)
|
||
|
|
env->xsave_buf_len);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void kvm_init_nested_state(CPUX86State *env)
|
||
|
|
+{
|
||
|
|
+ struct kvm_vmx_nested_state_hdr *vmx_hdr;
|
||
|
|
+ uint32_t size;
|
||
|
|
+
|
||
|
|
+ if (!env->nested_state) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ size = env->nested_state->size;
|
||
|
|
+
|
||
|
|
+ memset(env->nested_state, 0, size);
|
||
|
|
+ env->nested_state->size = size;
|
||
|
|
+
|
||
|
|
+ if (cpu_has_vmx(env)) {
|
||
|
|
+ env->nested_state->format = KVM_STATE_NESTED_FORMAT_VMX;
|
||
|
|
+ vmx_hdr = &env->nested_state->hdr.vmx;
|
||
|
|
+ vmx_hdr->vmxon_pa = -1ull;
|
||
|
|
+ vmx_hdr->vmcs12_pa = -1ull;
|
||
|
|
+ } else if (cpu_has_svm(env)) {
|
||
|
|
+ env->nested_state->format = KVM_STATE_NESTED_FORMAT_SVM;
|
||
|
|
+ }
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
int kvm_arch_init_vcpu(CPUState *cs)
|
||
|
|
{
|
||
|
|
struct {
|
||
|
|
@@ -2042,19 +2066,10 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
||
|
|
assert(max_nested_state_len >= offsetof(struct kvm_nested_state, data));
|
||
|
|
|
||
|
|
if (cpu_has_vmx(env) || cpu_has_svm(env)) {
|
||
|
|
- struct kvm_vmx_nested_state_hdr *vmx_hdr;
|
||
|
|
-
|
||
|
|
env->nested_state = g_malloc0(max_nested_state_len);
|
||
|
|
env->nested_state->size = max_nested_state_len;
|
||
|
|
|
||
|
|
- if (cpu_has_vmx(env)) {
|
||
|
|
- env->nested_state->format = KVM_STATE_NESTED_FORMAT_VMX;
|
||
|
|
- vmx_hdr = &env->nested_state->hdr.vmx;
|
||
|
|
- vmx_hdr->vmxon_pa = -1ull;
|
||
|
|
- vmx_hdr->vmcs12_pa = -1ull;
|
||
|
|
- } else {
|
||
|
|
- env->nested_state->format = KVM_STATE_NESTED_FORMAT_SVM;
|
||
|
|
- }
|
||
|
|
+ kvm_init_nested_state(env);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2117,6 +2132,8 @@ void kvm_arch_reset_vcpu(X86CPU *cpu)
|
||
|
|
/* enabled by default */
|
||
|
|
env->poll_control_msr = 1;
|
||
|
|
|
||
|
|
+ kvm_init_nested_state(env);
|
||
|
|
+
|
||
|
|
sev_es_set_reset_vector(CPU(cpu));
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|