Changeset 75151 in vbox for trunk

Timestamp:

Oct 29, 2018 2:30:00 PM (6 years ago)

Author:

vboxsync

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

126229

Message:

VMM: Nested VMX: bugref:9180 Handle INIT and SIPI VM-exits.

File:

• trunk/src/VBox/VMM/VMMR3/VMM.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -113 +113 @@
 #include <VBox/vmm/mm.h>
 #include <VBox/vmm/nem.h>
+#include <VBox/vmm/iem.h>
 #include <VBox/vmm/iom.h>
 #include <VBox/vmm/trpm.h>
@@ -1556 +1557 @@
 
 /**
- * VCPU worker for VMMSendStartupIpi.
+ * VCPU worker for VMMR3SendStartupIpi.
  *
  * @param   pVM         The cross context VM structure.
@@ -1568 +1569 @@
 
     /*
-     * Active, halt and shutdown states of the processor all block SIPIs.
-     * So we can safely discard the SIPI. See Intel spec. 26.6.2 "Activity State".
+     * In the INIT state, the target CPU is only responsive to an SIPI.
+     * This is also true for when when the CPU is in VMX non-root mode.
+     *
+     * See AMD spec. 16.5 "Interprocessor Interrupts (IPI)".
+     * See Intel spec. 26.6.2 "Activity State".
      */
     if (EMGetState(pVCpu) != EMSTATE_WAIT_SIPI)
-        return VERR_ACCESS_DENIED;
+        return VINF_SUCCESS;
 
 
     PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVCpu);
+    if (CPUMIsGuestInVmxRootMode(pCtx))
+    {
+        /* If the CPU is in VMX non-root mode we must cause a VM-exit. */
+        if (CPUMIsGuestInVmxNonRootMode(pCtx))
+            return IEMExecVmxVmexitStartupIpi(pVCpu, uVector);
+
+        /* If the CPU is in VMX root mode (and not in VMX non-root mode) SIPIs are blocked. */
+        return VINF_SUCCESS;
+    }
 
     pCtx->cs.Sel        = uVector << 8;
@@ -1597 +1610 @@
 
 
+/**
+ * VCPU worker for VMMR3SendInitIpi.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The cross context VM structure.
+ * @param   idCpu       Virtual CPU to perform SIPI on.
+ */
 static DECLCALLBACK(int) vmmR3SendInitIpi(PVM pVM, VMCPUID idCpu)
 {
@@ -1603 +1623 @@
 
     Log(("vmmR3SendInitIpi for VCPU %d\n", idCpu));
+
+    /** @todo r=ramshankar: We should probably block INIT signal when the CPU is in
+     *        wait-for-SIPI state. Verify. */
+
+    /* If the CPU is in VMX non-root mode, INIT signals cause VM-exits. */
+    PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVCpu);
+    if (CPUMIsGuestInVmxNonRootMode(pCtx))
+        return IEMExecVmxVmexitInitIpi(pVCpu);
 
     /** @todo Figure out how to handle a nested-guest intercepts here for INIT