Changeset 80016 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 26, 2019 5:06:38 PM (6 years ago)

Author:

vboxsync

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

132451

Message:

VMM: Kicking out raw-mode (work in progress) - EM. bugref:9517

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (19 diffs)
• EMHM.cpp (modified) (3 diffs)
• EMR3Nem.cpp (modified) (1 diff)
• EMRaw.cpp (deleted)

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

@@ -102 +102 @@
     AssertCompileMemberAlignment(VM, em.s, 32);
     AssertCompile(sizeof(pVM->em.s) <= sizeof(pVM->em.padding));
-    AssertCompile(sizeof(pVM->aCpus[0].em.s.u.FatalLongJump) <= sizeof(pVM->aCpus[0].em.s.u.achPaddingFatalLongJump));
+    AssertCompile(RT_SIZEOFMEMB(VMCPU, em.s.u.FatalLongJump) <= RT_SIZEOFMEMB(VMCPU, em.s.u.achPaddingFatalLongJump));
+    AssertCompile(RT_SIZEOFMEMB(VMCPU, em.s) <= RT_SIZEOFMEMB(VMCPU, em.padding));
 
     /*
      * Init the structure.
      */
-    pVM->em.s.offVM = RT_UOFFSETOF(VM, em.s);
     PCFGMNODE pCfgRoot = CFGMR3GetRoot(pVM);
     PCFGMNODE pCfgEM = CFGMR3GetChild(pCfgRoot, "EM");
@@ -234 +234 @@
         pVCpu->em.s.enmState            = i == 0 ? EMSTATE_NONE : EMSTATE_WAIT_SIPI;
         pVCpu->em.s.enmPrevState        = EMSTATE_NONE;
-        pVCpu->em.s.fForceRAW           = false;
         pVCpu->em.s.u64TimeSliceStart   = 0; /* paranoia */
         pVCpu->em.s.idxContinueExitRec  = UINT16_MAX;
-
-#ifdef VBOX_WITH_RAW_MODE
-        if (VM_IS_RAW_MODE_ENABLED(pVM))
-        {
-            pVCpu->em.s.pPatmGCState = PATMR3QueryGCStateHC(pVM);
-            AssertMsg(pVCpu->em.s.pPatmGCState, ("PATMR3QueryGCStateHC failed!\n"));
-        }
-#endif
 
 # define EM_REG_COUNTER(a, b, c) \
@@ -273 +264 @@
         pVCpu->em.s.pStatsR3 = pStats;
         pVCpu->em.s.pStatsR0 = MMHyperR3ToR0(pVM, pStats);
-        pVCpu->em.s.pStatsRC = MMHyperR3ToRC(pVM, pStats);
 
 # if 1 /* rawmode only? */
@@ -402 +392 @@
 {
     LogFlow(("EMR3Relocate\n"));
-    for (VMCPUID i = 0; i < pVM->cCpus; i++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[i];
-        if (pVCpu->em.s.pStatsR3)
-            pVCpu->em.s.pStatsRC = MMHyperR3ToRC(pVM, pVCpu->em.s.pStatsR3);
-    }
+    RT_NOREF(pVM);
 }
 
@@ -421 +406 @@
 {
     /* Reset scheduling state. */
-    pVCpu->em.s.fForceRAW = false;
     VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_UNHALT);
 
@@ -459 +443 @@
 VMMR3_INT_DECL(int) EMR3Term(PVM pVM)
 {
-    AssertMsg(pVM->em.s.offVM, ("bad init order!\n"));
-
 #ifdef VBOX_WITH_REM
     PDMR3CritSectDelete(&pVM->em.s.CritSectREM);
@@ -483 +465 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
-        SSMR3PutBool(pSSM, pVCpu->em.s.fForceRAW);
+        SSMR3PutBool(pSSM, false /*fForceRAW*/);
 
         Assert(pVCpu->em.s.enmState     == EMSTATE_SUSPENDED);
@@ -531 +513 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
-        int rc = SSMR3GetBool(pSSM, &pVCpu->em.s.fForceRAW);
-        if (RT_FAILURE(rc))
-            pVCpu->em.s.fForceRAW = false;
+        bool fForceRAWIgnored;
+        int rc = SSMR3GetBool(pSSM, &fForceRAWIgnored);
         AssertRCReturn(rc, rc);
 
@@ -872 +853 @@
             case VINF_EM_DBG_STEP:
                 if (   pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_RAW
-                    || pVCpu->em.s.enmState == EMSTATE_DEBUG_HYPER
-                    || pVCpu->em.s.fForceRAW /* paranoia */)
-#ifdef VBOX_WITH_RAW_MODE
-                    rc = emR3RawStep(pVM, pVCpu);
-#else
+                    || pVCpu->em.s.enmState == EMSTATE_DEBUG_HYPER)
                     AssertLogRelMsgFailedStmt(("Bad EM state."), VERR_EM_INTERNAL_ERROR);
-#endif
                 else if (pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HM)
                     rc = EMR3HmSingleInstruction(pVM, pVCpu, 0 /*fFlags*/);
@@ -979 +955 @@
             case VINF_EM_HALT:
                 if (pVCpu->em.s.enmState == EMSTATE_DEBUG_HYPER)
-                {
-#ifdef VBOX_WITH_RAW_MODE
-                    rc = emR3RawResumeHyper(pVM, pVCpu);
-                    if (rc != VINF_SUCCESS && RT_SUCCESS(rc))
-                        continue;
-#else
                     AssertLogRelMsgFailedReturn(("Not implemented\n"), VERR_EM_INTERNAL_ERROR);
-#endif
-                }
                 if (rc == VINF_SUCCESS)
                     rc = VINF_EM_RESCHEDULE;
@@ -1422 +1390 @@
 {
     /*
-     * When forcing raw-mode execution, things are simple.
-     */
-    if (pVCpu->em.s.fForceRAW)
-        return EMSTATE_RAW;
-
-    /*
      * We stay in the wait for SIPI state unless explicitly told otherwise.
      */
@@ -1558 +1520 @@
         }
 
-# ifdef VBOX_WITH_RAW_MODE
-        if (PATMShouldUseRawMode(pVM, (RTGCPTR)pVCpu->cpum.GstCtx.eip))
-        {
-            Log2(("raw r0 mode forced: patch code\n"));
-#  ifdef VBOX_WITH_SAFE_STR
-            Assert(pVCpu->cpum.GstCtx.tr.Sel);
-#  endif
-            return EMSTATE_RAW;
-        }
-# endif /* VBOX_WITH_RAW_MODE */
-
 # if !defined(VBOX_ALLOW_IF0) && !defined(VBOX_RUN_INTERRUPT_GATE_HANDLERS)
         if (!(EFlags.u32 & X86_EFL_IF))
@@ -1693 +1644 @@
             pVCpu->em.s.idxContinueExitRec = UINT16_MAX;
     }
-
-#ifdef VBOX_WITH_RAW_MODE
-    if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_CSAM_PENDING_ACTION))
-        CSAMR3DoPendingAction(pVM, pVCpu);
-#endif
 
     if (VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY))
@@ -1910 +1856 @@
             UPDATE_RC();
         }
