Changeset 74469 in vbox for trunk/src/VBox

Timestamp:

Sep 26, 2018 6:46:28 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 VM-exit handler for instructions with a ModR/M field that update the VM-exit instruction info. field.

File:

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

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

@@ -877 +877 @@
  * @param   pVCpu           The cross context virtual CPU structure.
  * @param   uExitReason     The VM-exit reason.
- * @param   uInstrId        The VM-exit instruction identity (VMXINSTRID_XXX) if
- *                          any. Pass VMXINSTRID_NONE otherwise.
- * @param   fPrimaryOpRead  If the primary operand of the ModR/M byte (bits 0:3) is
- *                          a read or write.
+ * @param   uInstrId        The VM-exit instruction identity (VMXINSTRID_XXX).
  * @param   pGCPtrDisp      Where to store the displacement field. Optional, can be
  *                          NULL.
  */
-IEM_STATIC uint32_t iemVmxGetExitInstrInfo(PVMCPU pVCpu, uint32_t uExitReason, VMXINSTRID uInstrId, bool fPrimaryOpRead,
-                                           PRTGCPTR pGCPtrDisp)
+IEM_STATIC uint32_t iemVmxGetExitInstrInfo(PVMCPU pVCpu, uint32_t uExitReason, VMXINSTRID uInstrId, PRTGCPTR pGCPtrDisp)
 {
     RTGCPTR          GCPtrDisp;
@@ -907 +903 @@
         uint8_t idxReg1;
         uint8_t idxReg2;
-        if (fPrimaryOpRead)
+        if (!VMXINSTRID_IS_MODRM_PRIMARY_OP_W(uInstrId))
         {
             idxReg1 = ((bRm >> X86_MODRM_REG_SHIFT) & X86_MODRM_REG_SMASK) | pVCpu->iem.s.uRexReg;
@@ -1153 +1149 @@
          */
         uint8_t idxReg2;
-        if (fPrimaryOpRead)
+        if (!VMXINSTRID_IS_MODRM_PRIMARY_OP_W(uInstrId))
         {
             idxReg2 = bRm & X86_MODRM_RM_MASK;
@@ -1187 +1183 @@
         {
             Assert(VMXINSTRID_IS_VALID(uInstrId));
+            Assert(VMXINSTRID_GET_ID(uInstrId) == (uInstrId & 0x3));
             ExitInstrInfo.GdtIdt.u2InstrId = VMXINSTRID_GET_ID(uInstrId);
             ExitInstrInfo.GdtIdt.u2Undef0  = 0;
@@ -1195 +1192 @@
         {
             Assert(VMXINSTRID_IS_VALID(uInstrId));
+            Assert(VMXINSTRID_GET_ID(uInstrId) == (uInstrId & 0x3));
             ExitInstrInfo.LdtTr.u2InstrId = VMXINSTRID_GET_ID(uInstrId);
             ExitInstrInfo.LdtTr.u2Undef0 = 0;
@@ -1211 +1209 @@
     if (pGCPtrDisp)
         *pGCPtrDisp = GCPtrDisp;
+
     return ExitInstrInfo.u;
 }
@@ -3369 +3368 @@
 
 /**
+ * VMX VM-exit handler for VM-exits due to instruction execution.
+ *
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   uExitReason     The VM-exit reason.
+ * @param   uInstrid        The instruction identity (VMXINSTRID_XXX).
+ * @param   cbInstr         The instruction length (in bytes).
+ */
+IEM_STATIC VBOXSTRICTRC iemVmxVmexitInstr(PVMCPU pVCpu, uint32_t uExitReason, VMXINSTRID uInstrId, uint8_t cbInstr)
+{
+    /* Construct the VM-exit instruction information. */
+    RTGCPTR GCPtrDisp;
+    uint32_t const uExitInstrInfo = iemVmxGetExitInstrInfo(pVCpu, uExitReason, uInstrId, &GCPtrDisp);
+
+    /* Update the VM-exit instruction information. */
+    iemVmxVmcsSetExitInstrInfo(pVCpu, uExitInstrInfo);
+
+    /*
+     * Update the VM-exit qualification field with displacement bytes.
+     * See Intel spec. 27.2.1 "Basic VM-Exit Information".
+     */
+    switch (uExitReason)
+    {
+        case VMX_EXIT_INVEPT:
+        case VMX_EXIT_INVPCID:
+        case VMX_EXIT_LDTR_TR_ACCESS:
+        case VMX_EXIT_GDTR_IDTR_ACCESS:
+        case VMX_EXIT_VMCLEAR:
+        case VMX_EXIT_VMPTRLD:
+        case VMX_EXIT_VMPTRST:
+        case VMX_EXIT_VMREAD:
+        case VMX_EXIT_VMWRITE:
+        case VMX_EXIT_VMXON:
+        case VMX_EXIT_XRSTORS:
+        case VMX_EXIT_XSAVES:
+        case VMX_EXIT_RDRAND:
+        case VMX_EXIT_RDSEED:
+            iemVmxVmcsSetExitQual(pVCpu, GCPtrDisp);
+            break;
+
+        default:
+            AssertMsgFailedReturn(("Use instruction-specific handler\n"), VERR_IEM_IPE_5);
+    }
+
+    /* Update the VM-exit instruction length field. */
+    Assert(cbInstr <= 15);
+    iemVmxVmcsSetExitInstrLen(pVCpu, cbInstr);
+
+    /* Perform the VM-exit. */
+    return iemVmxVmexit(pVCpu, uExitReason);
+}
+
+
+/**
  * Checks guest control registers, debug registers and MSRs as part of VM-entry.
  *
- * @param   pVCpu           The cross context virtual CPU structure.
- * @param   pszInstr        The VMX instruction name (for logging purposes).
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pszInstr    The VMX instruction name (for logging purposes).
  */
 IEM_STATIC int iemVmxVmentryCheckGuestControlRegsMsrs(PVMCPU pVCpu, const char *pszInstr)
@@ -3479 +3531 @@
         IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_GuestEferMsrRsvd);
 
-    bool const fGstLma        = RT_BOOL(pVmcs->u64HostEferMsr.u & MSR_K6_EFER_BIT_LMA);
-    bool const fGstLme        = RT_BOOL(pVmcs->u64HostEferMsr.u & MSR_K6_EFER_BIT_LME);
+    bool const fGstLma = RT_BOOL(pVmcs->u64HostEferMsr.u & MSR_K6_EFER_BIT_LMA);
+    bool const fGstLme = RT_BOOL(pVmcs->u64HostEferMsr.u & MSR_K6_EFER_BIT_LME);
     if (   fGstInLongMode == fGstLma
         && (   !(pVmcs->u64GuestCr0.u & X86_CR0_PG)