[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] Wrap SECONDARY_VM_EXEC_CONTROL
Rebased cleanup base on previous QIng's nested patch series. There is a missing/potential issue in existing vmx_vlapic_msr_changed, where the update may be immediately overwritten by other update. Thx, Eddie Unifying the SECONDARY_VM_EXEC_CONTROL VMCS field write into a single place for additional control that is required in nested VMX. Signed-off-by: Qing He <qing.he@xxxxxxxxx> Signed-off-by: Eddie Dong <eddie.dong@xxxxxxxxx> diff -r ed40058a194d xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c Mon Sep 13 10:14:47 2010 +0800 +++ b/xen/arch/x86/hvm/vmx/vmx.c Mon Sep 13 10:59:22 2010 +0800 @@ -385,6 +385,12 @@ long_mode_do_msr_write(unsigned int msr, #endif /* __i386__ */ +static void vmx_update_secondary_exec_control(struct vcpu *v) +{ + __vmwrite(SECONDARY_VM_EXEC_CONTROL, + v->arch.hvm_vmx.secondary_exec_control); +} + void vmx_update_exception_bitmap(struct vcpu *v) { __vmwrite(EXCEPTION_BITMAP, v->arch.hvm_vmx.exception_bitmap); @@ -1936,18 +1942,18 @@ void vmx_vlapic_msr_changed(struct vcpu void vmx_vlapic_msr_changed(struct vcpu *v) { struct vlapic *vlapic = vcpu_vlapic(v); - uint32_t ctl; if ( !cpu_has_vmx_virtualize_apic_accesses ) return; vmx_vmcs_enter(v); - ctl = __vmread(SECONDARY_VM_EXEC_CONTROL); - ctl &= ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; + v->arch.hvm_vmx.secondary_exec_control &= + ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; if ( !vlapic_hw_disabled(vlapic) && (vlapic_base_address(vlapic) == APIC_DEFAULT_PHYS_BASE) ) - ctl |= SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; - __vmwrite(SECONDARY_VM_EXEC_CONTROL, ctl); + v->arch.hvm_vmx.secondary_exec_control |= + SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; + vmx_update_secondary_exec_control(v); vmx_vmcs_exit(v); } @@ -2683,16 +2689,14 @@ asmlinkage void vmx_vmenter_helper(void) /* VPID was disabled: now enabled. */ curr->arch.hvm_vmx.secondary_exec_control |= SECONDARY_EXEC_ENABLE_VPID; - __vmwrite(SECONDARY_VM_EXEC_CONTROL, - curr->arch.hvm_vmx.secondary_exec_control); + vmx_update_secondary_exec_control(curr); } else if ( old_asid && !new_asid ) { /* VPID was enabled: now disabled. */ curr->arch.hvm_vmx.secondary_exec_control &= ~SECONDARY_EXEC_ENABLE_VPID; - __vmwrite(SECONDARY_VM_EXEC_CONTROL, - curr->arch.hvm_vmx.secondary_exec_control); + vmx_update_secondary_exec_control(curr); } } Attachment:
secondary.patch _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |