[Xen-changelog] [xen stable-4.3] Nested VMX: load current_vmcs only when it exists

[patchbot@xxxxxxx]

commit ecc692b21befcd5f7df87829650a69894b0f9cfc
Author:     Edmund H White <edmund.h.white@xxxxxxxxx>
AuthorDate: Fri May 23 15:29:43 2014 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri May 23 15:29:43 2014 +0200

    Nested VMX: load current_vmcs only when it exists
    
    There may not have valid vmcs on current CPU. So only load it when it 
exists.
    
    This original fixing is from Edmud <edmund.h.white@xxxxxxxxx>.
    
    Signed-off-by: Edmund H White <edmund.h.white@xxxxxxxxx>
    Signed-off-by: Yang Zhang <yang.z.zhang@xxxxxxxxx>
    Acked-by: Kevin Tian <kevin.tian@xxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 99c03bc6a1f8c6722926d2db781ece045f9d09ae
    master date: 2014-05-12 11:59:19 +0200
---
 xen/arch/x86/hvm/vmx/vmcs.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index 822e817..c51fa68 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -818,8 +818,12 @@ void virtual_vmcs_enter(void *vvmcs)
 
 void virtual_vmcs_exit(void *vvmcs)
 {
+    struct vmcs_struct *cur = this_cpu(current_vmcs);
+
     __vmpclear(pfn_to_paddr(domain_page_map_to_mfn(vvmcs)));
-    __vmptrld(virt_to_maddr(this_cpu(current_vmcs)));
+    if ( cur )
+        __vmptrld(virt_to_maddr(cur));
+
 }
 
 u64 virtual_vmcs_vmread(void *vvmcs, u32 vmcs_encoding)
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.3

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog