diff options
| author | Anthoine Bourgeois | 2013-11-13 11:45:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2013-11-13 18:46:54 +0100 |
| commit | e504c9098ed6acd9e1079c5e10e4910724ad429f (patch) | |
| tree | 57f2107cf25e8fb660042616fdd9022a52359855 /arch/x86 | |
| parent | Merge tag 'kvm-arm64/for-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | kernel-qcow2-linux-e504c9098ed6acd9e1079c5e10e4910724ad429f.tar.gz kernel-qcow2-linux-e504c9098ed6acd9e1079c5e10e4910724ad429f.tar.xz kernel-qcow2-linux-e504c9098ed6acd9e1079c5e10e4910724ad429f.zip | |
kvm, vmx: Fix lazy FPU on nested guest
If a nested guest does a NM fault but its CR0 doesn't contain the TS
flag (because it was already cleared by the guest with L1 aid) then we
have to activate FPU ourselves in L0 and then continue to L2. If TS flag
is set then we fallback on the previous behavior, forward the fault to
L1 if it asked for.
Signed-off-by: Anthoine Bourgeois <bourgeois@bertin.fr>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index e293a62a11d6..b2fe1c252f35 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6643,6 +6643,9 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu) return 0; else if (is_page_fault(intr_info)) return enable_ept; + else if (is_no_device(intr_info) && + !(nested_read_cr0(vmcs12) & X86_CR0_TS)) + return 0; return vmcs12->exception_bitmap & (1u << (intr_info & INTR_INFO_VECTOR_MASK)); case EXIT_REASON_EXTERNAL_INTERRUPT: |