diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-09-15 11:07:23 +0300 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-09-17 19:09:47 +0300 |
| commit | 0be9c7a89f75072e091cd079d76194aec8d1fb09 (patch) | |
| tree | 62a183a54e4a9b3af3753392f3069cefbdb97a8d /arch/x86 | |
| parent | 28b441e24088081c1e213139d1303b451a34a4f4 (diff) | |
| download | linux-0be9c7a89f75072e091cd079d76194aec8d1fb09.tar.gz linux-0be9c7a89f75072e091cd079d76194aec8d1fb09.tar.xz | |
KVM: VMX: set "blocked by NMI" flag if EPT violation happens during IRET from NMI
Set "blocked by NMI" flag if EPT violation happens during IRET from NMI
otherwise NMI can be called recursively causing stack corruption.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 48735936860c..a1216de9ffda 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -5339,6 +5339,15 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu) return 0; } + /* + * EPT violation happened while executing iret from NMI, + * "blocked by NMI" bit has to be set before next VM entry. + * There are errata that may cause this bit to not be set: + * AAK134, BY25. + */ + if (exit_qualification & INTR_INFO_UNBLOCK_NMI) + vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO, GUEST_INTR_STATE_NMI); + gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS); trace_kvm_page_fault(gpa, exit_qualification); |