Changeset 53795 in vbox

Timestamp:

Jan 14, 2015 9:36:47 AM (10 years ago)

Author:

vboxsync

Message:

Added an official way of implementing a HLT/MWAIT like port on a device (for use with VMSVGA).

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (1 diff)
• include/VBox/vmm/vmapi.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/VMEmt.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/vm.h

@@ -695 +695 @@
 #else
 # define VMCPU_ASSERT_EMT_RETURN(pVCpu, rc) \
-    AssertMsg(VMCPU_IS_EMT(pVCpu), \
-              ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd idCpu=%#x\n", \
-               RTThreadNativeSelf(), (pVCpu)->hNativeThread, (pVCpu)->idCpu), \
-              (rc))
+    AssertMsgReturn(VMCPU_IS_EMT(pVCpu), \
+                    ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd idCpu=%#x\n", \
+                     RTThreadNativeSelf(), (pVCpu)->hNativeThread, (pVCpu)->idCpu), \
+                    (rc))
 #endif
 

trunk/include/VBox/vmm/vmapi.h

@@ -472 +472 @@
 VMMR3_INT_DECL(void)        VMR3NotifyGlobalFFU(PUVM pUVM, uint32_t fFlags);
 VMMR3_INT_DECL(void)        VMR3NotifyCpuFFU(PUVMCPU pUVMCpu, uint32_t fFlags);
+VMMR3DECL(int)              VMR3NotifyCpuDeviceReady(PVM pVM, VMCPUID idCpu);
 VMMR3_INT_DECL(int)         VMR3WaitHalted(PVM pVM, PVMCPU pVCpu, bool fIgnoreInterrupts);
 VMMR3_INT_DECL(int)         VMR3WaitU(PUVMCPU pUVMCpu);
+VMMR3DECL(int)              VMR3WaitForDeviceReady(PVM pVM, VMCPUID idCpu);
 VMMR3_INT_DECL(int)         VMR3AsyncPdmNotificationWaitU(PUVMCPU pUVCpu);
 VMMR3_INT_DECL(void)        VMR3AsyncPdmNotificationWakeupU(PUVM pUVM);

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

@@ -1023 +1023 @@
  * sure EMT wakes up and promptly service an FF request.
  *
- * @param   pUVM            Pointer to the user mode VM structure.
+ * @param   pUVCpu          Pointer to the user mode per CPU VM structure.
  * @param   fFlags          Notification flags, VMNOTIFYFF_FLAGS_*.
  * @internal
@@ -1046 +1046 @@
  * @param   fIgnoreInterrupts   If set the VM_FF_INTERRUPT flags is ignored.
  * @thread  The emulation thread.
+ * @remarks Made visible for implementing vmsvga sync register.
  * @internal
  */
@@ -1296 +1297 @@
 }
 
+
+/**
+ * Special interface for implementing a HLT-like port on a device.
+ *
+ * This can be called directly from device code, provide the device is trusted
+ * to access the VMM directly.  Since we may not have an accurate register set
+ * and the caller certainly shouldn't (device code does not access CPU
+ * registers), this function will return when interrupts are pending regardless
+ * of the actual EFLAGS.IF state.
+ *
+ * @returns VBox error status (never informational statuses).
+ * @param   pVM                 The VM handle.
+ * @param   idCpu               The id of the calling EMT.
+ */
+VMMR3DECL(int) VMR3WaitForDeviceReady(PVM pVM, VMCPUID idCpu)
+{
+    /*
+     * Validate caller and resolve the CPU ID.
+     */
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    AssertReturn(idCpu < pVM->cCpus, VERR_INVALID_CPU_ID);
+    PVMCPU pVCpu = &pVM->aCpus[idCpu];
+    VMCPU_ASSERT_EMT_RETURN(pVCpu, VERR_VM_THREAD_NOT_EMT);
+
+    /*
+     * Tag along with the HLT mechanics for now.
+     */
+    int rc = VMR3WaitHalted(pVM, pVCpu, false /*fIgnoreInterrupts*/);
+    if (RT_SUCCESS(rc))
+        return VINF_SUCCESS;
+    return rc;
+}
+
+
+/**
+ * Wakes up a CPU that has called VMR3WaitForDeviceReady.
+ *
+ * @returns VBox error status (never informational statuses).
+ * @param   pVM                 The VM handle.
+ * @param   idCpu               The id of the calling EMT.
+ */
+VMMR3DECL(int) VMR3NotifyCpuDeviceReady(PVM pVM, VMCPUID idCpu)
+{
+    /*
+     * Validate caller and resolve the CPU ID.
+     */
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    AssertReturn(idCpu < pVM->cCpus, VERR_INVALID_CPU_ID);
+    PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+    /*
+     * Pretend it was an FF that got set since we've got logic for that already.
+     */
+    VMR3NotifyCpuFFU(pVCpu->pUVCpu, VMNOTIFYFF_FLAGS_DONE_REM);
+    return VINF_SUCCESS;
+}
+