Changeset 91813 in vbox

Timestamp:

Oct 18, 2021 9:45:16 AM (3 years ago)

Author:

vboxsync

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

147599

Message:

VMM/PDMCritSectRw: Don't preempt while on custom stack. [build fix] bugref:10124

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp (modified) (8 diffs)

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

@@ -548 +548 @@
  * @param   fNoVal      No validation records.
  */
-#ifndef VMM_R0_SWITCH_STACK
+#if !defined(VMM_R0_SWITCH_STACK) || !defined(IN_RING0)
 static int pdmCritSectRwEnterShared(PVMCC pVM, PPDMCRITSECTRW pThis, int rcBusy, bool fTryOnly,
                                     PCRTLOCKVALSRCPOS pSrcPos, bool fNoVal)
@@ -735 +735 @@
     /* not reached */
 }
-#ifdef VMM_R0_SWITCH_STACK
+#if defined(VMM_R0_SWITCH_STACK) && defined(IN_RING0)
 decltype(StkBack_pdmCritSectRwEnterShared) pdmCritSectRwEnterShared;
 #endif
@@ -892 +892 @@
  *          PDMCritSectRwLeaveExcl, RTCritSectRwLeaveShared.
  */
-#ifndef VMM_R0_SWITCH_STACK
+#if !defined(VMM_R0_SWITCH_STACK) || !defined(IN_RING0)
 static int pdmCritSectRwLeaveSharedWorker(PVMCC pVM, PPDMCRITSECTRW pThis, bool fNoVal)
 #else
@@ -1051 +1051 @@
     return VINF_SUCCESS;
 }
-#ifdef VMM_R0_SWITCH_STACK
+#if defined(VMM_R0_SWITCH_STACK) && defined(IN_RING0)
 decltype(StkBack_pdmCritSectRwLeaveSharedWorker) pdmCritSectRwLeaveSharedWorker;
 #endif
@@ -1317 +1317 @@
  * @param   fNoVal      No validation records.
  */
-#ifndef VMM_R0_SWITCH_STACK
+#if !defined(VMM_R0_SWITCH_STACK) || !defined(IN_RING0)
 static int pdmCritSectRwEnterExcl(PVMCC pVM, PPDMCRITSECTRW pThis, int rcBusy, bool fTryOnly,
                                   PCRTLOCKVALSRCPOS pSrcPos, bool fNoVal)
@@ -1536 +1536 @@
 #endif
 }
-#ifdef VMM_R0_SWITCH_STACK
+#if defined(VMM_R0_SWITCH_STACK) && defined(IN_RING0)
 decltype(StkBack_pdmCritSectRwEnterExcl) pdmCritSectRwEnterExcl;
 #endif
@@ -1693 +1693 @@
  * @sa      PDMCritSectRwLeaveShared, RTCritSectRwLeaveExcl.
  */
-#ifndef VMM_R0_SWITCH_STACK
+#if !defined(VMM_R0_SWITCH_STACK) || !defined(IN_RING0)
 static int pdmCritSectRwLeaveExclWorker(PVMCC pVM, PPDMCRITSECTRW pThis, bool fNoVal)
 #else
@@ -1931 +1931 @@
 #endif
 }
-#ifdef VMM_R0_SWITCH_STACK
+#if defined(VMM_R0_SWITCH_STACK) && defined(IN_RING0)
 decltype(StkBack_pdmCritSectRwLeaveExclWorker) pdmCritSectRwLeaveExclWorker;
 #endif