Changeset 78889 in vbox for trunk/src/VBox/VMM

Timestamp:

May 31, 2019 9:00:08 AM (6 years ago)

Author:

vboxsync

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

131007

Message:

VMM/IEM: Nested VMX: bugref:9180 Get the IDT-vectoring info. from IEM during VM-exit rather than recording it in the VMCS directly during event injection and then trying to clear it on VM-exit when its not applicable.
This is so that hardware-assisted VMX execution can pass on the IDT-vectoring info. as part of the VM-exit without the IEM VM-exit code overwriting it.

File:

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

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

@@ -2737 +2737 @@
     Assert(!VMX_ENTRY_INT_INFO_IS_VALID(pVmcs->u32EntryIntInfo));
 
-    /* Update the VM-exit reason, the other relevant data fields are expected to be updated by the caller already. */
+    /*
+     * Update the VM-exit reason. Other VMCS data fields are expected to be updated by the caller already.
+     */
     pVmcs->u32RoExitReason = uExitReason;
     Log3(("vmexit: uExitReason=%#RX32 uExitQual=%#RX64 cs:rip=%04x:%#RX64\n", uExitReason, pVmcs->u64RoExitQual,
@@ -2743 +2745 @@
 
     /*
-     * Clear IDT-vectoring information fields if the VM-exit was not triggered during delivery of an event.
+     * Update the IDT-vectoring information fields if the VM-exit is triggered during delivery of an event.
      * See Intel spec. 27.2.3 "Information for VM Exits During Event Delivery".
      */
@@ -2751 +2753 @@
         uint32_t   uErrCode;
         bool const fInEventDelivery = IEMGetCurrentXcpt(pVCpu, &uVector, &fFlags,  &uErrCode, NULL /* uCr2 */);
-        if (!fInEventDelivery)
-        {
-            iemVmxVmcsSetIdtVectoringInfo(pVCpu, 0);
-            iemVmxVmcsSetIdtVectoringErrCode(pVCpu, 0);  /* Not strictly needed but do it for consistency. */
-        }
-        /* else: Caller would have updated IDT-vectoring information already, see iemVmxVmexitEvent(). */
+        if (fInEventDelivery)
+        {
+            uint8_t  const uIdtVectoringType = iemVmxGetEventType(uVector, fFlags);
+            uint8_t  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)
+                                             | RT_BF_MAKE(VMX_BF_IDT_VECTORING_INFO_ERR_CODE_VALID, fErrCodeValid)
+                                             | RT_BF_MAKE(VMX_BF_IDT_VECTORING_INFO_VALID,          1);
+            iemVmxVmcsSetIdtVectoringInfo(pVCpu, uIdtVectoringInfo);
+            iemVmxVmcsSetIdtVectoringErrCode(pVCpu, uErrCode);
+        }
     }
 
@@ -3941 +3948 @@
     if (!pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents)
     {
-        /* Update the IDT-vectoring event in the VMCS as the source of the upcoming event. */
-        uint8_t  const uIdtVectoringType = iemVmxGetEventType(uVector, fFlags);
-        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)
-                                         | RT_BF_MAKE(VMX_BF_IDT_VECTORING_INFO_ERR_CODE_VALID, fErrCodeValid)
-                                         | RT_BF_MAKE(VMX_BF_IDT_VECTORING_INFO_VALID,          1);
-        iemVmxVmcsSetIdtVectoringInfo(pVCpu, uIdtVectoringInfo);
-        iemVmxVmcsSetIdtVectoringErrCode(pVCpu, uErrCode);
-
         /*
          * If the event is a virtual-NMI (which is an NMI being inject during VM-entry)