Changeset 76952 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jan 23, 2019 11:00:57 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128329

Message:

VMM: Nested VMX: bugref:9180 Clear VM-entry interruption information's valid bit on VM-exit. Save EFER.LMA to VMCS on VM-exit if the feature is enabled. Be careful while converting boolean expressions to uint8_t.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -2820 +2820 @@
 
     /*
+     * We need to clear the VM-entry interruption information field's valid bit on VM-exit.
+     * See Intel spec. 24.8.3 "VM-Entry Controls for Event Injection".
+     */
+    pVmcs->u32EntryIntInfo &= ~VMX_ENTRY_INT_INFO_VALID;
+
+    /*
+     * If we support storing EFER.LMA into IA32e-mode guest field on VM-exit, we need to do that now.
+     * See Intel spec. 27.2 "Recording VM-exit Information And Updating VM-entry Control".
+     */
+    if (IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fVmxExitSaveEferLma)
+    {
+        if (pVCpu->cpum.GstCtx.msrEFER & MSR_K6_EFER_LMA)
+            pVmcs->u32EntryCtls |= VMX_ENTRY_CTLS_IA32E_MODE_GUEST;
+        else
+            pVmcs->u32EntryCtls &= ~VMX_ENTRY_CTLS_IA32E_MODE_GUEST;
+    }
+
+    /*
      * Save the guest state back into the VMCS.
      * We only need to save the state when the VM-entry was successful.
@@ -3854 +3872 @@
         if (pVmcs->u32ExitCtls & VMX_EXIT_CTLS_ACK_EXT_INT)
         {
-            uint8_t  const fNmiUnblocking = pVCpu->cpum.GstCtx.hwvirt.vmx.fNmiUnblockingIret;
+            bool const     fNmiUnblocking = pVCpu->cpum.GstCtx.hwvirt.vmx.fNmiUnblockingIret;
             uint32_t const uExitIntInfo   = RT_BF_MAKE(VMX_BF_EXIT_INT_INFO_VECTOR,           uVector)
                                           | RT_BF_MAKE(VMX_BF_EXIT_INT_INFO_TYPE,             VMX_EXIT_INT_INFO_TYPE_EXT_INT)
@@ -3934 +3952 @@
         /* Update the IDT-vectoring event in the VMCS as the source of the upcoming event. */
         uint8_t  const uIdtVectoringType = iemVmxGetEventType(uVector, fFlags);
-        uint8_t  const fErrCodeValid     = (fFlags & IEM_XCPT_FLAGS_ERR);
+        bool     const fErrCodeValid     = RT_BOOL(fFlags & IEM_XCPT_FLAGS_ERR);
         uint32_t const uIdtVectoringInfo = RT_BF_MAKE(VMX_BF_IDT_VECTORING_INFO_VECTOR,         uVector)
                                          | RT_BF_MAKE(VMX_BF_IDT_VECTORING_INFO_TYPE,           uIdtVectoringType)
@@ -4016 +4034 @@
 
         uint8_t  const fNmiUnblocking = pVCpu->cpum.GstCtx.hwvirt.vmx.fNmiUnblockingIret;
-        uint8_t  const fErrCodeValid  = (fFlags & IEM_XCPT_FLAGS_ERR);
+        bool     const fErrCodeValid  = RT_BOOL(fFlags & IEM_XCPT_FLAGS_ERR);
         uint8_t  const uIntInfoType   = iemVmxGetEventType(uVector, fFlags);
         uint32_t const uExitIntInfo   = RT_BF_MAKE(VMX_BF_EXIT_INT_INFO_VECTOR,           uVector)