Changeset 90468 in vbox for trunk

Timestamp:

Aug 2, 2021 10:58:26 AM (4 years ago)

Author:

vboxsync

Message:

VMM/PDM: Fixed the VERR_INTERRUPTED w/ rcBusy=VINF_SUCCESS case. More stats. bugref:6695

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAllCritSect.cpp (modified) (4 diffs)
• VMMR3/PDMCritSect.cpp (modified) (1 diff)
• include/PDMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

@@ -172 +172 @@
     uint64_t const          cNsMaxRetry = RT_NS_15SEC;
     uint32_t                cMsMaxOne   = RT_MS_5SEC;
+    bool                    fNonInterruptible = false;
 # endif
     for (;;)
@@ -202 +203 @@
         RTThreadUnblocked(hThreadSelf, RTTHREADSTATE_CRITSECT);
 # else  /* IN_RING0 */
-        int const rc = SUPSemEventWaitNoResume(pSession, hEvent, cMsMaxOne);
+        int const rc = !fNonInterruptible
+                     ? SUPSemEventWaitNoResume(pSession, hEvent, cMsMaxOne)
+                     : SUPSemEventWait(pSession, hEvent, cMsMaxOne);
 # endif /* IN_RING0 */
 
@@ -248 +251 @@
                 /* Try return get out of here with a non-VINF_SUCCESS status if
                    the thread is terminating or if the timeout has been exceeded. */
+                STAM_REL_COUNTER_INC(&pVM->pdm.s.StatCritSectVerrTimeout);
                 if (   rcTerm != VINF_THREAD_IS_TERMINATING
                     && cNsElapsed <= cNsMaxTotal)
@@ -254 +258 @@
             else
             {
-                /* For interrupt cases, we must return if we can.  Only if we */
+                /* For interrupt cases, we must return if we can.  If rcBusy is VINF_SUCCESS,
+                   we will try non-interruptible sleep for a while to help resolve the issue
+                   w/o guru'ing. */
+                STAM_REL_COUNTER_INC(&pVM->pdm.s.StatCritSectVerrInterrupted);
                 if (   rcTerm != VINF_THREAD_IS_TERMINATING
                     && rcBusy == VINF_SUCCESS
                     && pVCpu != NULL
                     && cNsElapsed <= cNsMaxTotal)
+                {
+                    if (!fNonInterruptible)
+                    {
+                        STAM_REL_COUNTER_INC(&pVM->pdm.s.StatCritSectNonInterruptibleWaits);
+                        fNonInterruptible   = true;
+                        cMsMaxOne           = 32;
+                        uint64_t cNsLeft = cNsMaxTotal - cNsElapsed;
+                        if (cNsLeft > RT_NS_10SEC)
+                            cNsMaxTotal = cNsElapsed + RT_NS_10SEC;
+                    }
                     continue;
+                }
             }
 

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

@@ -55 +55 @@
 {
     RT_NOREF_PV(pVM);
-    STAM_REL_REG(pVM, &pVM->pdm.s.StatQueuedCritSectLeaves, STAMTYPE_COUNTER, "/PDM/QueuedCritSectLeaves", STAMUNIT_OCCURENCES,
+    STAM_REL_REG(pVM, &pVM->pdm.s.StatQueuedCritSectLeaves, STAMTYPE_COUNTER, "/PDM/CritSects/00-QueuedLeaves", STAMUNIT_OCCURENCES,
                  "Number of times a critical section leave request needed to be queued for ring-3 execution.");
-    STAM_REL_REG(pVM, &pVM->pdm.s.StatAbortedCritSectEnters, STAMTYPE_COUNTER, "/PDM/AbortedCritSectEnters", STAMUNIT_OCCURENCES,
+    STAM_REL_REG(pVM, &pVM->pdm.s.StatAbortedCritSectEnters, STAMTYPE_COUNTER, "/PDM/CritSects/00-AbortedEnters", STAMUNIT_OCCURENCES,
                  "Number of times we've successfully aborted a wait in ring-0.");
-    STAM_REL_REG(pVM, &pVM->pdm.s.StatCritSectEntersWhileAborting, STAMTYPE_COUNTER, "/PDM/CritSectEntersWhileAborting", STAMUNIT_OCCURENCES,
+    STAM_REL_REG(pVM, &pVM->pdm.s.StatCritSectEntersWhileAborting, STAMTYPE_COUNTER, "/PDM/CritSects/00-EntersWhileAborting", STAMUNIT_OCCURENCES,
                  "Number of times we've got the critical section ownership while trying to abort a wait due to VERR_INTERRUPTED.");
+    STAM_REL_REG(pVM, &pVM->pdm.s.StatCritSectVerrInterrupted, STAMTYPE_COUNTER, "/PDM/CritSects/00-VERR_INTERRUPTED", STAMUNIT_OCCURENCES,
+                 "Number of VERR_INTERRUPTED returns.");
+    STAM_REL_REG(pVM, &pVM->pdm.s.StatCritSectVerrTimeout, STAMTYPE_COUNTER, "/PDM/CritSects/00-VERR_TIMEOUT", STAMUNIT_OCCURENCES,
+                 "Number of VERR_TIMEOUT returns.");
+    STAM_REL_REG(pVM, &pVM->pdm.s.StatCritSectNonInterruptibleWaits, STAMTYPE_COUNTER, "/PDM/CritSects/00-Non-interruptible-Waits-VINF_SUCCESS",
+                 STAMUNIT_OCCURENCES, "Number of non-interruptible waits for rcBusy=VINF_SUCCESS");
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -1477 +1477 @@
      * abort a wait due to VERR_INTERRUPTED. */
     STAMCOUNTER                     StatCritSectEntersWhileAborting;
+    STAMCOUNTER                     StatCritSectVerrTimeout;
+    STAMCOUNTER                     StatCritSectVerrInterrupted;
+    STAMCOUNTER                     StatCritSectNonInterruptibleWaits;
 } PDM;
 AssertCompileMemberAlignment(PDM, CritSect, 8);