Changeset 90897 in vbox

Timestamp:

Aug 25, 2021 8:00:41 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Initialize the ring-0 loggers as early as possible, so we can update their settings before doing vmmR0InitVM and similar where we'd like to have working log output. bugref:10086

Location:

trunk

Files:

• include/VBox/vmm/vmm.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (6 diffs)

trunk/include/VBox/vmm/vmm.h

@@ -521 +521 @@
 VMMR0DECL(int)       VMMR0EntryEx(PGVM pGVM, PVMCC pVM, VMCPUID idCpu, VMMR0OPERATION enmOperation,
                                   PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION);
-VMMR0_INT_DECL(void) VMMR0InitPerVMData(PGVM pGVM);
+VMMR0_INT_DECL(int)  VMMR0InitPerVMData(PGVM pGVM);
 VMMR0_INT_DECL(int)  VMMR0TermVM(PGVM pGVM, VMCPUID idCpu);
 VMMR0_INT_DECL(void) VMMR0CleanupVM(PGVM pGVM);

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

@@ -910 +910 @@
                         rc = GMMR0InitPerVMData(pGVM);
                         int rc2 = PGMR0InitPerVMData(pGVM);
-                        VMMR0InitPerVMData(pGVM);
+                        int rc3 = VMMR0InitPerVMData(pGVM);
                         DBGFR0InitPerVMData(pGVM);
                         PDMR0InitPerVMData(pGVM);
                         IOMR0InitPerVMData(pGVM);
                         TMR0InitPerVMData(pGVM);
