Changeset 88567 in vbox

Timestamp:

Apr 16, 2021 2:58:29 PM (3 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Added pdmIsLockOwner function to IOMMU helper.

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (6 diffs)
• src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -1510 +1510 @@
     DECLR0CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
 
+    /**
+     * Check whether the threads owns the PDM lock.
+     *
+     * @returns @c true if the PDM lock is owned, @c false otherwise.
+     * @param   pDevIns         The PCI device instance.
+     */
+    DECLR0CALLBACKMEMBER(bool,  pfnLockIsOwner,(PPDMDEVINS pDevIns));
+
     /** Just a safety precaution. */
     uint32_t                u32TheEnd;
@@ -1519 +1527 @@
 
 /** Current PDMIOMMUHLPR0 version number. */
-#define PDM_IOMMUHLPR0_VERSION                      PDM_VERSION_MAKE(0xff13, 2, 0)
+#define PDM_IOMMUHLPR0_VERSION                      PDM_VERSION_MAKE(0xff13, 3, 0)
 
 
@@ -1546 +1554 @@
      */
     DECLRCCALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
+
+    /**
+     * Check whether the threads owns the PDM lock.
+     *
+     * @returns @c true if the PDM lock is owned, @c false otherwise.
+     * @param   pDevIns         The PCI device instance.
+     */
+    DECLRCCALLBACKMEMBER(bool,  pfnLockIsOwner,(PPDMDEVINS pDevIns));
 
     /** Just a safety precaution. */
@@ -1556 +1572 @@
 
 /** Current PDMIOMMUHLPRC version number. */
-#define PDM_IOMMUHLPRC_VERSION                      PDM_VERSION_MAKE(0xff14, 2, 0)
+#define PDM_IOMMUHLPRC_VERSION                      PDM_VERSION_MAKE(0xff14, 3, 0)
 
 
@@ -1583 +1599 @@
      */
     DECLR3CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
+
+    /**
+     * Check whether the threads owns the PDM lock.
+     *
+     * @returns @c true if the PDM lock is owned, @c false otherwise.
+     * @param   pDevIns         The PCI device instance.
+     */
+    DECLR3CALLBACKMEMBER(bool,  pfnLockIsOwner,(PPDMDEVINS pDevIns));
 
     /** Just a safety precaution. */
@@ -1593 +1617 @@
 
 /** Current PDMIOMMUHLPR3 version number. */
-#define PDM_IOMMUHLPR3_VERSION                      PDM_VERSION_MAKE(0xff15, 2, 0)
+#define PDM_IOMMUHLPR3_VERSION                      PDM_VERSION_MAKE(0xff15, 3, 0)
 
 

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

@@ -1689 +1689 @@
 
 
+/** @interface_method_impl{PDMIOMMUHLPR0,pfnLock} */
+static DECLCALLBACK(bool) pdmR0IommuHlp_LockIsOwner(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    return pdmLockIsOwner(pDevIns->Internal.s.pGVM);
+}
+
+
 /**
  * The Ring-0 IOMMU Helper Callbacks.
@@ -1697 +1705 @@
     pdmR0IommuHlp_Lock,
     pdmR0IommuHlp_Unlock,
+    pdmR0IommuHlp_LockIsOwner,
     PDM_IOMMUHLPR0_VERSION, /* the end */
 };

trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp

@@ -282 +282 @@
 
 
+/** @interface_method_impl{PDMIOMMUHLPR3,pfnLockIsOwner} */
+static DECLCALLBACK(bool) pdmR3IommuHlp_LockIsOwner(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlowFunc(("caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
+    return pdmLockIsOwner(pDevIns->Internal.s.pVMR3);
+}
+
+
 /**
  * IOMMU Device Helpers.
@@ -290 +299 @@
     pdmR3IommuHlp_Lock,
     pdmR3IommuHlp_Unlock,
+    pdmR3IommuHlp_LockIsOwner,
     PDM_IOMMUHLPR3_VERSION /* the end */
 };