-
-#ifdef VBOX_WITH_RAW_MODE
-        /*
-         * CSAM page scanning.
-         */
-        if (    !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)
-            &&  VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_CSAM_SCAN_PAGE))
-        {
-            /** @todo check for 16 or 32 bits code! (D bit in the code selector) */
-            Log(("Forced action VMCPU_FF_CSAM_SCAN_PAGE\n"));
-            CPUM_IMPORT_EXTRN_RCSTRICT(pVCpu, ~CPUMCTX_EXTRN_KEEPER_MASK, rc);
-            CSAMR3CheckCodeEx(pVM, &pVCpu->cpum.GstCtx, pVCpu->cpum.GstCtx.eip);
-            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_CSAM_SCAN_PAGE);
-        }
-#endif
 
         /*
@@ -2176 +2107 @@
 
             bool fGif = CPUMGetGuestGif(&pVCpu->cpum.GstCtx);
-#ifdef VBOX_WITH_RAW_MODE
-            fGif &= !PATMIsPatchGCAddr(pVM, pVCpu->cpum.GstCtx.eip);
-#endif
             if (fGif)
             {
@@ -2507 +2435 @@
 VMMR3_INT_DECL(int) EMR3ExecuteVM(PVM pVM, PVMCPU pVCpu)
 {
-    Log(("EMR3ExecuteVM: pVM=%p enmVMState=%d (%s)  enmState=%d (%s) enmPrevState=%d (%s) fForceRAW=%RTbool\n",
+    Log(("EMR3ExecuteVM: pVM=%p enmVMState=%d (%s)  enmState=%d (%s) enmPrevState=%d (%s)\n",
          pVM,
          pVM->enmVMState,          VMR3GetStateName(pVM->enmVMState),
          pVCpu->em.s.enmState,     emR3GetStateName(pVCpu->em.s.enmState),
-         pVCpu->em.s.enmPrevState, emR3GetStateName(pVCpu->em.s.enmPrevState),
-         pVCpu->em.s.fForceRAW));
+         pVCpu->em.s.enmPrevState, emR3GetStateName(pVCpu->em.s.enmPrevState) ));
     VM_ASSERT_EMT(pVM);
     AssertMsg(   pVCpu->em.s.enmState == EMSTATE_NONE
@@ -2566 +2493 @@
                 rc = emR3ForcedActions(pVM, pVCpu, rc);
                 VBOXVMM_EM_FF_ALL_RET(pVCpu, rc);
-                if (   (   rc == VINF_EM_RESCHEDULE_REM
-                        || rc == VINF_EM_RESCHEDULE_HM)
-                    && pVCpu->em.s.fForceRAW)
+                if (   rc == VINF_EM_RESCHEDULE_REM
+                    || rc == VINF_EM_RESCHEDULE_HM)
                     rc = VINF_EM_RESCHEDULE_RAW;
             }
@@ -2610 +2536 @@
                 case VINF_EM_RESCHEDULE_HM:
                     Assert(!pVM->em.s.fIemExecutesAll || pVCpu->em.s.enmState != EMSTATE_IEM);
-                    Assert(!pVCpu->em.s.fForceRAW);
                     if (VM_IS_HM_ENABLED(pVM))
                     {
@@ -2906 +2831 @@
                  */
                 case EMSTATE_RAW:
-#ifdef VBOX_WITH_RAW_MODE
-                    rc = emR3RawExecute(pVM, pVCpu, &fFFDone);
-#else
                     AssertLogRelMsgFailed(("%Rrc\n", rc));
                     rc = VERR_EM_INTERNAL_ERROR;
-#endif
                     break;
 

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

@@ -309 +309 @@
             return rc;
 
-#ifdef VBOX_WITH_RAW_MODE
-        Assert(!VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT));
-#endif
-
         /* Prefetch pages for EIP and ESP. */
         /** @todo This is rather expensive. Should investigate if it really helps at all. */
@@ -332 +328 @@
         }
         /** @todo maybe prefetch the supervisor stack page as well */
-#ifdef VBOX_WITH_RAW_MODE
-        Assert(!VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT));
-#endif
     }
 
@@ -401 +394 @@
          * Process high priority pre-execution raw-mode FFs.
          */
-#ifdef VBOX_WITH_RAW_MODE
-        Assert(!VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS | VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT));
-#endif
         if (    VM_FF_IS_ANY_SET(pVM, VM_FF_HIGH_PRIORITY_PRE_RAW_MASK)
             ||  VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_HIGH_PRIORITY_PRE_RAW_MASK))

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

@@ -300 +300 @@
 static int emR3NemForcedActions(PVM pVM, PVMCPU pVCpu)
 {
-#ifdef VBOX_WITH_RAW_MODE
-    Assert(!VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS | VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT));
-#endif
-
     /*
      * Sync page directory should not happen in NEM mode.