Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc1a34f1 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Avi Kivity
Browse files

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: default avatarAndrea Arcangeli <andrea@qumranet.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent b4f14abd

arch/x86/kvm/x86.c

+10 −1
Original line number Diff line number Diff line
@@ -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();

include/asm-x86/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -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");

}