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

Timestamp:

Oct 18, 2021 9:29:56 AM (3 years ago)

Author:

vboxsync

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

147596

Message:

VMM/Logger: Make sure vmmR0LoggerFlushInner runs on the kernel stack. bugref:10124

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• VMMR0.cpp (modified) (2 diffs)
• VMMR0StackBack-darwin.asm (modified) (1 diff)

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

@@ -2953 +2953 @@
  * Inner worker for vmmR0LoggerFlushCommon.
  */
-static bool vmmR0LoggerFlushInner(PGVM pGVM, PGVMCPU pGVCpu, uint32_t idxLogger, size_t idxBuffer, uint32_t cbToFlush)
+#ifndef VMM_R0_SWITCH_STACK
+static bool   vmmR0LoggerFlushInner(PGVM pGVM, PGVMCPU pGVCpu, uint32_t idxLogger, size_t idxBuffer, uint32_t cbToFlush)
+#else
+DECLASM(bool) StkBack_vmmR0LoggerFlushInner(PGVM pGVM, PGVMCPU pGVCpu, uint32_t idxLogger, size_t idxBuffer, uint32_t cbToFlush)
+#endif
 {
     PVMMR0PERVCPULOGGER const pR0Log    = &pGVCpu->vmmr0.s.u.aLoggers[idxLogger];
@@ -3107 +3111 @@
     return fFlushedBuffer;
 }
+#ifdef VMM_R0_SWITCH_STACK
+decltype(StkBack_vmmR0LoggerFlushInner) vmmR0LoggerFlushInner;
+#endif
 
 

trunk/src/VBox/VMM/VMMR0/VMMR0StackBack-darwin.asm

@@ -24 +24 @@
 
 
+SUPR0StackWrapperGeneric vmmR0LoggerFlushInner, 5
 SUPR0StackWrapperGeneric pdmR0CritSectEnterContendedOnKrnlStk, 6
 SUPR0StackWrapperGeneric pdmR0CritSectLeaveSignallingOnKrnlStk, 5