Changeset 13516 in vbox for trunk/src

Timestamp:

Oct 23, 2008 8:15:56 AM (16 years ago)

Author:

vboxsync

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

38352

Message:

Protection against touching VT-x/AMD-V after the suspend signal has been sent.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (10 diffs)

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

@@ -129 +129 @@
 
     HWACCMSTATE     enmHwAccmState;
+
+    bool            fSuspended;
 } HWACCMR0Globals;
 
@@ -526 +528 @@
 {
     Assert(sizeof(HWACCMR0Globals.enmHwAccmState) == sizeof(uint32_t));
+
+    /* Make sure we don't touch hwaccm after we've disabled hwaccm in preparation of a suspend. */
+    if (HWACCMR0Globals.fSuspended)
+        return VERR_HWACCM_SUSPEND_PENDING;
+
     if (ASMAtomicCmpXchgU32((volatile uint32_t *)&HWACCMR0Globals.enmHwAccmState, enmNewHwAccmState, HWACCMSTATE_UNINITIALIZED))
     {
@@ -677 +684 @@
         SUPR0Printf("hwaccmR0PowerCallback RTPOWEREVENT_RESUME\n");
 #endif
+
+    if (enmEvent == RTPOWEREVENT_SUSPEND)
+        HWACCMR0Globals.fSuspended = true;
 
     if (HWACCMR0Globals.enmHwAccmState == HWACCMSTATE_ENABLED)
@@ -709 +719 @@
         }
     }
+    if (enmEvent == RTPOWEREVENT_RESUME)
+        HWACCMR0Globals.fSuspended = false;
 }
 
@@ -728 +740 @@
     SUPR0Printf("HWACCMR0InitVM: %p\n", pVM);
 #endif
+
+    /* Make sure we don't touch hwaccm after we've disabled hwaccm in preparation of a suspend. */
+    if (HWACCMR0Globals.fSuspended)
+        return VERR_HWACCM_SUSPEND_PENDING;
 
     pVM->hwaccm.s.vmx.fSupported            = HWACCMR0Globals.vmx.fSupported;
@@ -783 +799 @@
 #endif
 
+    /* Make sure we don't touch hwaccm after we've disabled hwaccm in preparation of a suspend. */
+    if (HWACCMR0Globals.fSuspended)
+        return VERR_HWACCM_SUSPEND_PENDING;
+
     /* Terminate a VT-x or AMD-V VM. */
     return HWACCMR0Globals.pfnTermVM(pVM);
@@ -797 +817 @@
 {
     AssertReturn(pVM, VERR_INVALID_PARAMETER);
+
+    /* Make sure we don't touch hwaccm after we've disabled hwaccm in preparation of a suspend. */
+    if (HWACCMR0Globals.fSuspended)
+        return VERR_HWACCM_SUSPEND_PENDING;
 
 #ifdef LOG_ENABLED
@@ -818 +842 @@
     int      rc;
     RTCPUID  idCpu = RTMpCpuId();
+
+    /* Make sure we can't enter a session after we've disabled hwaccm in preparation of a suspend. */
+    if (HWACCMR0Globals.fSuspended)
+        return VINF_EM_RAW_INTERRUPT;
 
     rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
@@ -869 +897 @@
     int      rc;
 
+    AssertReturn(!HWACCMR0Globals.fSuspended, VERR_HWACCM_SUSPEND_PENDING);
+
     rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
     if (VBOX_FAILURE(rc))
@@ -912 +942 @@
     Assert(!VM_FF_ISPENDING(pVM, VM_FF_PGM_SYNC_CR3 | VM_FF_PGM_SYNC_CR3_NON_GLOBAL));
     Assert(HWACCMR0Globals.aCpuInfo[idCpu].fConfigured);
+    AssertReturn(!HWACCMR0Globals.fSuspended, VERR_HWACCM_SUSPEND_PENDING);
 
     rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);