KVM: VMX: Disallow NMI while blocked by STI
PATCH 1/1 KVM: VMX: Disallow NMI while blocked by STI
While not mandated by the spec, Linux relies on NMI being blocked by an IF-enabling STI. VMX also refuses to enter a guest in this state, at least on some implementations.
Disallow NMI while blocked by STI by checking for the condition, and requesting an interrupt window exit if it occurs.
Signed-off-by Avi Kivity <[email protected]>
--- arch/x86/kvm/vmx.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
arch/x86/kvm/vmx.c +6 -1
@@ -2788,6 +2788,10 @@ static void enable_nmi_window(struct kvm_vcpu *vcpu)return ; } +if (vmcs_read32 (GUEST_INTERRUPTIBILITY_INFO ) &GUEST_INTR_STATE_STI ) { +enable_irq_window (vcpu); +return ; + } cpu_based_vm_exec_control =vmcs_read32 (CPU_BASED_VM_EXEC_CONTROL ); cpu_based_vm_exec_control |=CPU_BASED_VIRTUAL_NMI_PENDING ;vmcs_write32 (CPU_BASED_VM_EXEC_CONTROL , cpu_based_vm_exec_control);
@@ -2850,7 +2854,8 @@ static int vmx_nmi_allowed(struct kvm_vcpu *vcpu)return 0 ;return !(vmcs_read32 (GUEST_INTERRUPTIBILITY_INFO ) & - (GUEST_INTR_STATE_MOV_SS |GUEST_INTR_STATE_NMI )); + (GUEST_INTR_STATE_MOV_SS |GUEST_INTR_STATE_STI + |GUEST_INTR_STATE_NMI )); }static bool vmx_get_nmi_mask (struct kvm_vcpu *vcpu)
Signature · 1 line
1.7.3.1