[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen staging-4.8] x86/vmx: Defer vmx_vmcs_exit() as long as possible in construct_vmcs()
commit 15508b33a5767690b935529ddc04ef6bc86b701b Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> AuthorDate: Mon May 28 15:02:34 2018 +0100 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Tue Aug 14 17:27:26 2018 +0100 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 <andrew.cooper3@xxxxxxxxxx> Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx> Acked-by: Kevin Tian <kevin.tian@xxxxxxxxx> (cherry picked from commit f30e3cf34042846e391e3f8361fc6a76d181a7ee) --- xen/arch/x86/hvm/vmx/vmcs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index f6adb302c3..d57eed2b14 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -997,6 +997,7 @@ static int construct_vmcs(struct vcpu *v) unsigned long sysenter_eip; u32 vmexit_ctl = vmx_vmexit_control; u32 vmentry_ctl = vmx_vmentry_control; + int rc = 0; vmx_vmcs_enter(v); @@ -1091,8 +1092,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); @@ -1296,8 +1297,6 @@ 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); - /* PVH: paging mode is updated by arch_set_info_guest(). */ if ( is_hvm_domain(d) ) { @@ -1307,7 +1306,10 @@ static int construct_vmcs(struct vcpu *v) vmx_vlapic_msr_changed(v); } - return 0; + out: + vmx_vmcs_exit(v); + + return rc; } int vmx_read_guest_msr(u32 msr, u64 *val) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.8 _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |