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

Commit 5e4a0b3c authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: move alloc_apic_access_page() outside of non-preemptable region 



alloc_apic_access_page() can sleep, while vmx_vcpu_setup is called
inside a non preemptable region. Move it after put_cpu().

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent a2938c80

arch/x86/kvm/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -1605,9 +1605,6 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) 
	vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL);

	vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK);



	if (vm_need_virtualize_apic_accesses(vmx->vcpu.kvm))

		if (alloc_apic_access_page(vmx->vcpu.kvm) != 0)

			return -ENOMEM;



	return 0;

}
@@ -2537,6 +2534,9 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
	put_cpu();

	if (err)

		goto free_vmcs;

	if (vm_need_virtualize_apic_accesses(kvm))

		if (alloc_apic_access_page(kvm) != 0)

			goto free_vmcs;



	return &vmx->vcpu;