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

Timestamp:

Aug 5, 2009 11:08:09 AM (15 years ago)

Author:

vboxsync

Message:

TPR patching fixes for SMP guests

File:

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

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1402 +1402 @@
 DECLCALLBACK(int) hwaccmR3RemovePatches(PVM pVM, PVMCPU pVCpu, void *pvUser)
 {
+    VMCPUID idCpu = (VMCPUID)pvUser;
+
+    /* Only execute the handler on the VCPU the original patch request was issued. */
+    if (pVCpu->idCpu != idCpu)
+        return VINF_SUCCESS;
+
     Log(("hwaccmR3RemovePatches\n"));
     for (unsigned i = 0; i < pVM->hwaccm.s.svm.cPatches; i++)
@@ -1466 +1472 @@
         return VERR_NOT_SUPPORTED;
 
-    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, hwaccmR3RemovePatches, NULL);
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, hwaccmR3RemovePatches, (void *)VMMGetCpuId(pVM));
     AssertRC(rc);
 
@@ -1490 +1496 @@
     Assert(pVM->hwaccm.s.cbGuestPatchMem == cbPatchMem);
 
-    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, hwaccmR3RemovePatches, NULL);
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, hwaccmR3RemovePatches, (void *)VMMGetCpuId(pVM));
     AssertRC(rc);
 
@@ -1529 +1535 @@
         else
         if (pDis->param2.flags == USE_IMMEDIATE32)
-        {
             u8Tpr = (uint8_t)pDis->param2.parval;
-        }
         else
             return VERR_EM_INTERPRETER;
@@ -1575 +1579 @@
 DECLCALLBACK(int) hwaccmR3ReplaceTprInstr(PVM pVM, PVMCPU pVCpu, void *pvUser)
 {
-    PCPUMCTX     pCtx   = (PCPUMCTX)pvUser;
+    VMCPUID      idCpu  = (VMCPUID)pvUser;
+    PCPUMCTX     pCtx   = CPUMQueryGuestCtxPtr(pVCpu);
     RTGCPTR      oldrip = pCtx->rip;
     PDISCPUSTATE pDis   = &pVCpu->hwaccm.s.DisState;
     unsigned     cbOp;
+
+    /* Only execute the handler on the VCPU the original patch request was issued. */
+    if (pVCpu->idCpu != idCpu)
+        return VINF_SUCCESS;
 
     Log(("hwaccmR3ReplaceTprInstr: %RGv\n", pCtx->rip));
@@ -1707 +1716 @@
 DECLCALLBACK(int) hwaccmR3PatchTprInstr(PVM pVM, PVMCPU pVCpu, void *pvUser)
 {
-    PCPUMCTX     pCtx   = (PCPUMCTX)pvUser;
+    VMCPUID      idCpu  = (VMCPUID)pvUser;
+    PCPUMCTX     pCtx   = CPUMQueryGuestCtxPtr(pVCpu);
     PDISCPUSTATE pDis   = &pVCpu->hwaccm.s.DisState;
     unsigned     cbOp;
@@ -1715 +1725 @@
     char         szOutput[256];
 #endif
+
+    /* Only execute the handler on the VCPU the original patch request was issued. */
+    if (pVCpu->idCpu != idCpu)
+        return VINF_SUCCESS;
 
     Log(("hwaccmR3PatchTprInstr %RGv\n", pCtx->rip));
@@ -1908 +1922 @@
 VMMR3DECL(int) HWACCMR3PatchTprInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
-    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, (pVM->hwaccm.s.pGuestPatchMem) ? hwaccmR3PatchTprInstr : hwaccmR3ReplaceTprInstr, pCtx);
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, (pVM->hwaccm.s.pGuestPatchMem) ? hwaccmR3PatchTprInstr : hwaccmR3ReplaceTprInstr, (void *)pVCpu->idCpu);
     AssertRC(rc);
     return rc;