diff options
author | Andrea Arcangeli <andrea@qumranet.com> | 2008-05-01 12:43:33 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-05-04 07:44:48 -0400 |
commit | bc1a34f1bf354fabc03e3f465620c80e510d0e8f (patch) | |
tree | f16228a547097d8d7ad621064c463f3e92cc9557 /arch/x86/kvm | |
parent | b4f14abd95cd8d42f08438f1c4ec3eafe41054ee (diff) |
KVM: avoid fx_init() schedule in atomic
This make sure not to schedule in atomic during fx_init. I also
changed the name of fpu_init to fx_finit to avoid duplicating the name
with fpu_init that is already used in the kernel, this makes grep
simpler if nothing else.
Signed-off-by: Andrea Arcangeli <andrea@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/x86.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index bc224bba1e87..21338bdb28ff 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -3703,10 +3703,19 @@ void fx_init(struct kvm_vcpu *vcpu) | |||
3703 | { | 3703 | { |
3704 | unsigned after_mxcsr_mask; | 3704 | unsigned after_mxcsr_mask; |
3705 | 3705 | ||
3706 | /* | ||
3707 | * Touch the fpu the first time in non atomic context as if | ||
3708 | * this is the first fpu instruction the exception handler | ||
3709 | * will fire before the instruction returns and it'll have to | ||
3710 | * allocate ram with GFP_KERNEL. | ||
3711 | */ | ||
3712 | if (!used_math()) | ||
3713 | fx_save(&vcpu->arch.host_fx_image); | ||
3714 | |||
3706 | /* Initialize guest FPU by resetting ours and saving into guest's */ | 3715 | /* Initialize guest FPU by resetting ours and saving into guest's */ |
3707 | preempt_disable(); | 3716 | preempt_disable(); |
3708 | fx_save(&vcpu->arch.host_fx_image); | 3717 | fx_save(&vcpu->arch.host_fx_image); |
3709 | fpu_init(); | 3718 | fx_finit(); |
3710 | fx_save(&vcpu->arch.guest_fx_image); | 3719 | fx_save(&vcpu->arch.guest_fx_image); |
3711 | fx_restore(&vcpu->arch.host_fx_image); | 3720 | fx_restore(&vcpu->arch.host_fx_image); |
3712 | preempt_enable(); | 3721 | preempt_enable(); |