Changeset 78887 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

May 31, 2019 5:09:51 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 TPR-below threshold VM-exit handling. Assertion.

File:

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

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

@@ -445 +445 @@
 static FNVMXEXITHANDLER            hmR0VmxExitMonitorNested;
 static FNVMXEXITHANDLER            hmR0VmxExitPauseNested;
-//static FNVMXEXITHANDLERNSRC        hmR0VmxExitTprBelowThreshold;
+static FNVMXEXITHANDLERNSRC        hmR0VmxExitTprBelowThresholdNested;
 static FNVMXEXITHANDLER            hmR0VmxExitApicAccessNested;
 static FNVMXEXITHANDLER            hmR0VmxExitXdtrAccessNested;
@@ -7698 +7698 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
 # if 0
-                /** @todo NSTVMX: We handle each of these fields individually by passing it to IEM
-                 *        VM-exit handlers. We might handle it differently when using the fast path. */
+                /** @todo NSTVMX: We handle most of these fields individually by passing it to IEM
+                 *        VM-exit handlers as parameters. We would handle it differently when using
+                 *        the fast path. */
                 /*
                  * The hardware virtualization state currently consists of VMCS fields that may be
@@ -12675 +12676 @@
         case VMX_EXIT_MOV_CRX:                  return hmR0VmxExitMovCRxNested(pVCpu, pVmxTransient);
         case VMX_EXIT_INT_WINDOW:               return hmR0VmxExitIntWindowNested(pVCpu, pVmxTransient);
-
-        case VMX_EXIT_TPR_BELOW_THRESHOLD:
-        {
-            /** @todo NSTVMX: TPR below threshold. */
-            return hmR0VmxExitErrUnexpected(pVCpu, pVmxTransient);
-        }
-
+        case VMX_EXIT_TPR_BELOW_THRESHOLD:      return hmR0VmxExitTprBelowThresholdNested(pVCpu, pVmxTransient);
         case VMX_EXIT_MWAIT:                    return hmR0VmxExitMwaitNested(pVCpu, pVmxTransient);
         case VMX_EXIT_MONITOR:                  return hmR0VmxExitMonitorNested(pVCpu, pVmxTransient);
@@ -12693 +12688 @@
 
         case VMX_EXIT_MOV_DRX:                  return hmR0VmxExitMovDRxNested(pVCpu, pVmxTransient);
+        case VMX_EXIT_RDPMC:                    return hmR0VmxExitRdpmcNested(pVCpu, pVmxTransient);
+
         case VMX_EXIT_GDTR_IDTR_ACCESS:
         case VMX_EXIT_LDTR_TR_ACCESS:           return hmR0VmxExitXdtrAccessNested(pVCpu, pVmxTransient);
 
-        case VMX_EXIT_RDPMC:                    return hmR0VmxExitRdpmcNested(pVCpu, pVmxTransient);
-
         case VMX_EXIT_VMREAD:
         case VMX_EXIT_VMWRITE:                  return hmR0VmxExitVmreadVmwriteNested(pVCpu, pVmxTransient);
@@ -12703 +12698 @@
         case VMX_EXIT_TRIPLE_FAULT:             return hmR0VmxExitTripleFaultNested(pVCpu, pVmxTransient);
         case VMX_EXIT_NMI_WINDOW:               return hmR0VmxExitNmiWindowNested(pVCpu, pVmxTransient);
+
         case VMX_EXIT_ERR_INVALID_GUEST_STATE:
+        {
+            /** @todo NSTVMX: Invalid guest state. */
+            return hmR0VmxExitErrUnexpected(pVCpu, pVmxTransient);
+        }
 
         case VMX_EXIT_INIT_SIGNAL:
@@ -16305 +16305 @@
 
 /**
+ * Nested-guest VM-exit handler for when the TPR value is lowered below the
+ * specified threshold (VMX_EXIT_TPR_BELOW_THRESHOLD). Conditional VM-exit.
+ */
+HMVMX_EXIT_NSRC_DECL hmR0VmxExitTprBelowThresholdNested(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
+{
+    HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
+
+    if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_USE_TPR_SHADOW))
+        return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason, 0 /* uExitQual */);
+    return hmR0VmxExitTprBelowThreshold(pVCpu, pVmxTransient);
+}
+
+
+/**
  * Nested-guest VM-exit handler for APIC access (VMX_EXIT_APIC_ACCESS). Conditional
  * VM-exit.
@@ -16353 +16367 @@
     if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_RDTSC_EXIT))
     {
+        Assert(CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_RDTSCP));
         int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
         AssertRCReturn(rc, rc);