diff options
author | Suresh Siddha <suresh.b.siddha@intel.com> | 2012-08-24 17:12:59 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-09-18 18:52:07 -0400 |
commit | 9c1c3fac53378c9782c18f80107965578d7b7167 (patch) | |
tree | cc5ad4b2b895f4152606042b4b150455e333e2a8 /arch/x86/kvm | |
parent | 377ffbcc536a5a6666dc077395163ab149c02610 (diff) |
x86, kvm: use kernel_fpu_begin/end() in kvm_load/put_guest_fpu()
kvm's guest fpu save/restore should be wrapped around
kernel_fpu_begin/end(). This will avoid for example taking a DNA
in kvm_load_guest_fpu() when it tries to load the fpu immediately
after doing unlazy_fpu() on the host side.
More importantly this will prevent the host process fpu from being
corrupted.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Link: http://lkml.kernel.org/r/1345842782-24175-4-git-send-email-suresh.b.siddha@intel.com
Cc: Avi Kivity <avi@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 148ed666e311..cf637f572bdd 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -5972,7 +5972,7 @@ void kvm_load_guest_fpu(struct kvm_vcpu *vcpu) | |||
5972 | */ | 5972 | */ |
5973 | kvm_put_guest_xcr0(vcpu); | 5973 | kvm_put_guest_xcr0(vcpu); |
5974 | vcpu->guest_fpu_loaded = 1; | 5974 | vcpu->guest_fpu_loaded = 1; |
5975 | unlazy_fpu(current); | 5975 | kernel_fpu_begin(); |
5976 | fpu_restore_checking(&vcpu->arch.guest_fpu); | 5976 | fpu_restore_checking(&vcpu->arch.guest_fpu); |
5977 | trace_kvm_fpu(1); | 5977 | trace_kvm_fpu(1); |
5978 | } | 5978 | } |
@@ -5986,6 +5986,7 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) | |||
5986 | 5986 | ||
5987 | vcpu->guest_fpu_loaded = 0; | 5987 | vcpu->guest_fpu_loaded = 0; |
5988 | fpu_save_init(&vcpu->arch.guest_fpu); | 5988 | fpu_save_init(&vcpu->arch.guest_fpu); |
5989 | kernel_fpu_end(); | ||
5989 | ++vcpu->stat.fpu_reload; | 5990 | ++vcpu->stat.fpu_reload; |
5990 | kvm_make_request(KVM_REQ_DEACTIVATE_FPU, vcpu); | 5991 | kvm_make_request(KVM_REQ_DEACTIVATE_FPU, vcpu); |
5991 | trace_kvm_fpu(0); | 5992 | trace_kvm_fpu(0); |