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: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
parent
a2938c8070
commit
5e4a0b3c1b
|
@ -1605,9 +1605,6 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
|
||||||
vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL);
|
vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL);
|
||||||
vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK);
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -2537,6 +2534,9 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
|
||||||
put_cpu();
|
put_cpu();
|
||||||
if (err)
|
if (err)
|
||||||
goto free_vmcs;
|
goto free_vmcs;
|
||||||
|
if (vm_need_virtualize_apic_accesses(kvm))
|
||||||
|
if (alloc_apic_access_page(kvm) != 0)
|
||||||
|
goto free_vmcs;
|
||||||
|
|
||||||
return &vmx->vcpu;
|
return &vmx->vcpu;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue