Changeset 61685 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 13, 2016 4:04:42 PM (9 years ago)

Author:

vboxsync

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

108043

Message:

VMM: I/O APIC lockless implementation.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAll.cpp (modified) (2 diffs)
• VMMR0/PDMR0Device.cpp (modified) (5 diffs)
• VMMR3/PDMDevMiscHlp.cpp (modified) (3 diffs)
• VMMRC/PDMRCDevice.cpp (modified) (5 diffs)

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

@@ -194 +194 @@
     {
         Assert(pVM->pdm.s.IoApic.CTX_SUFF(pfnSetIrq));
+#ifdef VBOX_WITH_NEW_IOAPIC
+        pVM->pdm.s.IoApic.CTX_SUFF(pfnSetIrq)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Irq, u8Level, uTagSrc);
+#else
         pdmLock(pVM);
         pVM->pdm.s.IoApic.CTX_SUFF(pfnSetIrq)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Irq, u8Level, uTagSrc);
         pdmUnlock(pVM);
+#endif
         return VINF_SUCCESS;
     }
@@ -216 +220 @@
     {
         Assert(pVM->pdm.s.IoApic.CTX_SUFF(pfnSendMsi));
+#ifdef VBOX_WITH_NEW_IOAPIC
+        pVM->pdm.s.IoApic.CTX_SUFF(pfnSendMsi)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), GCAddr, uValue, uTagSrc);
+#else
         pdmLock(pVM);
         pVM->pdm.s.IoApic.CTX_SUFF(pfnSendMsi)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), GCAddr, uValue, uTagSrc);
         pdmUnlock(pVM);
+#endif
         return VINF_SUCCESS;
     }

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

@@ -618 +618 @@
     {
         Assert(pVM->pdm.s.IoApic.CTX_SUFF(pfnSetEoi));
-        pdmLock(pVM);
         pVM->pdm.s.IoApic.CTX_SUFF(pfnSetEoi)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Vector);
-        pdmUnlock(pVM);
     }
 #endif
@@ -743 +741 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
+#ifdef VBOX_WITH_NEW_IOAPIC
+    AssertFailed();
+#endif
     return pdmLockEx(pDevIns->Internal.s.pVMR0, rc);
 }
@@ -751 +752 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
+#ifdef VBOX_WITH_NEW_IOAPIC
+    AssertFailed();
+#endif
     pdmUnlock(pDevIns->Internal.s.pVMR0);
 }
@@ -798 +802 @@
     if (pVM->pdm.s.IoApic.pDevInsR0)
     {
+#ifdef VBOX_WITH_NEW_IOAPIC
+        pVM->pdm.s.IoApic.pfnSetIrqR0(pVM->pdm.s.IoApic.pDevInsR0, iIrq, iLevel, uTagSrc);
+#else
         pdmLock(pVM);
         pVM->pdm.s.IoApic.pfnSetIrqR0(pVM->pdm.s.IoApic.pDevInsR0, iIrq, iLevel, uTagSrc);
         pdmUnlock(pVM);
+#endif
     }
     else if (pVM->pdm.s.IoApic.pDevInsR3)
@@ -830 +838 @@
     if (pVM->pdm.s.IoApic.pDevInsR0)
     {
+#ifdef VBOX_WITH_NEW_IOAPIC
+        pVM->pdm.s.IoApic.pfnSendMsiR0(pVM->pdm.s.IoApic.pDevInsR0, GCPhys, uValue, uTagSrc);
+#else
         pdmLock(pVM);
         pVM->pdm.s.IoApic.pfnSendMsiR0(pVM->pdm.s.IoApic.pDevInsR0, GCPhys, uValue, uTagSrc);
         pdmUnlock(pVM);
+#endif
     }
     else
-    {
         AssertFatalMsgFailed(("Lazy bastards!"));
-    }
 }
 

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

@@ -281 +281 @@
     {
         Assert(pVM->pdm.s.IoApic.CTX_SUFF(pfnSetEoi));
-        pdmLock(pVM);
         pVM->pdm.s.IoApic.CTX_SUFF(pfnSetEoi)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Vector);
-        pdmUnlock(pVM);
-    }
-#endif
-}
-
+    }
+#endif
+}
 
 
@@ -495 +492 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     LogFlow(("pdmR3IoApicHlp_Lock: caller='%s'/%d: rc=%Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
+#ifdef VBOX_WITH_NEW_IOAPIC
+    AssertFailed();
+#endif
     return pdmLockEx(pDevIns->Internal.s.pVMR3, rc);
 }
@@ -504 +504 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     LogFlow(("pdmR3IoApicHlp_Unlock: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
+#ifdef VBOX_WITH_NEW_IOAPIC
+    AssertFailed();
+#endif
     pdmUnlock(pDevIns->Internal.s.pVMR3);
 }

trunk/src/VBox/VMM/VMMRC/PDMRCDevice.cpp

@@ -573 +573 @@
     {
         Assert(pVM->pdm.s.IoApic.CTX_SUFF(pfnSetEoi));
-        pdmLock(pVM);
         pVM->pdm.s.IoApic.CTX_SUFF(pfnSetEoi)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Vector);
-        pdmUnlock(pVM);
     }
 #endif
@@ -698 +696 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
+#ifdef VBOX_WITH_NEW_IOAPIC
+    AssertFailed();
+#endif
     return pdmLockEx(pDevIns->Internal.s.pVMRC, rc);
 }
@@ -706 +707 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
+#ifdef VBOX_WITH_NEW_IOAPIC
+    AssertFailed();
+#endif
     pdmUnlock(pDevIns->Internal.s.pVMRC);
 }
@@ -753 +757 @@
     if (pVM->pdm.s.IoApic.pDevInsRC)
     {
+#ifdef VBOX_WITH_NEW_IOAPIC
+        pVM->pdm.s.IoApic.pfnSetIrqRC(pVM->pdm.s.IoApic.pDevInsRC, iIrq, iLevel, uTagSrc);
+#else
         pdmLock(pVM);
         pVM->pdm.s.IoApic.pfnSetIrqRC(pVM->pdm.s.IoApic.pDevInsRC, iIrq, iLevel, uTagSrc);
         pdmUnlock(pVM);
+#endif
     }
     else if (pVM->pdm.s.IoApic.pDevInsR3)
@@ -786 +794 @@
     if (pVM->pdm.s.IoApic.pDevInsRC)
     {
+#ifdef VBOX_WITH_NEW_IOAPIC
+        pVM->pdm.s.IoApic.pfnSendMsiRC(pVM->pdm.s.IoApic.pDevInsRC, GCPhys, uValue, uTagSrc);
+#else
         pdmLock(pVM);
         pVM->pdm.s.IoApic.pfnSendMsiRC(pVM->pdm.s.IoApic.pDevInsRC, GCPhys, uValue, uTagSrc);
         pdmUnlock(pVM);
+#endif
     }
     else
-    {
         AssertFatalMsgFailed(("Lazy bastarts!"));
-    }
 }