Changeset 21999 in vbox

Timestamp:

Aug 5, 2009 2:12:58 PM (15 years ago)

Author:

vboxsync

Message:

Deadlock prevention

File:

• trunk/src/VBox/VMM/HWACCM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1464 +1464 @@
  * @returns VBox status code.
  * @param   pVM         The VM to operate on.
+ * @param   idCpu       VCPU to execute hwaccmR3RemovePatches on
  * @param   pPatchMem   Patch memory range
  * @param   cbPatchMem  Size of the memory range
  */
-VMMR3DECL(int)  HWACMMR3EnablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem)
-{
-    Log(("HWACMMR3EnablePatching %RGv size %x\n", pPatchMem, cbPatchMem));
-
-    /* Current TPR patching only applies to AMD cpus.
-     * May need to be extended to Intel CPUs without the APIC TPR hardware optimization.
-     */
-    if (CPUMGetCPUVendor(pVM) != CPUMCPUVENDOR_AMD)
-        return VERR_NOT_SUPPORTED;
-
-    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, hwaccmR3RemovePatches, (void *)VMMGetCpuId(pVM));
+int hwaccmR3EnablePatching(PVM pVM, VMCPUID idCpu, RTRCPTR pPatchMem, unsigned cbPatchMem)
+{
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, hwaccmR3RemovePatches, (void *)idCpu);
     AssertRC(rc);
 
@@ -1484 +1477 @@
     pVM->hwaccm.s.cbGuestPatchMem     = cbPatchMem;
     return VINF_SUCCESS;
+}
+
+/**
+ * Enable patching in a VT-x/AMD-V guest
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   pPatchMem   Patch memory range
+ * @param   cbPatchMem  Size of the memory range
+ */
+VMMR3DECL(int)  HWACMMR3EnablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem)
+{
+    Log(("HWACMMR3EnablePatching %RGv size %x\n", pPatchMem, cbPatchMem));
+
+    /* Current TPR patching only applies to AMD cpus.
+     * Needs to be extended to Intel CPUs without the APIC TPR hardware optimization.
+     */
+    if (CPUMGetCPUVendor(pVM) != CPUMCPUVENDOR_AMD)
+        return VERR_NOT_SUPPORTED;
+
+    if (pVM->cCPUs > 1)
+    {
+        /* We own the IOM lock here and could cause a deadlock by waiting for a VCPU that is blocking on the IOM lock. */
+        PVMREQ pReq;
+        int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ANY_QUEUE, &pReq, 0, VMREQFLAGS_NO_WAIT,
+                              (PFNRT)hwaccmR3EnablePatching, 4, pVM, VMMGetCpuId(pVM), (RTRCPTR)pPatchMem, cbPatchMem);
+        AssertRC(rc);
+        return rc;
+    }
+    else
+        return hwaccmR3EnablePatching(pVM, VMMGetCpuId(pVM), (RTRCPTR)pPatchMem, cbPatchMem);
 }