Changeset 96925 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Sep 28, 2022 8:39:43 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153836

Message:

VMM,RuntimeR0: Flush the log buffer directly to the parent VMM if that's the only destination, and honor the unbuffered setting when that's the case. Setting VBOX_LOG_DEST='nofile vmm' & excluding 'buffered' from VBOX_LOG_FLAGS for the inner VBox instance will result in the logging to be intermixed w/o any buffering delays and no need to try correlate events between outer and inner vbox instances. bugref:10092

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (10 diffs)

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

@@ -100 +100 @@
 #endif
 RT_C_DECLS_END
-static int  vmmR0UpdateLoggers(PGVM pGVM, VMCPUID idCpu, PVMMR0UPDATELOGGERSREQ pReq, size_t idxLogger);
+static int  vmmR0UpdateLoggers(PGVM pGVM, VMCPUID idCpu, PVMMR0UPDATELOGGERSREQ pReq, uint64_t fFlags);
 static int  vmmR0LogFlusher(PGVM pGVM);
 static int  vmmR0LogWaitFlushed(PGVM pGVM, VMCPUID idCpu, size_t idxLogger);
@@ -1837 +1837 @@
             if (idCpu == NIL_VMCPUID)
                 return VERR_INVALID_CPU_ID;
-            if (u64Arg < VMMLOGGER_IDX_MAX  && pReqHdr != NULL)
-                rc = vmmR0UpdateLoggers(pGVM, idCpu /*idCpu*/, (PVMMR0UPDATELOGGERSREQ)pReqHdr, (size_t)u64Arg);
+            if (!(u64Arg & ~VMMR0UPDATELOGGER_F_VALID_MASK) && pReqHdr != NULL)
+                rc = vmmR0UpdateLoggers(pGVM, idCpu /*idCpu*/, (PVMMR0UPDATELOGGERSREQ)pReqHdr, u64Arg);
             else
                 return VERR_INVALID_PARAMETER;
@@ -2738 +2738 @@
  * @param   idCpu           The ID of the calling EMT.
  * @param   pReq            The request data.
- * @param   idxLogger       Which logger set to update.
+ * @param   fFlags          Flags, see VMMR0UPDATELOGGER_F_XXX.
  * @thread  EMT(idCpu)
  */
-static int vmmR0UpdateLoggers(PGVM pGVM, VMCPUID idCpu, PVMMR0UPDATELOGGERSREQ pReq, size_t idxLogger)
+static int vmmR0UpdateLoggers(PGVM pGVM, VMCPUID idCpu, PVMMR0UPDATELOGGERSREQ pReq, uint64_t fFlags)
 {
     /*
@@ -2753 +2753 @@
     AssertReturn(pReq->Hdr.cbReq == RT_UOFFSETOF_DYN(VMMR0UPDATELOGGERSREQ, afGroups[pReq->cGroups]), VERR_INVALID_PARAMETER);
 
+    size_t const idxLogger = (size_t)(fFlags & VMMR0UPDATELOGGER_F_LOGGER_MASK);
     AssertReturn(idxLogger < VMMLOGGER_IDX_MAX, VERR_OUT_OF_RANGE);
 
@@ -2758 +2759 @@
      * Adjust flags.
      */
-    /* Always buffered: */
-    pReq->fFlags |= RTLOGFLAGS_BUFFERED;
+    /* Always buffered, unless logging directly to parent VMM: */
+    if (!(fFlags & (VMMR0UPDATELOGGER_F_TO_PARENT_VMM_DBG | VMMR0UPDATELOGGER_F_TO_PARENT_VMM_REL)))
+        pReq->fFlags |= RTLOGFLAGS_BUFFERED;
     /* These doesn't make sense at present: */
     pReq->fFlags &= ~(RTLOGFLAGS_FLUSH | RTLOGFLAGS_WRITE_THROUGH);
@@ -2775 +2777 @@
         if (pLogger)
         {
+            pGVCpu->vmmr0.s.u.aLoggers[idxLogger].fFlushToParentVmmDbg = RT_BOOL(fFlags & VMMR0UPDATELOGGER_F_TO_PARENT_VMM_DBG);
+            pGVCpu->vmmr0.s.u.aLoggers[idxLogger].fFlushToParentVmmRel = RT_BOOL(fFlags & VMMR0UPDATELOGGER_F_TO_PARENT_VMM_REL);
+
             RTLogSetR0ProgramStart(pLogger, pGVM->vmm.s.nsProgramStart);
             rc = RTLogBulkUpdate(pLogger, pReq->fFlags, pReq->uGroupCrc32, pReq->cGroups, pReq->afGroups);
@@ -2998 +3003 @@
 
 /**
- * Inner worker for vmmR0LoggerFlushCommon.
- */
-static bool   vmmR0LoggerFlushInner(PGVM pGVM, PGVMCPU pGVCpu, uint32_t idxLogger, size_t idxBuffer, uint32_t cbToFlush)
+ * Inner worker for vmmR0LoggerFlushCommon for flushing to ring-3.
+ */
+static bool   vmmR0LoggerFlushInnerToRing3(PGVM pGVM, PGVMCPU pGVCpu, uint32_t idxLogger, size_t idxBuffer, uint32_t cbToFlush)
 {
     PVMMR0PERVCPULOGGER const pR0Log    = &pGVCpu->vmmr0.s.u.aLoggers[idxLogger];
@@ -3048 +3053 @@
     if (enmAction != kJustSignal)
     {
-        int rc = VMMR0EmtPrepareToBlock(pGVCpu, VINF_SUCCESS, "vmmR0LoggerFlushInner", pR0Log->hEventFlushWait, &Ctx);
+        int rc = VMMR0EmtPrepareToBlock(pGVCpu, VINF_SUCCESS, "vmmR0LoggerFlushInnerToRing3", pR0Log->hEventFlushWait, &Ctx);
         if (RT_SUCCESS(rc))
         { /* likely */ }
@@ -3154 +3159 @@
     return fFlushedBuffer;
 }
+
+
+/**
+ * Inner worker for vmmR0LoggerFlushCommon when only flushing to the parent
+ * VMM's logs.
+ */
+static bool vmmR0LoggerFlushInnerToParent(PGVM pGVM, PGVMCPU pGVCpu, PVMMR0PERVCPULOGGER pR0Log, PRTLOGBUFFERDESC pBufDesc)
+{
+    uint32_t const cbToFlush = pBufDesc->offBuf;
+    if (pR0Log->fFlushToParentVmmDbg)
+        RTLogWriteVmm(pBufDesc->pchBuf, cbToFlush, false /*fRelease*/);
+    if (pR0Log->fFlushToParentVmmRel)
+        RTLogWriteVmm(pBufDesc->pchBuf, cbToFlush, true /*fRelease*/);
+    return true;
+}
+
 
 
@@ -3192 +3213 @@
                         {
                             pR0Log->fFlushing = true;
-                            bool fFlushed = vmmR0LoggerFlushInner(pGVM, pGVCpu, idxLogger, idxBuffer, pBufDesc->offBuf);
+                            bool fFlushed;
+                            if (   !pR0Log->fFlushToParentVmmDbg
+                                && !pR0Log->fFlushToParentVmmRel)
+                                fFlushed = vmmR0LoggerFlushInnerToRing3(pGVM, pGVCpu, idxLogger, idxBuffer, pBufDesc->offBuf);
+                            else
+                                fFlushed = vmmR0LoggerFlushInnerToParent(pGVM, pGVCpu, pR0Log, pBufDesc);
                             pR0Log->fFlushing = false;
                             return fFlushed;