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

Timestamp:

May 7, 2009 9:03:15 AM (16 years ago)

Author:

vboxsync

Message:

VMM: better SIPI sending, reschedule to R3 as needed

Location:

trunk/src/VBox/VMM

Files:

• PDMDevMiscHlp.cpp (modified) (1 diff)
• VMMAll/VMMAll.cpp (modified) (2 diffs)
• VMMGC/PDMGCDevice.cpp (modified) (3 diffs)
• VMMR0/PDMR0Device.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PDMDevMiscHlp.cpp

@@ -232 +232 @@
 
 /** @copydoc PDMAPICHLPR3::pfnSendSipi */
-static DECLCALLBACK(void) pdmR3ApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector) /** @todo why signed? */
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-
-    PVM pVM = pDevIns->Internal.s.pVMR3;
-    PVMCPU pCpu = VMMGetCpuById(pVM, idCpu);
-    CPUMSetGuestCS(pCpu, iVector * 0x100);
-    CPUMSetGuestEIP(pCpu, 0);
-    /** @todo: how do I unhalt VCPU?
-     *  bird: See VMMSendSipi. */
-
+static DECLCALLBACK(void) pdmR3ApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, uint32_t uVector)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
+    VMMR3SendSipi(pDevIns->Internal.s.pVMR3, idCpu, uVector);
 }
 

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

@@ -99 +99 @@
 # endif
 }
-#endif /* IN_RING3 */
-
 
 /**
@@ -108 +106 @@
  * @param   pVM         The VM to operate on.
  * @param   idCpu       Virtual CPU to perform SIPI on
- * @param   iVector     SIPI vector
- */
-VMMDECL(void) VMMSendSipi(PVM pVM, VMCPUID idCpu, int iVector) /** @todo why is iVector signed? */
+ * @param   uVector     SIPI vector
+ */
+VMMR3DECL(void) VMMR3SendSipi(PVM pVM, VMCPUID idCpu,  uint32_t uVector)
 {
     AssertReturnVoid(idCpu < pVM->cCPUs);
 
-#ifdef IN_RING3
     PVMREQ pReq;
     int rc = VMR3ReqCallU(pVM->pUVM, idCpu, &pReq, RT_INDEFINITE_WAIT, 0,
-                          (PFNRT)vmmR3SendSipi, 3, pVM, idCpu, (uint32_t)iVector);
+                          (PFNRT)vmmR3SendSipi, 3, pVM, idCpu, uVector);
     AssertRC(rc);
     VMR3ReqFree(pReq);
-#else
-    AssertMsgFailed(("has to be done in ring-3, fix the code.\n"));
-#endif
-}
+}
+#endif /* IN_RING3 */
 
 

trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp

@@ -92 +92 @@
 static DECLCALLBACK(void) pdmRCApicHlp_Unlock(PPDMDEVINS pDevIns);
 static DECLCALLBACK(VMCPUID) pdmRCApicHlp_GetCpuId(PPDMDEVINS pDevIns);
-static DECLCALLBACK(void) pdmRCApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector);
 /** @} */
 
@@ -168 +167 @@
     pdmRCApicHlp_Unlock,
     pdmRCApicHlp_GetCpuId,
-    pdmRCApicHlp_SendSipi,
     PDM_APICHLPRC_VERSION
 };
@@ -490 +488 @@
     return VMMGetCpuId(pDevIns->Internal.s.pVMRC);
 }
-
-
-/** @copydoc PDMAPICHLPRC::pfnSendSipi */
-static DECLCALLBACK(void) pdmRCApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector)
-{
-    /* we shall never send a SIPI in raw mode */
-    AssertFailed();
-}
-
-
-
 
 /** @copydoc PDMIOAPICHLPRC::pfnApicBusDeliver */

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

@@ -94 +94 @@
 static DECLCALLBACK(void) pdmR0ApicHlp_Unlock(PPDMDEVINS pDevIns);
 static DECLCALLBACK(VMCPUID) pdmR0ApicHlp_GetCpuId(PPDMDEVINS pDevIns);
-static DECLCALLBACK(void) pdmR0ApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector);
 /** @} */
 
@@ -171 +170 @@
     pdmR0ApicHlp_Unlock,
     pdmR0ApicHlp_GetCpuId,
-    pdmR0ApicHlp_SendSipi,
     PDM_APICHLPR0_VERSION
 };
@@ -504 +502 @@
     return VMMGetCpuId(pDevIns->Internal.s.pVMR0);
 }
-
-
-/** @copydoc PDMAPICHLPR0::pfnSendSipi */
-static DECLCALLBACK(void) pdmR0ApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    return VMMSendSipi(pDevIns->Internal.s.pVMR0, idCpu, iVector);
-}
-
-
-
-
 
 /** @copydoc PDMIOAPICHLPR0::pfnApicBusDeliver */