Changeset 55039 in vbox

Timestamp:

Mar 31, 2015 3:01:05 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99325

Message:

VMM: Fix hypercall patching.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GIMAllKvm.cpp (modified) (1 diff)
• VMMR0/HMSVMR0.cpp (modified) (1 diff)

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

@@ -352 +352 @@
         if (Dis.pCurInstr->uOpcode == OP_VMCALL)
         {
-            Assert(cbInstr == 3);        /* paranoia. */
-
             /*
              * Patch the instruction to so we don't have to spend time disassembling it each time.
              */
-            static uint8_t s_abHypercall[3];
-            size_t cbWritten;
-            rc = HMPatchHypercall(pVM, &s_abHypercall, sizeof(s_abHypercall), &cbWritten);
-            AssertRC(rc);
-
-            if (RT_LIKELY(cbWritten == cbInstr))
-                rc = PGMPhysSimpleWriteGCPtr(pVCpu, pCtx->rip, &s_abHypercall, sizeof(s_abHypercall));
-            if (RT_SUCCESS(rc))
-                return gimKvmHypercall(pVCpu, pCtx);
+            static uint8_t s_abHypercall[3] = { 0x0F, 0x01, 0x00 };
+            Assert(sizeof(s_abHypercall) == cbInstr);
+            if (!s_abHypercall[2])
+                s_abHypercall[2] = ASMIsAmdCpu() ? 0xD9 /* VMMCALL */ : 0xC1 /* VMCALL */;
+            rc = PGMPhysSimpleWriteGCPtr(pVCpu, pCtx->rip, &s_abHypercall, sizeof(s_abHypercall));
+            return VINF_SUCCESS;
         }
     }

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

@@ -5227 +5227 @@
     if (   pVM->hm.s.fTrapXcptUD
         && GIMAreHypercallsEnabled(pVCpu))
-    {
-        int rc = GIMXcptUD(pVCpu, pCtx);
-        if (RT_SUCCESS(rc))
-        {
-            /* If the exception handler changes anything other than guest general-purpose registers,
-               we would need to reload the guest changed bits on VM-reentry. */
-            hmR0SvmUpdateRip(pVCpu, pCtx, 3);
-            return VINF_SUCCESS;
-        }
-    }
-
-    hmR0SvmSetPendingXcptUD(pVCpu);
+        GIMXcptUD(pVCpu, pCtx);
+    else
+        hmR0SvmSetPendingXcptUD(pVCpu);
+
     return VINF_SUCCESS;
 }