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

Timestamp:

May 30, 2019 11:17:41 AM (6 years ago)

Author:

vboxsync

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

130984

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 VMREAD VM-exit handling.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -429 +429 @@
 //static FNVMXEXITHANDLER            hmR0VmxExitVmptrld;
 //static FNVMXEXITHANDLER            hmR0VmxExitVmptrst;
-//static FNVMXEXITHANDLER            hmR0VmxExitVmread;
+static FNVMXEXITHANDLER            hmR0VmxExitVmreadNested;
 //static FNVMXEXITHANDLER            hmR0VmxExitVmresume;
 //static FNVMXEXITHANDLER            hmR0VmxExitVmwrite;
@@ -12696 +12696 @@
 
         case VMX_EXIT_RDPMC:                    return hmR0VmxExitRdpmcNested(pVCpu, pVmxTransient);
-        case VMX_EXIT_VMREAD:
+        case VMX_EXIT_VMREAD:                   return hmR0VmxExitVmreadNested(pVCpu, pVmxTransient);
         case VMX_EXIT_VMWRITE:
 
@@ -15890 +15890 @@
 
 /**
+ * Nested-guest VM-exit handler for VMREAD (VMX_EXIT_VMREAD). Unconditional VM-exit.
+ */
+HMVMX_EXIT_DECL hmR0VmxExitVmreadNested(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
+{
+    HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
+
+    int rc = hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
+    AssertRCReturn(rc, rc);
+
+    uint8_t const iGReg = pVmxTransient->ExitInstrInfo.VmreadVmwrite.iReg2;
+    Assert(iGReg < RT_ELEMENTS(pVCpu->cpum.GstCtx.aGRegs));
+    uint64_t u64FieldEnc = pVCpu->cpum.GstCtx.aGRegs[iGReg].u64;
+
+    HMVMX_CPUMCTX_ASSERT(pVCpu, CPUMCTX_EXTRN_EFER);
+    if (!CPUMIsGuestInLongModeEx(&pVCpu->cpum.GstCtx))
+        u64FieldEnc &= UINT64_C(0xffffffff);
+
+    if (CPUMIsGuestVmxVmreadVmwriteInterceptSet(pVCpu, pVmxTransient->uExitReason, u64FieldEnc))
+    {
+        rc |= hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+        rc |= hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+        AssertRCReturn(rc, rc);
+
+        VMXVEXITINFO ExitInfo;
+        RT_ZERO(ExitInfo);
+        ExitInfo.uReason   = pVmxTransient->uExitReason;
+        ExitInfo.cbInstr   = pVmxTransient->cbInstr;
+        ExitInfo.u64Qual   = pVmxTransient->uExitQual;
+        ExitInfo.InstrInfo = pVmxTransient->ExitInstrInfo;
+        return IEMExecVmxVmexitInstrWithInfo(pVCpu, &ExitInfo);
+    }
+    return hmR0VmxExitVmread(pVCpu, pVmxTransient);
+}
+
+
+/**
  * Nested-guest VM-exit handler for RDTSC (VMX_EXIT_RDTSC). Conditional VM-exit.
  */
@@ -16103 +16139 @@
         AssertRCReturn(rc, rc);
 
-        /* Make sure we don't use stale VMX-transient info. */
+        /* Make sure we don't use stale/uninitialized VMX-transient info. below. */
         pVmxTransient->ExitInstrInfo.u  = 0;
         pVmxTransient->uGuestLinearAddr = 0;