Changeset 90448 in vbox

Timestamp:

Jul 31, 2021 12:54:54 AM (4 years ago)

Author:

vboxsync

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

146052

Message:

Dev*: Require ring-3 to check PDMDevHlpCritSectEnter return values too, just to not leave any ambiguity and form safe habits. bugref:6695

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (4 diffs)
• src/VBox/Devices/Audio/DevHda.cpp (modified) (1 diff)
• src/VBox/Devices/Bus/DevIommuAmd.cpp (modified) (2 diffs)
• src/VBox/Devices/Bus/DevIommuIntel.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmdev.h

@@ -7897 +7897 @@
  * @sa      PDMCritSectEnter
  */
-DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int)) PDMDevHlpCritSectEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy)
+DECLINLINE(DECL_CHECK_RETURN(int)) PDMDevHlpCritSectEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy)
 {
     return pDevIns->CTX_SUFF(pHlp)->pfnCritSectEnter(pDevIns, pCritSect, rcBusy);
@@ -7922 +7922 @@
  * @sa      PDMCritSectEnterDebug
  */
-DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int))
+DECLINLINE(DECL_CHECK_RETURN(int))
 PDMDevHlpCritSectEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {
@@ -7941 +7941 @@
  * @sa      PDMCritSectTryEnter
  */
-DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int))
+DECLINLINE(DECL_CHECK_RETURN(int))
 PDMDevHlpCritSectTryEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect)
 {
@@ -7964 +7964 @@
  * @sa      PDMCritSectTryEnterDebug
  */
-DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int))
+DECLINLINE(DECL_CHECK_RETURN(int))
 PDMDevHlpCritSectTryEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {

trunk/src/VBox/Devices/Audio/DevHda.cpp

@@ -4754 +4754 @@
 
     if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->CritSect))
-        (void)PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
+    {
+        int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
+        AssertRC(rc);
+    }
 
     PHDADRIVER pDrv;

trunk/src/VBox/Devices/Bus/DevIommuAmd.cpp

@@ -173 +173 @@
 
 /** Acquires the cache lock. */
-# ifdef IN_RING3
-#  define IOMMU_CACHE_LOCK(a_pDevIns, a_pThis)      PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSectCache, VERR_IGNORED)
-# else
-#  define IOMMU_CACHE_LOCK(a_pDevIns, a_pThis) \
+# define IOMMU_CACHE_LOCK(a_pDevIns, a_pThis) \
     do { \
         int const rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSectCache, VINF_SUCCESS); \
         PDM_CRITSECT_RELEASE_ASSERT_RC_DEV((a_pDevIns), &(a_pThis)->CritSectCache, rcLock); \
     } while (0)
-# endif
 
 /** Releases the cache lock.  */
@@ -198 +194 @@
 
 /** Acquires the PDM lock (can fail under extraordinary circumstance in in ring-0). */
-#ifdef IN_RING3
-# define IOMMU_LOCK(a_pDevIns, a_pThisCC)           (a_pThisCC)->CTX_SUFF(pIommuHlp)->pfnLock((a_pDevIns), VERR_IGNORED)
-#else
-# define IOMMU_LOCK(a_pDevIns, a_pThisCC) \
+#define IOMMU_LOCK(a_pDevIns, a_pThisCC) \
     do { \
         int const rcLock = (a_pThisCC)->CTX_SUFF(pIommuHlp)->pfnLock((a_pDevIns), VINF_SUCCESS); \
         PDM_CRITSECT_RELEASE_ASSERT_RC_DEV((a_pDevIns), NULL, rcLock); \
     } while (0)
-#endif
 
 /** Checks if the current thread owns the PDM lock. */

trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

@@ -67 +67 @@
 
 /** Acquires the DMAR lock (can fail under extraordinary circumstance in in ring-0). */
-#ifdef IN_RING3
-# define DMAR_LOCK(a_pDevIns, a_pThisCC)            (a_pThisCC)->CTX_SUFF(pIommuHlp)->pfnLock((a_pDevIns), VERR_IGNORED)
-#else
-# define DMAR_LOCK(a_pDevIns, a_pThisCC) \
+#define DMAR_LOCK(a_pDevIns, a_pThisCC) \
     do { \
         int const rcLock = (a_pThisCC)->CTX_SUFF(pIommuHlp)->pfnLock((a_pDevIns), VINF_SUCCESS); \
         PDM_CRITSECT_RELEASE_ASSERT_RC_DEV((a_pDevIns), NULL, rcLock); \
     } while (0)
-#endif
 
 /** Release the DMAR lock. */