From: Andrew Cooper Date: Mon, 28 May 2018 14:02:34 +0000 (+0100) Subject: x86/vmx: Defer vmx_vmcs_exit() as long as possible in construct_vmcs() X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3725 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f30e3cf34042846e391e3f8361fc6a76d181a7ee;p=xen.git x86/vmx: Defer vmx_vmcs_exit() as long as possible in construct_vmcs() paging_update_paging_modes() and vmx_vlapic_msr_changed() both operate on the VMCS being constructed. Avoid dropping and re-acquiring the reference multiple times. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Kevin Tian --- diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 13b9cc5dbe..c7e6e29fe1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -996,6 +996,7 @@ static int construct_vmcs(struct vcpu *v) struct domain *d = v->domain; u32 vmexit_ctl = vmx_vmexit_control; u32 vmentry_ctl = vmx_vmentry_control; + int rc = 0; vmx_vmcs_enter(v); @@ -1083,8 +1084,8 @@ static int construct_vmcs(struct vcpu *v) if ( msr_bitmap == NULL ) { - vmx_vmcs_exit(v); - return -ENOMEM; + rc = -ENOMEM; + goto out; } memset(msr_bitmap, ~0, PAGE_SIZE); @@ -1260,14 +1261,15 @@ static int construct_vmcs(struct vcpu *v) if ( cpu_has_vmx_tsc_scaling ) __vmwrite(TSC_MULTIPLIER, d->arch.hvm_domain.tsc_scaling_ratio); - vmx_vmcs_exit(v); - /* will update HOST & GUEST_CR3 as reqd */ paging_update_paging_modes(v); vmx_vlapic_msr_changed(v); - return 0; + out: + vmx_vmcs_exit(v); + + return rc; } static int vmx_msr_entry_key_cmp(const void *key, const void *elt)