Changeset 89065 in vbox

Timestamp:

May 17, 2021 5:40:02 AM (4 years ago)

Author:

vboxsync

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

144405

Message:

Intel IOMMU: bugref:9967 Add pfnLockIsOwner for I/O APIC helper (for upcoming changes).

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (3 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

@@ -1511 +1511 @@
 
     /**
-     * Check whether the threads owns the PDM lock.
+     * Check whether the calling thread owns the PDM lock.
      *
      * @returns @c true if the PDM lock is owned, @c false otherwise.
@@ -1935 +1935 @@
 
     /**
+     * Checks if the calling thread owns the PDM lock.
+     *
+     * @param   pDevIns         The IOAPIC device instance.
+     */
+    DECLCALLBACKMEMBER(bool, pfnIsLockOwner,(PPDMDEVINS pDevIns));
+
+    /**
      * Private interface between the IOAPIC and IOMMU.
      *
@@ -1955 +1962 @@
 
 /** Current PDMIOAPICHLP version number. */
-#define PDM_IOAPICHLP_VERSION                   PDM_VERSION_MAKE(0xfff0, 2, 1)
+#define PDM_IOAPICHLP_VERSION                   PDM_VERSION_MAKE(0xfff0, 3, 1)
 
 

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

@@ -1529 +1529 @@
 
 
+/** @interface_method_impl{PDMIOAPICHLP,pfnUnlock} */
+static DECLCALLBACK(bool) pdmR0IoApicHlp_LockIsOwner(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    return pdmLockIsOwner(pDevIns->Internal.s.pGVM);
+}
+
+
 /** @interface_method_impl{PDMIOAPICHLP,pfnIommuMsiRemap} */
 static DECLCALLBACK(int) pdmR0IoApicHlp_IommuMsiRemap(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
@@ -1561 +1569 @@
     pdmR0IoApicHlp_Lock,
     pdmR0IoApicHlp_Unlock,
+    pdmR0IoApicHlp_LockIsOwner,
     pdmR0IoApicHlp_IommuMsiRemap,
     PDM_IOAPICHLP_VERSION

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

@@ -141 +141 @@
 
 
+/** @interface_method_impl{PDMIOAPICHLP,pfnLockIsOwner} */
+static DECLCALLBACK(bool) pdmR3IoApicHlp_LockIsOwner(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3IoApicHlp_LockIsOwner: caller='%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance));
+    return pdmLockIsOwner(pDevIns->Internal.s.pVMR3);
+}
+
+
 /** @interface_method_impl{PDMIOAPICHLP,pfnIommuMsiRemap} */
 static DECLCALLBACK(int) pdmR3IoApicHlp_IommuMsiRemap(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
@@ -167 +176 @@
     pdmR3IoApicHlp_Lock,
     pdmR3IoApicHlp_Unlock,
+    pdmR3IoApicHlp_LockIsOwner,
     pdmR3IoApicHlp_IommuMsiRemap,
     PDM_IOAPICHLP_VERSION /* the end */