Changeset 208 in vbox for trunk/src/VBox

Timestamp:

Jan 21, 2007 2:23:25 PM (18 years ago)

Author:

vboxsync

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

17693

Message:

Changed guest specific patch for OpenBSD. 3.7, 3.8, 3.9 and 4.0 now work.

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (2 diffs)
• PATM.cpp (modified) (1 diff)
• PATMGuest.cpp (modified) (4 diffs)
• PATMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -1774 +1774 @@
         RTHCPHYS GCPhys;
         rc = PGMShwGetPage(pVM, pPageAddrGC, &fPageShw, &GCPhys);
-        AssertMsg(     (rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT)
-                ||  !(fPageShw & X86_PTE_RW)
-                ||   (pPageRec->page.GCPhys == 0), ("Shadow page flags for %VGv (%VHp) aren't readonly (%VX64)!!\n", pPageAddrGC, GCPhys, fPageShw));
+//        AssertMsg(     (rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT)
+//                ||  !(fPageShw & X86_PTE_RW)
+//                ||   (pPageRec->page.GCPhys == 0), ("Shadow page flags for %VGv (%VHp) aren't readonly (%VX64)!!\n", pPageAddrGC, GCPhys, fPageShw));
     }
 #endif
@@ -2266 +2266 @@
             else
             {
-                /* OpenBSD guest specific patch test */
-                rc = PATMR3InstallPatch(pVM, pHandler - 4, PATMFL_CODE32 | PATMFL_GUEST_SPECIFIC);
-                if (VBOX_SUCCESS(rc))
+                if (iGate >= 0x20)
                 {
-                    Log(("Installed OpenBSD interrupt handler prefix instruction (push cs) patch\n"));
-                    if (pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32)
+                    /* OpenBSD guest specific patch test (3.7 & 3.8) */
+                    rc = PATMR3InstallPatch(pVM, pHandler - 3, PATMFL_CODE32 | PATMFL_GUEST_SPECIFIC);
+                    if (VBOX_FAILURE(rc))
+                        /* OpenBSD guest specific patch test (3.9 & 4.0) */
+                        rc = PATMR3InstallPatch(pVM, pHandler - 0x2B, PATMFL_CODE32 | PATMFL_GUEST_SPECIFIC);
+                    if (VBOX_SUCCESS(rc))
                     {
-                        /* This is actually fatal!!!! */
-                        Log(("Warning: patch jump overwrites trap handler entrypoint!!!!!!!!!!!!!\n"));
+                        Log(("Installed OpenBSD interrupt handler prefix instruction (push cs) patch\n"));
+                        if (pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32)
+                        {
+                           /* This is actually fatal!!!! */
+                            Log(("Warning: patch jump overwrites trap handler entrypoint!!!!!!!!!!!!!\n"));
+                        }
                     }
                 }
+
+                /* Trap gates and certain interrupt gates. */
+                uint32_t fPatchFlags = PATMFL_CODE32 | PATMFL_IDTHANDLER;
+
+                if (pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32)
+                    fPatchFlags |= PATMFL_TRAPHANDLER;
                 else
-                /* Trap gates and certain interrupt gates. */
-//                if (   pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32
-//                    || iGate == 0x2E || iGate == 0xE || iGate == 0x80 || iGate == 0xEF)
+                    fPatchFlags |= PATMFL_INTHANDLER;
+
+                switch (iGate) {
+                case 8:
+                case 10:
+                case 11:
+                case 12:
+                case 13:
+                case 14:
+                case 17:
+                    fPatchFlags |= PATMFL_TRAPHANDLER_WITH_ERRORCODE;
+                    break;
+                default:
+                    /* No error code. */
+                    break;
+                }
+
+                Log(("Installing %s gate handler for 0x%X at %VGv\n", (pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32) ? "trap" : "intr", iGate, pHandler));
+
+                rc = PATMR3InstallPatch(pVM, pHandler, fPatchFlags);
+                if (VBOX_SUCCESS(rc) || rc == VERR_PATM_ALREADY_PATCHED)
                 {
-                    uint32_t fPatchFlags = PATMFL_CODE32 | PATMFL_IDTHANDLER;
-
-                    if (pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32)
-                        fPatchFlags |= PATMFL_TRAPHANDLER;
+                    RTGCPTR pNewHandlerGC;
+
+                    Log(("Gate handler 0x%X is SAFE!\n", iGate));
+
+                    pNewHandlerGC = PATMR3QueryPatchGCPtr(pVM, pHandler);
+                    if (pNewHandlerGC)
+                    {
+                        rc = TRPMR3SetGuestTrapHandler(pVM, iGate, pNewHandlerGC);
+                        if (VBOX_FAILURE(rc))
+                            Log(("TRPMR3SetGuestTrapHandler %d failed with %Vrc\n", iGate, rc));
+                    }
                     else
-                        fPatchFlags |= PATMFL_INTHANDLER;
-
-                    switch (iGate) {
-                    case 8:
-                    case 10:
-                    case 11:
-                    case 12:
-                    case 13:
-                    case 14:
-                    case 17:
-                        fPatchFlags |= PATMFL_TRAPHANDLER_WITH_ERRORCODE;
-                        break;
-                    default:
-                        /* No error code. */
-                        break;
-                    }
-
-                    Log(("Installing %s gate handler for 0x%X at %VGv\n", (pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32) ? "trap" : "intr", iGate, pHandler));
-
-                    rc = PATMR3InstallPatch(pVM, pHandler, fPatchFlags);
-                    if (VBOX_SUCCESS(rc) || rc == VERR_PATM_ALREADY_PATCHED)
-                    {
-                        RTGCPTR pNewHandlerGC;
-
-                        Log(("Gate handler 0x%X is SAFE!\n", iGate));
-
-                        pNewHandlerGC = PATMR3QueryPatchGCPtr(pVM, pHandler);
-                        if (pNewHandlerGC)
-                        {
-                            rc = TRPMR3SetGuestTrapHandler(pVM, iGate, pNewHandlerGC);
-                            if (VBOX_FAILURE(rc))
-                                Log(("TRPMR3SetGuestTrapHandler %d failed with %Vrc\n", iGate, rc));
-                        }
-                        else
-                            Assert(0);
-                    }
+                        Assert(0);
                 }
             }

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -4173 +4173 @@
         {
         case OP_SYSENTER:
-        case OP_PUSHF:
+        case OP_PUSH:
             rc = PATMInstallGuestSpecificPatch(pVM, &cpu, pInstrGC, pInstrHC, pPatchRec);
             if (rc == VINF_SUCCESS)

trunk/src/VBox/VMM/PATM/PATMGuest.cpp

@@ -70 +70 @@
 
 /*
- * D0101B6C:  pushf                         [9C]
+ * OpenBSD 3.7 & 3.8:
+ *
  * D0101B6D:  push CS                       [0E]
  * D0101B6E:  push ESI                      [56]
  * D0101B6F:  cli                           [FA]
  */
-static uint8_t uFnOpenBSDHandlerPrefix[4] = { 0x9C, 0x0E, 0x56, 0xFA };
+static uint8_t uFnOpenBSDHandlerPrefix1[3] = { 0x0E, 0x56, 0xFA };
+/*
+ * OpenBSD 3.9 & 4.0
+ *
+ * D0101BD1:  push CS                       [0E]
+ * D0101BD2:  push ESI                      [56]
+ * D0101BD3:  push 0x00                     [6A 00]
+ * D0101BD4:  push 0x03                     [6A 03]
+ */
+static uint8_t uFnOpenBSDHandlerPrefix2[6] = { 0x0E, 0x56, 0x6A, 0x00, 0x6A, 0x03 };
 
 
@@ -175 +185 @@
     int       rc;
 
-    Assert(sizeof(uTemp) > sizeof(uFnOpenBSDHandlerPrefix));
+    Assert(sizeof(uTemp) > RT_MAX(sizeof(uFnOpenBSDHandlerPrefix1), sizeof(uFnOpenBSDHandlerPrefix2)));
 
     /* Guest OS specific patch; check heuristics first */
 
-    rc = PGMPhysReadGCPtr(pVM, uTemp, pInstrGC, sizeof(uFnOpenBSDHandlerPrefix));
-    if (VBOX_FAILURE(rc) || memcmp(uFnOpenBSDHandlerPrefix, uTemp, sizeof(uFnOpenBSDHandlerPrefix)))
-    {
-        return VERR_PATCHING_REFUSED;
-    }
-    /* Found it; patch the pushf block (including push cs) */
+    rc = PGMPhysReadGCPtr(pVM, uTemp, pInstrGC, RT_MAX(sizeof(uFnOpenBSDHandlerPrefix1), sizeof(uFnOpenBSDHandlerPrefix2)));
+    if (    VBOX_FAILURE(rc) 
+        || (    memcmp(uFnOpenBSDHandlerPrefix1, uTemp, sizeof(uFnOpenBSDHandlerPrefix1))
+            &&  memcmp(uFnOpenBSDHandlerPrefix2, uTemp, sizeof(uFnOpenBSDHandlerPrefix2))))
+    {
+        return VERR_PATCHING_REFUSED;
+    }
+    /* Found it; patch the push cs */
     pPatchRec->patch.flags &= ~(PATMFL_GUEST_SPECIFIC);  /* prevent a breakpoint from being triggered */
-    return PATMR3PatchBlock(pVM, pInstrGC, pInstrHC, pCpu->pCurInstr->opcode, pCpu->opsize, pPatchRec);
+    return PATMR3PatchInstrInt3(pVM, pInstrGC, pInstrHC, pCpu, &pPatchRec->patch);
 }
 
@@ -218 +230 @@
         return VINF_SUCCESS;
 
-    case OP_PUSHF:
+    case OP_PUSH:
         /* OpenBSD guest specific patch for the following code block:
          *
@@ -226 +238 @@
          *  cli
          */
-        return PATMPatchOpenBSDHandlerPrefix(pVM, pCpu, pInstrGC, pInstrHC, pPatchRec);
+        if (pCpu->pCurInstr->param1 == OP_PARM_REG_CS)
+            return PATMPatchOpenBSDHandlerPrefix(pVM, pCpu, pInstrGC, pInstrHC, pPatchRec);
+
+        return VERR_PATCHING_REFUSED;
 
     default:

trunk/src/VBox/VMM/PATM/PATMInternal.h

@@ -730 +730 @@
 
 /**
+ * Replace an instruction with a breakpoint (0xCC), that is handled dynamically in the guest context.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   pInstrGC    Guest context point to privileged instruction
+ * @param   pInstrHC    Host context point to privileged instruction
+ * @param   pCpu        Disassembly CPU structure ptr
+ * @param   pPatch      Patch record
+ *
+ * @note    returns failure if patching is not allowed or possible
+ *
+ */
+PATMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTGCPTR pInstrGC, HCPTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch);
+
+/**
  * Mark patch as dirty
  *