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

Timestamp:

Sep 27, 2007 11:06:28 AM (17 years ago)

Author:

vboxsync

Message:

Limit the amount of resume loops

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (2 diffs)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -194 +194 @@
     STAM_REG(pVM, &pVM->hwaccm.s.StatExitIOStringRead,    STAMTYPE_COUNTER, "/HWACCM/Exit/IO/ReadString",           STAMUNIT_OCCURENCES,    "Nr of occurances");
     STAM_REG(pVM, &pVM->hwaccm.s.StatExitIrqWindow, STAMTYPE_COUNTER, "/HWACCM/Exit/GuestIrq/Pending",  STAMUNIT_OCCURENCES,    "Nr of occurances");
+    STAM_REG(pVM, &pVM->hwaccm.s.StatExitMaxResume, STAMTYPE_COUNTER, "/HWACCM/Exit/Safety/MaxResume",  STAMUNIT_OCCURENCES,    "Nr of occurances");
 
     STAM_REG(pVM, &pVM->hwaccm.s.StatSwitchGuestIrq,STAMTYPE_COUNTER, "/HWACCM/Switch/IrqPending",      STAMUNIT_OCCURENCES,    "Nr of occurances");

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -106 +106 @@
 /** @} */
 
+
+/** @name Maxium resume loops allowed in ring 0 (safety precaution) */
+#define HWACCM_MAX_RESUME_LOOPS             1024
 
 /** @name HWACCM SSM version
@@ -290 +293 @@
     STAMCOUNTER             StatExitIOStringRead;
     STAMCOUNTER             StatExitIrqWindow;
+    STAMCOUNTER             StatExitMaxResume;
     STAMCOUNTER             StatIntReinject;
     STAMCOUNTER             StatPendingHostIrq;

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

@@ -509 +509 @@
     bool        fForceTLBFlush = false;
     bool        fGuestStateSynced = false;
+    unsigned    cResume = 0;
 
     STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatEntry, x);
@@ -518 +519 @@
      */
 ResumeExecution:
+    /* Safety precaution; looping for too long here can have a very bad effect on the host */
+    if (++cResume > HWACCM_MAX_RESUME_LOOPS)
+    {
+        STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitMaxResume);
+        rc = VINF_EM_RAW_INTERRUPT;
+        goto end;
+    }
 
     /* Check for irq inhibition due to instruction fusing (sti, mov ss). */

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

@@ -863 +863 @@
     RTGCUINTPTR errCode, instrInfo, uInterruptState;
     bool        fGuestStateSynced = false;
+    unsigned    cResume = 0;
 
     Log2(("\nE"));
@@ -946 +947 @@
      */
 ResumeExecution:
+    /* Safety precaution; looping for too long here can have a very bad effect on the host */
+    if (++cResume > HWACCM_MAX_RESUME_LOOPS)
+    {
+        STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitMaxResume);
+        rc = VINF_EM_RAW_INTERRUPT;
+        goto end;
+    }
 
     /* Check for irq inhibition due to instruction fusing (sti, mov ss). */