Changeset 91812 in vbox for trunk

Timestamp:

Oct 18, 2021 9:43:28 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PDMCritSectRw: Don't preempt while on custom stack. bugref:10124

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAllCritSectRw.cpp (modified) (8 diffs)
• VMMR0/VMMR0StackBack-darwin.asm (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp

@@ -548 +548 @@
  * @param   fNoVal      No validation records.
  */
+#ifndef VMM_R0_SWITCH_STACK
 static int pdmCritSectRwEnterShared(PVMCC pVM, PPDMCRITSECTRW pThis, int rcBusy, bool fTryOnly,
                                     PCRTLOCKVALSRCPOS pSrcPos, bool fNoVal)
+#else
+DECLASM(int) StkBack_pdmCritSectRwEnterShared(PVMCC pVM, PPDMCRITSECTRW pThis, int rcBusy, bool fTryOnly,
+                                              PCRTLOCKVALSRCPOS pSrcPos, bool fNoVal)
+#endif
 {
     /*
@@ -730 +735 @@
     /* not reached */
 }
+#ifdef VMM_R0_SWITCH_STACK
+decltype(StkBack_pdmCritSectRwEnterShared) pdmCritSectRwEnterShared;
+#endif
 
 
@@ -884 +892 @@
  *          PDMCritSectRwLeaveExcl, RTCritSectRwLeaveShared.
  */
+#ifndef VMM_R0_SWITCH_STACK
 static int pdmCritSectRwLeaveSharedWorker(PVMCC pVM, PPDMCRITSECTRW pThis, bool fNoVal)
+#else
+DECLASM(int) StkBack_pdmCritSectRwLeaveSharedWorker(PVMCC pVM, PPDMCRITSECTRW pThis, bool fNoVal)
+#endif
 {
     /*
@@ -1039 +1051 @@
     return VINF_SUCCESS;
 }
+#ifdef VMM_R0_SWITCH_STACK
+decltype(StkBack_pdmCritSectRwLeaveSharedWorker) pdmCritSectRwLeaveSharedWorker;
+#endif
 
 
@@ -1302 +1317 @@
  * @param   fNoVal      No validation records.
  */
+#ifndef VMM_R0_SWITCH_STACK
 static int pdmCritSectRwEnterExcl(PVMCC pVM, PPDMCRITSECTRW pThis, int rcBusy, bool fTryOnly,
                                   PCRTLOCKVALSRCPOS pSrcPos, bool fNoVal)
+#else
+DECLASM(int) StkBack_pdmCritSectRwEnterExcl(PVMCC pVM, PPDMCRITSECTRW pThis, int rcBusy, bool fTryOnly,
+                                            PCRTLOCKVALSRCPOS pSrcPos, bool fNoVal)
+#endif
 {
     /*
@@ -1516 +1536 @@
 #endif
 }
+#ifdef VMM_R0_SWITCH_STACK
+decltype(StkBack_pdmCritSectRwEnterExcl) pdmCritSectRwEnterExcl;
+#endif
 
 
@@ -1670 +1693 @@
  * @sa      PDMCritSectRwLeaveShared, RTCritSectRwLeaveExcl.
  */
+#ifndef VMM_R0_SWITCH_STACK
 static int pdmCritSectRwLeaveExclWorker(PVMCC pVM, PPDMCRITSECTRW pThis, bool fNoVal)
+#else
+DECLASM(int) StkBack_pdmCritSectRwLeaveExclWorker(PVMCC pVM, PPDMCRITSECTRW pThis, bool fNoVal)
+#endif
 {
     /*
@@ -1904 +1931 @@
 #endif
 }
+#ifdef VMM_R0_SWITCH_STACK
+decltype(StkBack_pdmCritSectRwLeaveExclWorker) pdmCritSectRwLeaveExclWorker;
+#endif
 
 

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

@@ -27 +27 @@
 SUPR0StackWrapperGeneric pdmR0CritSectEnterContendedOnKrnlStk, 6
 SUPR0StackWrapperGeneric pdmR0CritSectLeaveSignallingOnKrnlStk, 5
+SUPR0StackWrapperGeneric pdmCritSectRwEnterShared, 6
+SUPR0StackWrapperGeneric pdmCritSectRwLeaveSharedWorker, 3
+SUPR0StackWrapperGeneric pdmCritSectRwEnterExcl, 6
+SUPR0StackWrapperGeneric pdmCritSectRwLeaveExclWorker, 6