---

yaml
---
r: 95971
b: refs/heads/master
c: bc1a34f
h: refs/heads/master
i:
  95969: b676269
  95967: f350952
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4f14abd95cd8d42f08438f1c4ec3eafe41054ee
+refs/heads/master: bc1a34f1bf354fabc03e3f465620c80e510d0e8f

trunk/arch/x86/kvm/x86.c

@@ -3703,10 +3703,19 @@ void fx_init(struct kvm_vcpu *vcpu)
 {
 	unsigned after_mxcsr_mask;
 
+	/*
+	 * Touch the fpu the first time in non atomic context as if
+	 * this is the first fpu instruction the exception handler
+	 * will fire before the instruction returns and it'll have to
+	 * allocate ram with GFP_KERNEL.
+	 */
+	if (!used_math())
+		fx_save(&vcpu->arch.host_fx_image);
+
 	/* Initialize guest FPU by resetting ours and saving into guest's */
 	preempt_disable();
 	fx_save(&vcpu->arch.host_fx_image);
-	fpu_init();
+	fx_finit();
 	fx_save(&vcpu->arch.guest_fx_image);
 	fx_restore(&vcpu->arch.host_fx_image);
 	preempt_enable();

trunk/include/asm-x86/kvm_host.h

@@ -627,7 +627,7 @@ static inline void fx_restore(struct i387_fxsave_struct *image)
 	asm("fxrstor (%0)":: "r" (image));
 }
 
-static inline void fpu_init(void)
+static inline void fx_finit(void)
 {
 	asm("finit");
 }