Changeset 61634 in vbox

Timestamp:

Jun 9, 2016 6:23:17 PM (9 years ago)

Author:

vboxsync

Message:

Fixed DBGFR3_INFO_LOG to only run on the current EMT as we'll easily deadlock if we involv other EMT like for cpumguest.

Location:

trunk

Files:

• include/VBox/vmm/dbgf.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/EMHM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/EMRaw.cpp (modified) (7 diffs)
• src/VBox/VMM/VMMR3/PGM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/TRPM.cpp (modified) (1 diff)
• src/recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/include/VBox/vmm/dbgf.h

@@ -967 +967 @@
  * Display a piece of info writing to the log if enabled.
  *
+ * This is for execution on EMTs and will only show the items on the calling
+ * EMT.  This is to avoid deadlocking against other CPUs if a rendezvous is
+ * initiated in parallel to this call.  (Besides, nobody really wants or need
+ * info for the other EMTs when using this macro.)
+ *
+ * @param   a_pVM       The shared VM handle.
+ * @param   a_pVCpu     The cross context per CPU structure of the calling EMT.
+ * @param   a_pszName   The identifier of the info to display.
+ * @param   a_pszArgs   Arguments to the info handler.
+ */
+#ifdef LOG_ENABLED
+# define DBGFR3_INFO_LOG(a_pVM, a_pVCpu, a_pszName, a_pszArgs) \
+    do { \
+        if (LogIsEnabled()) \
+            DBGFR3InfoEx((a_pVM)->pUVM, (a_pVCpu)->idCpu, a_pszName, a_pszArgs, NULL); \
+    } while (0)
+#else
+# define DBGFR3_INFO_LOG(a_pVM, a_pVCpu, a_pszName, a_pszArgs) do { } while (0)
+#endif
+
+/** @def DBGFR3_INFO_LOG_SAFE
+ * Display a piece of info (rendezvous safe) writing to the log if enabled.
+ *
  * @param   a_pVM       The shared VM handle.
  * @param   a_pszName   The identifier of the info to display.
  * @param   a_pszArgs   Arguments to the info handler.
+ *
+ * @remarks Use DBGFR3_INFO_LOG where ever possible!
  */
 #ifdef LOG_ENABLED
-# define DBGFR3_INFO_LOG(a_pVM, a_pszName, a_pszArgs) \
+# define DBGFR3_INFO_LOG_SAFE(a_pVM, a_pszName, a_pszArgs) \
     do { \
         if (LogIsEnabled()) \
@@ -978 +1003 @@
     } while (0)
 #else
-# define DBGFR3_INFO_LOG(a_pVM, a_pszName, a_pszArgs) do { } while (0)
+# define DBGFR3_INFO_LOG_SAFE(a_pVM, a_pszName, a_pszArgs) do { } while (0)
 #endif
 

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

@@ -2565 +2565 @@
     DBGFR3Info(pVM->pUVM, "cpuid", "verbose", DBGFR3InfoLogRelHlp());
     LogRel(("\n"));
-    DBGFR3_INFO_LOG(pVM, "cpuid", "verbose"); /* macro */
+    DBGFR3_INFO_LOG_SAFE(pVM, "cpuid", "verbose"); /* macro */
     RTLogRelSetBuffering(fOldBuffered);
     LogRel(("******************** End of CPUID dump **********************\n"));

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

@@ -185 +185 @@
     if (pszPrefix)
     {
-        DBGFR3_INFO_LOG(pVM, "cpumguest", pszPrefix);
+        DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", pszPrefix);
         DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, pszPrefix);
     }

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

@@ -281 +281 @@
     if (pszPrefix)
     {
-        DBGFR3_INFO_LOG(pVM, "cpumguest", pszPrefix);
+        DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", pszPrefix);
         DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, pszPrefix);
     }
@@ -580 +580 @@
 
 #ifdef LOG_ENABLED
-    DBGFR3_INFO_LOG(pVM, "cpumguest", "Guest trap");
+    DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", "Guest trap");
     DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Guest trap");
 
@@ -716 +716 @@
     {
 #ifdef LOG_ENABLED
-        DBGFR3_INFO_LOG(pVM, "cpumguest", "Trap in patch code");
+        DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", "Trap in patch code");
         DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Patch code");
 
@@ -870 +870 @@
         {
 #ifdef LOG_ENABLED
-            DBGFR3_INFO_LOG(pVM, "cpumguest", "PRIV");
+            DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", "PRIV");
 #endif
             AssertMsgFailed(("FATAL ERROR: executing random instruction inside generated patch jump %08x\n", pCtx->eip));
@@ -884 +884 @@
             {
 #ifdef LOG_ENABLED
-                DBGFR3_INFO_LOG(pVM, "cpumguest", "PRIV");
+                DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", "PRIV");
 #endif
                 DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Patched privileged instruction");
@@ -895 +895 @@
     if (!PATMIsPatchGCAddr(pVM, pCtx->eip))
     {
-        DBGFR3_INFO_LOG(pVM, "cpumguest", "PRIV");
+        DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", "PRIV");
         DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Privileged instr");
     }
@@ -1035 +1035 @@
                     if (PATMIsPatchGCAddr(pVM, pCtx->eip))
                     {
-                        DBGFR3_INFO_LOG(pVM, "cpumguest", "PRIV");
+                        DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", "PRIV");
                         DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Privileged instr");
                     }

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

@@ -2603 +2603 @@
 
 #ifdef DEBUG
-    DBGFR3_INFO_LOG(pVM, "mappings", NULL);
-    DBGFR3_INFO_LOG(pVM, "handlers", "all nostat");
+    DBGFR3_INFO_LOG_SAFE(pVM, "mappings", NULL);
+    DBGFR3_INFO_LOG_SAFE(pVM, "handlers", "all nostat");
 #endif
 

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

@@ -1505 +1505 @@
 
 # ifdef LOG_ENABLED
-        DBGFR3_INFO_LOG(pVM, "cpumguest", "TRPMInject");
+        DBGFR3_INFO_LOG(pVM, pVCpu, "cpumguest", "TRPMInject");
         DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "TRPMInject");
 # endif

trunk/src/recompiler/VBoxRecompiler.c

@@ -4081 +4081 @@
      */
     if (fLog2)
-        DBGFR3_INFO_LOG(pVM, "cpumguest", pszPrefix);
+        DBGFR3_INFO_LOG(pVM, env->pVCpu, "cpumguest", pszPrefix);
 
     /*