-                        if (RT_SUCCESS(rc) && RT_SUCCESS(rc2))
+                        if (RT_SUCCESS(rc) && RT_SUCCESS(rc2) && RT_SUCCESS(rc3))
                         {
                             /*
@@ -1039 +1039 @@
                             }
                         }
-                        else if (RT_SUCCESS(rc))
-                            rc = rc2;
+                        else
+                        {
+                            if (RT_SUCCESS_NP(rc))
+                                rc = rc2;
+                            if (RT_SUCCESS_NP(rc))
+                                rc = rc3;
+                        }
                     }
                 }

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

@@ -364 +364 @@
 
 /**
- * Initializes VMM specific members when the GVM structure is created.
- *
- * @param   pGVM        The global (ring-0) VM structure.
- */
-VMMR0_INT_DECL(void) VMMR0InitPerVMData(PGVM pGVM)
-{
-    pGVM->vmmr0.s.hMemObjLogger         = NIL_RTR0MEMOBJ;
-    pGVM->vmmr0.s.hMapObjLogger         = NIL_RTR0MEMOBJ;
-    pGVM->vmmr0.s.hMemObjReleaseLogger  = NIL_RTR0MEMOBJ;
-    pGVM->vmmr0.s.hMapObjReleaseLogger  = NIL_RTR0MEMOBJ;
-    pGVM->vmmr0.s.fCalledInitVm         = false;
-
-    for (VMCPUID idCpu = 0; idCpu < pGVM->cCpus; idCpu++)
-    {
-        PGVMCPU pGVCpu = &pGVM->aCpus[idCpu];
-        Assert(pGVCpu->idHostCpu == NIL_RTCPUID);
-        Assert(pGVCpu->iHostCpuSet == UINT32_MAX);
-        pGVCpu->vmmr0.s.fInHmContext    = false;
-        pGVCpu->vmmr0.s.pPreemptState   = NULL;
-        pGVCpu->vmmr0.s.hCtxHook        = NIL_RTTHREADCTXHOOK;
-    }
-}
-
-
-/**
  * Helper for vmmR0InitLoggers
  */
 static int vmmR0InitLoggerOne(PGVMCPU pGVCpu, bool fRelease, PVMMR0PERVCPULOGGER pR0Log, PVMMR3CPULOGGER pShared,
-                              uint32_t cbBuf, char *pchBuf, RTR3PTR pchBufR3, uint64_t nsProgramStart)
+                              uint32_t cbBuf, char *pchBuf, RTR3PTR pchBufR3)
 {
     pR0Log->BufDesc.u32Magic    = RTLOGBUFFERDESC_MAGIC;
@@ -426 +401 @@
         {
             RTLogSetR0ThreadNameF(pLogger, "EMT-%u-R0", pGVCpu->idCpu);
-            RTLogSetR0ProgramStart(pLogger, nsProgramStart);
             return VINF_SUCCESS;
         }
@@ -461 +435 @@
                 PVMMR0PERVCPULOGGER pR0Log  = fRelease ? &pGVCpu->vmmr0.s.RelLogger : &pGVCpu->vmmr0.s.Logger;
                 PVMMR3CPULOGGER     pShared = fRelease ? &pGVCpu->vmm.s.RelLogger   : &pGVCpu->vmm.s.Logger;
-                rc = vmmR0InitLoggerOne(pGVCpu, fRelease, pR0Log, pShared, cbBuf, pchBuf + i * cbBuf, pchBufR3 + i * cbBuf,
-                                        pGVM->vmm.s.nsProgramStart);
+                rc = vmmR0InitLoggerOne(pGVCpu, fRelease, pR0Log, pShared, cbBuf, pchBuf + i * cbBuf, pchBufR3 + i * cbBuf);
                 if (RT_FAILURE(rc))
                 {
@@ -494 +467 @@
 
 /**
+ * Initializes VMM specific members when the GVM structure is created,
+ * allocating loggers and stuff.
+ *
+ * The loggers are allocated here so that we can update their settings before
+ * doing VMMR0_DO_VMMR0_INIT and have correct logging at that time.
+ *
+ * @returns VBox status code.
+ * @param   pGVM        The global (ring-0) VM structure.
+ */
+VMMR0_INT_DECL(int) VMMR0InitPerVMData(PGVM pGVM)
+{
+    /*
+     * Initialize all members first.
+     */
+    pGVM->vmmr0.s.hMemObjLogger         = NIL_RTR0MEMOBJ;
+    pGVM->vmmr0.s.hMapObjLogger         = NIL_RTR0MEMOBJ;
+    pGVM->vmmr0.s.hMemObjReleaseLogger  = NIL_RTR0MEMOBJ;
+    pGVM->vmmr0.s.hMapObjReleaseLogger  = NIL_RTR0MEMOBJ;
+    pGVM->vmmr0.s.fCalledInitVm         = false;
+
+    for (VMCPUID idCpu = 0; idCpu < pGVM->cCpus; idCpu++)
+    {
+        PGVMCPU pGVCpu = &pGVM->aCpus[idCpu];
+        Assert(pGVCpu->idHostCpu == NIL_RTCPUID);
+        Assert(pGVCpu->iHostCpuSet == UINT32_MAX);
+        pGVCpu->vmmr0.s.fInHmContext    = false;
+        pGVCpu->vmmr0.s.pPreemptState   = NULL;
+        pGVCpu->vmmr0.s.hCtxHook        = NIL_RTTHREADCTXHOOK;
+    }
+
+    /*
+     * Create the ring-0 release loggers.
+     */
+    int rc = vmmR0InitLoggers(pGVM, true /*fRelease*/, _8K,
+                              &pGVM->vmmr0.s.hMemObjReleaseLogger, &pGVM->vmmr0.s.hMapObjReleaseLogger);
+
+#ifdef LOG_ENABLED
+    /*
+     * Create debug loggers.
+     */
+    if (RT_SUCCESS(rc))
+        rc = vmmR0InitLoggers(pGVM, false /*fRelease*/, _64K, &pGVM->vmmr0.s.hMemObjLogger, &pGVM->vmmr0.s.hMapObjLogger);
+#endif
+
+    return rc;
+}
+
+
+/**
  * Initiates the R0 driver for a particular VM instance.
  *
@@ -534 +556 @@
         return VERR_ALREADY_INITIALIZED;
 
-    /*
-     * Create the ring-0 release loggers.
-     */
-    rc = vmmR0InitLoggers(pGVM, true /*fRelease*/, _8K, &pGVM->vmmr0.s.hMemObjReleaseLogger, &pGVM->vmmr0.s.hMapObjReleaseLogger);
-    if (RT_FAILURE(rc))
-        return rc;
-
 #ifdef LOG_ENABLED
-    /*
-     * Create debug loggers.
-     */
-    rc = vmmR0InitLoggers(pGVM, false /*fRelease*/, _64K, &pGVM->vmmr0.s.hMemObjLogger, &pGVM->vmmr0.s.hMapObjLogger);
-    if (RT_FAILURE(rc))
-        return rc;
 
     /*
@@ -2917 +2926 @@
         PRTLOGGER pLogger = fRelease ? pGVCpu->vmmr0.s.RelLogger.pLogger : pGVCpu->vmmr0.s.Logger.pLogger;
         if (pLogger)
+        {
+            RTLogSetR0ProgramStart(pLogger, pGVM->vmm.s.nsProgramStart);
             rc = RTLogBulkUpdate(pLogger, pReq->fFlags, pReq->uGroupCrc32, pReq->cGroups, pReq->afGroups);
+        }
     }