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

Timestamp:

Jan 28, 2018 10:09:24 PM (7 years ago)

Author:

vboxsync

Message:

VMM/PDMBlkCache: Commit some debug code for tracing I/O requests I had lying around for debug purposes (disabled by default)

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PDMBlkCache.cpp (modified) (7 diffs)
• include/PDMBlkCacheInternal.h (modified) (1 diff)

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

@@ -30 +30 @@
 #include <iprt/path.h>
 #include <iprt/string.h>
+#include <iprt/trace.h>
 #include <VBox/log.h>
 #include <VBox/vmm/stam.h>
@@ -67 +68 @@
 #define PDM_BLK_CACHE_SAVED_STATE_VERSION 1
 
+/* Enable to enable some tracing in the block cache code for investigating issues. */
+/*#define VBOX_BLKCACHE_TRACING 1*/
 
 /*********************************************************************************************************************************
@@ -75 +78 @@
                                                uint64_t off, size_t cbData, uint8_t *pbBuffer);
 static bool pdmBlkCacheAddDirtyEntry(PPDMBLKCACHE pBlkCache, PPDMBLKCACHEENTRY pEntry);
+
+
+/**
+ * Add message to the VM trace buffer.
+ *
+ * @returns nothing.
+ * @param   pBlkCache     The block cache.
+ * @param   pszFmt        The format string.
+ * @param   ...           Additional parameters for the string formatter.
+ */
+DECLINLINE(void) pdmBlkCacheR3TraceMsgF(PPDMBLKCACHE pBlkCache, const char *pszFmt, ...)
+{
+#if defined(VBOX_BLKCACHE_TRACING)
+    va_list va;
+    va_start(va, pszFmt);
+    RTTraceBufAddMsgV(pBlkCache->pCache->pVM->CTX_SUFF(hTraceBuf), pszFmt, va);
+    va_end(va);
+#else
+    RT_NOREF2(pBlkCache, pszFmt);
+#endif
+}
 
 /**
@@ -492 +516 @@
                  __FUNCTION__, pIoXfer, pIoXfer->enmXferDir));
 
+    ASMAtomicIncU32(&pBlkCache->cIoXfersActive);
+    pdmBlkCacheR3TraceMsgF(pBlkCache, "BlkCache: I/O req %#p (%RTbool , %d) queued (%u now active)",
+                           pIoXfer, pIoXfer->fIoCache, pIoXfer->enmXferDir, pBlkCache->cIoXfersActive);
+
     switch (pBlkCache->enmType)
     {
@@ -528 +556 @@
         default:
             AssertMsgFailed(("Unknown block cache type!\n"));
+    }
+
+    if (RT_FAILURE(rc))
+    {
+        pdmBlkCacheR3TraceMsgF(pBlkCache, "BlkCache: Queueing I/O req %#p failed %Rrc", pIoXfer, rc);
+        ASMAtomicDecU32(&pBlkCache->cIoXfersActive);
     }
 
@@ -1218 +1252 @@
         {
             pBlkCache->fSuspended = false;
+            pBlkCache->cIoXfersActive = 0;
             pBlkCache->pCache = pBlkCacheGlobal;
             RTListInit(&pBlkCache->ListDirtyNotCommitted);
@@ -2676 +2711 @@
     else
         pdmBlkCacheReqUpdate(pBlkCache, hIoXfer->pReq, rcIoXfer, true);
+
+    ASMAtomicDecU32(&pBlkCache->cIoXfersActive);
+    pdmBlkCacheR3TraceMsgF(pBlkCache, "BlkCache: I/O req %#p (%RTbool) completed (%u now active)",
+                           hIoXfer, hIoXfer->fIoCache, pBlkCache->cIoXfersActive);
     RTMemFree(hIoXfer);
 }

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

@@ -263 +263 @@
     /** Flag whether the cache was suspended. */
     volatile bool                 fSuspended;
+    /** Number of outstanding I/O transfers. */
+    volatile uint32_t             cIoXfersActive;
 
 } PDMBLKCACHE, *PPDMBLKCACHE;