Index: /trunk/include/VBox/pdmdev.h =================================================================== --- /trunk/include/VBox/pdmdev.h (revision 24739) +++ /trunk/include/VBox/pdmdev.h (revision 24740) @@ -2420,4 +2420,15 @@ DECLR3CALLBACKMEMBER(int, pfnSetAsyncNotification, (PPDMDEVINS pDevIns, PFNPDMDEVASYNCNOTIFY pfnAsyncNotify)); + /** + * Notify EMT(0) that the device has completed the asynchronous notification + * handling. + * + * This can be called at any time, spurious calls will simply be ignored. + * + * @param pDevIns The device instance. + * @thread Any + */ + DECLR3CALLBACKMEMBER(void, pfnAsyncNotificationCompleted, (PPDMDEVINS pDevIns)); + /** Space reserved for future members. * @{ */ @@ -3739,4 +3750,12 @@ /** + * @copydoc PDMDEVHLPR3::pfnAsyncNotificationCompleted + */ +DECLINLINE(void) PDMDevHlpAsyncNotificationCompleted(PPDMDEVINS pDevIns) +{ + pDevIns->pDevHlpR3->pfnAsyncNotificationCompleted(pDevIns); +} + +/** * @copydoc PDMDEVHLPR3::pfnVMState */ Index: /trunk/include/VBox/pdmdrv.h =================================================================== --- /trunk/include/VBox/pdmdrv.h (revision 24739) +++ /trunk/include/VBox/pdmdrv.h (revision 24740) @@ -711,4 +711,15 @@ /** + * Notify EMT(0) that the driver has completed the asynchronous notification + * handling. + * + * This can be called at any time, spurious calls will simply be ignored. + * + * @param pDrvIns The driver instance. + * @thread Any + */ + DECLR3CALLBACKMEMBER(void, pfnAsyncNotificationCompleted, (PPDMDRVINS pDrvIns)); + + /** * Creates a PDM thread. * @@ -1039,4 +1050,20 @@ /** + * @copydoc PDMDRVHLP::pfnSetAsyncNotification + */ +DECLINLINE(int) PDMDrvHlpSetAsyncNotification(PPDMDRVINS pDrvIns, PFNPDMDRVASYNCNOTIFY pfnAsyncNotify) +{ + return pDrvIns->pDrvHlp->pfnSetAsyncNotification(pDrvIns, pfnAsyncNotify); +} + +/** + * @copydoc PDMDRVHLP::pfnAsyncNotificationCompleted + */ +DECLINLINE(void) PDMDrvHlpAsyncNotificationCompleted(PPDMDRVINS pDrvIns) +{ + pDrvIns->pDrvHlp->pfnAsyncNotificationCompleted(pDrvIns); +} + +/** * @copydoc PDMDRVHLP::pfnPDMThreadCreate */ Index: /trunk/include/VBox/pdmusb.h =================================================================== --- /trunk/include/VBox/pdmusb.h (revision 24739) +++ /trunk/include/VBox/pdmusb.h (revision 24740) @@ -586,4 +586,15 @@ */ DECLR3CALLBACKMEMBER(int, pfnSetAsyncNotification, (PPDMUSBINS pUSbIns, PFNPDMUSBASYNCNOTIFY pfnAsyncNotify)); + + /** + * Notify EMT(0) that the device has completed the asynchronous notification + * handling. + * + * This can be called at any time, spurious calls will simply be ignored. + * + * @param pUSBIns The USB device instance. + * @thread Any + */ + DECLR3CALLBACKMEMBER(void, pfnAsyncNotificationCompleted, (PPDMUSBINS pUsbIns)); /** Just a safety precaution. */ @@ -728,4 +739,20 @@ } +/** + * @copydoc PDMUSBHLP::pfnSetAsyncNotification + */ +DECLINLINE(int) PDMUsbHlpSetAsyncNotification(PPDMUSBINS pUsbIns, PFNPDMUSBASYNCNOTIFY pfnAsyncNotify) +{ + return pUsbIns->pUsbHlp->pfnSetAsyncNotification(pUsbIns, pfnAsyncNotify); +} + +/** + * @copydoc PDMUSBHLP::pfnAsyncNotificationCompleted + */ +DECLINLINE(void) PDMUsbHlpAsyncNotificationCompleted(PPDMUSBINS pUsbIns) +{ + pUsbIns->pUsbHlp->pfnAsyncNotificationCompleted(pUsbIns); +} + #endif /* IN_RING3 */ Index: /trunk/include/VBox/vmapi.h =================================================================== --- /trunk/include/VBox/vmapi.h (revision 24739) +++ /trunk/include/VBox/vmapi.h (revision 24740) @@ -398,6 +398,8 @@ /** @} */ -VMMR3DECL(int) VMR3WaitHalted(PVM pVM, PVMCPU pVCpu, bool fIgnoreInterrupts); -VMMR3DECL(int) VMR3WaitU(PUVMCPU pUVMCpu); +VMMR3DECL(int) VMR3WaitHalted(PVM pVM, PVMCPU pVCpu, bool fIgnoreInterrupts); +VMMR3DECL(int) VMR3WaitU(PUVMCPU pUVMCpu); +VMMR3_INT_DECL(int) VMR3AsyncPdmNotificationWaitU(PUVMCPU pUVCpu); +VMMR3_INT_DECL(void) VMR3AsyncPdmNotificationWakeupU(PUVM pUVM); VMMR3DECL(RTCPUID) VMR3GetVMCPUId(PVM pVM); VMMR3DECL(RTTHREAD) VMR3GetVMCPUThread(PVM pVM); Index: /trunk/src/VBox/VMM/PDM.cpp =================================================================== --- /trunk/src/VBox/VMM/PDM.cpp (revision 24739) +++ /trunk/src/VBox/VMM/PDM.cpp (revision 24740) @@ -1135,4 +1135,7 @@ pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance)); pDrvIns->pDrvReg->pfnSuspend(pDrvIns); + if (pDrvIns->Internal.s.pfnAsyncNotify) + LogFlow(("PDMR3Suspend: Async notification started - driver '%s'/%d on LUN#%d of device '%s'/%d\n", + pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance)); } else if (pDrvIns->Internal.s.pfnAsyncNotify(pDrvIns)) @@ -1171,4 +1174,6 @@ LogFlow(("PDMR3Suspend: Notifying - device '%s'/%d\n", pUsbIns->pUsbReg->szDeviceName, pUsbIns->iInstance)); pUsbIns->pUsbReg->pfnVMSuspend(pUsbIns); + if (pUsbIns->Internal.s.pfnAsyncNotify) + LogFlow(("PDMR3Suspend: Async notification started - device '%s'/%d\n", pUsbIns->pUsbReg->szDeviceName, pUsbIns->iInstance)); } else if (pUsbIns->Internal.s.pfnAsyncNotify(pUsbIns)) @@ -1204,4 +1209,6 @@ LogFlow(("PDMR3Suspend: Notifying - device '%s'/%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance)); pDevIns->pDevReg->pfnSuspend(pDevIns); + if (pDevIns->Internal.s.pfnAsyncNotify) + LogFlow(("PDMR3Suspend: Async notification started - device '%s'/%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance)); } else if (pDevIns->Internal.s.pfnAsyncNotify(pDevIns)) @@ -1241,5 +1248,5 @@ */ unsigned cAsync; - for (;;) + for (unsigned iLoop = 0; ; iLoop++) { /* @@ -1293,6 +1300,10 @@ /** @todo This is utterly nuts and completely unsafe... will get back to it in a * bit I hope... */ - int rc = VMR3ReqProcessU(pVM->pUVM, VMCPUID_ANY); - AssertReleaseRC(rc == VINF_SUCCESS); + int rc = VMR3AsyncPdmNotificationWaitU(&pVM->pUVM->aCpus[0]); + AssertReleaseMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc)); + rc = VMR3ReqProcessU(pVM->pUVM, VMCPUID_ANY); + AssertReleaseMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc)); + rc = VMR3ReqProcessU(pVM->pUVM, 0/*idDstCpu*/); + AssertReleaseMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc)); } @@ -1456,4 +1467,7 @@ pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance)); pDrvIns->pDrvReg->pfnPowerOff(pDrvIns); + if (pDrvIns->Internal.s.pfnAsyncNotify) + LogFlow(("PDMR3PowerOff: Async notification started - driver '%s'/%d on LUN#%d of device '%s'/%d\n", + pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance)); } else if (pDrvIns->Internal.s.pfnAsyncNotify(pDrvIns)) @@ -1492,4 +1506,6 @@ LogFlow(("PDMR3PowerOff: Notifying - device '%s'/%d\n", pUsbIns->pUsbReg->szDeviceName, pUsbIns->iInstance)); pUsbIns->pUsbReg->pfnVMPowerOff(pUsbIns); + if (pUsbIns->Internal.s.pfnAsyncNotify) + LogFlow(("PDMR3PowerOff: Async notification started - device '%s'/%d\n", pUsbIns->pUsbReg->szDeviceName, pUsbIns->iInstance)); } else if (pUsbIns->Internal.s.pfnAsyncNotify(pUsbIns)) @@ -1525,4 +1541,6 @@ LogFlow(("PDMR3PowerOff: Notifying - device '%s'/%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance)); pDevIns->pDevReg->pfnPowerOff(pDevIns); + if (pDevIns->Internal.s.pfnAsyncNotify) + LogFlow(("PDMR3PowerOff: Async notification started - device '%s'/%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance)); } else if (pDevIns->Internal.s.pfnAsyncNotify(pDevIns)) @@ -1607,6 +1625,10 @@ /** @todo This is utterly nuts and completely unsafe... will get back to it in a * bit I hope... */ - int rc = VMR3ReqProcessU(pVM->pUVM, VMCPUID_ANY); - AssertReleaseRC(rc == VINF_SUCCESS); + int rc = VMR3AsyncPdmNotificationWaitU(&pVM->pUVM->aCpus[0]); + AssertReleaseMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc)); + rc = VMR3ReqProcessU(pVM->pUVM, VMCPUID_ANY); + AssertReleaseMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc)); + rc = VMR3ReqProcessU(pVM->pUVM, 0/*idDstCpu*/); + AssertReleaseMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc)); } Index: /trunk/src/VBox/VMM/PDMDevHlp.cpp =================================================================== --- /trunk/src/VBox/VMM/PDMDevHlp.cpp (revision 24739) +++ /trunk/src/VBox/VMM/PDMDevHlp.cpp (revision 24740) @@ -2335,5 +2335,5 @@ PDMDEV_ASSERT_DEVINS(pDevIns); VM_ASSERT_EMT0(pDevIns->Internal.s.pVMR3); - LogFlow(("pdmR3DevHlp_SetAsyncNotification: caller='%s'/%d: pfnAsyncNotify\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, pfnAsyncNotify)); + LogFlow(("pdmR3DevHlp_SetAsyncNotification: caller='%s'/%d: pfnAsyncNotify=%p\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, pfnAsyncNotify)); int rc = VINF_SUCCESS; @@ -2354,4 +2354,25 @@ LogFlow(("pdmR3DevHlp_SetAsyncNotification: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc)); return rc; +} + + +/** @copydoc PDMDEVHLPR3::pfnAsyncNotificationCompleted */ +static DECLCALLBACK(void) pdmR3DevHlp_AsyncNotificationCompleted(PPDMDEVINS pDevIns) +{ + PDMDEV_ASSERT_DEVINS(pDevIns); + PVM pVM = pDevIns->Internal.s.pVMR3; + + VMSTATE enmVMState = VMR3GetState(pVM); + if ( enmVMState == VMSTATE_SUSPENDING + || enmVMState == VMSTATE_SUSPENDING_EXT_LS + || enmVMState == VMSTATE_SUSPENDING_LS + || enmVMState == VMSTATE_POWERING_OFF + || enmVMState == VMSTATE_POWERING_OFF_LS) + { + LogFlow(("pdmR3DevHlp_AsyncNotificationCompleted: caller='%s'/%d:\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance)); + VMR3AsyncPdmNotificationWakeupU(pVM->pUVM); + } + else + LogFlow(("pdmR3DevHlp_AsyncNotificationCompleted: caller='%s'/%d: enmVMState=%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, enmVMState)); } @@ -2866,4 +2887,5 @@ pdmR3DevHlp_PhysGCPtr2GCPhys, pdmR3DevHlp_SetAsyncNotification, + pdmR3DevHlp_AsyncNotificationCompleted, 0, 0, @@ -3332,4 +3354,5 @@ pdmR3DevHlp_PhysGCPtr2GCPhys, pdmR3DevHlp_SetAsyncNotification, + pdmR3DevHlp_AsyncNotificationCompleted, 0, 0, Index: /trunk/src/VBox/VMM/PDMDriver.cpp =================================================================== --- /trunk/src/VBox/VMM/PDMDriver.cpp (revision 24739) +++ /trunk/src/VBox/VMM/PDMDriver.cpp (revision 24740) @@ -1046,4 +1046,25 @@ +/** @copydoc PDMDRVHLP::pfnAsyncNotificationCompleted */ +static DECLCALLBACK(void) pdmR3DrvHlp_AsyncNotificationCompleted(PPDMDRVINS pDrvIns) +{ + PDMDRV_ASSERT_DRVINS(pDrvIns); + PVM pVM = pDrvIns->Internal.s.pVM; + + VMSTATE enmVMState = VMR3GetState(pVM); + if ( enmVMState == VMSTATE_SUSPENDING + || enmVMState == VMSTATE_SUSPENDING_EXT_LS + || enmVMState == VMSTATE_SUSPENDING_LS + || enmVMState == VMSTATE_POWERING_OFF + || enmVMState == VMSTATE_POWERING_OFF_LS) + { + LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d:\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance)); + VMR3AsyncPdmNotificationWakeupU(pVM->pUVM); + } + else + LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d: enmVMState=%d\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, enmVMState)); +} + + /** @copydoc PDMDRVHLP::pfnPDMThreadCreate */ static DECLCALLBACK(int) pdmR3DrvHlp_PDMThreadCreate(PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread, @@ -1114,4 +1135,5 @@ pdmR3DrvHlp_USBRegisterHub, pdmR3DrvHlp_SetAsyncNotification, + pdmR3DrvHlp_AsyncNotificationCompleted, pdmR3DrvHlp_PDMThreadCreate, #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION Index: /trunk/src/VBox/VMM/VMEmt.cpp =================================================================== --- /trunk/src/VBox/VMM/VMEmt.cpp (revision 24739) +++ /trunk/src/VBox/VMM/VMEmt.cpp (revision 24740) @@ -1101,4 +1101,34 @@ /** + * Interface that PDMR3Suspend, PDMR3PowerOff and PDMR3Reset uses when they wait + * for the handling of asynchronous notifications to complete. + * + * @returns VINF_SUCCESS unless a fatal error occurred. In the latter + * case an appropriate status code is returned. + * @param pUVCpu Pointer to the user mode VMCPU structure. + * @thread The emulation thread. + */ +VMMR3_INT_DECL(int) VMR3AsyncPdmNotificationWaitU(PUVMCPU pUVCpu) +{ + LogFlow(("VMR3AsyncPdmNotificationWaitU:\n")); + return VMR3WaitU(pUVCpu); +} + + +/** + * Interface that PDM the helper asynchronous notification completed methods + * uses for EMT0 when it is waiting inside VMR3AsyncPdmNotificationWaitU(). + * + * @param pUVM Pointer to the user mode VM structure. + */ +VMMR3_INT_DECL(void) VMR3AsyncPdmNotificationWakeupU(PUVM pUVM) +{ + LogFlow(("VMR3AsyncPdmNotificationWakeupU:\n")); + VM_FF_SET(pUVM->pVM, VM_FF_REQUEST); /* this will have to do for now. */ + g_aHaltMethods[pUVM->vm.s.iHaltMethod].pfnNotifyCpuFF(&pUVM->aCpus[0], 0 /*fFlags*/); +} + + +/** * Rendezvous callback that will be called once. *