[v2,2/3] i386: kvm: Save&restore triple fault event

Commit Message

Chenyi Qiang March 18, 2022, 8:29 a.m. UTC

For the direct triple faults, i.e. hardware detected and KVM morphed
to VM-Exit, KVM will never lose them. But for triple faults sythesized
by KVM, e.g. the RSM path, if KVM exits to userspace before the request
is serviced, userspace coud migrate the VM and lose the triple fault.

A new flag KVM_VCPUEVENT_TRIPLE_FAULT is defined to signal that there's
triple fault event waiting to be serviced. Track it and save/restore
during get/set_vcpu_events().

Signed-off-by: Chenyi Qiang <[e-mail]>
---
 target/i386/cpu.c     |  1 +
 target/i386/cpu.h     |  1 +
 target/i386/kvm/kvm.c | 10 ++++++++++
 3 files changed, 12 insertions(+)

Patch

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 6c7ef1099b..dbfecf46a0 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5918,6 +5918,7 @@  static void x86_cpu_reset(DeviceState *dev)
     env->exception_has_payload = false;
     env->exception_payload = 0;
     env->nmi_injected = false;
+    env->has_triple_fault = false;
 #if !defined(CONFIG_USER_ONLY)
     /* We hard-wire the BSP to the first CPU. */
     apic_designate_bsp(cpu->apic_state, s->cpu_index == 0);
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index e11734ba86..5a2a005ae8 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1659,6 +1659,7 @@  typedef struct CPUArchState {
     uint8_t has_error_code;
     uint8_t exception_has_payload;
     uint64_t exception_payload;
+    bool has_triple_fault;
     uint32_t ins_len;
     uint32_t sipi_vector;
     bool tsc_valid;
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 83d0988302..3159c9cefe 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -4041,6 +4041,10 @@  static int kvm_put_vcpu_events(X86CPU *cpu, int level)
         }
     }
 
+    if (env->has_triple_fault) {
+        events.flags |= KVM_VCPUEVENT_TRIPLE_FAULT;
+    }
+
     return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_VCPU_EVENTS, &events);
 }
 
@@ -4110,6 +4114,12 @@  static int kvm_get_vcpu_events(X86CPU *cpu)
         }
     }
 
+    if (events.flags & KVM_VCPUEVENT_TRIPLE_FAULT) {
+        env->has_triple_fault = true;
+    } else {
+        env->has_triple_fault = false;
+    }
+
     env->sipi_vector = events.sipi_vector;
 
     return 0;