Changeset 87487 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Jan 29, 2021 6:06:39 PM (4 years ago)

Author:

vboxsync

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

142509

Message:

VMM/HMVMX: Moving more stuff to HMR0PERVCPU. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (17 diffs)

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

@@ -731 +731 @@
         { hmR0SvmVmRun_WithXcr0_WithIbpbEntry_WithIbpbExit },
     };
-    uintptr_t const idx = (pVCpu->hm.s.fLoadSaveGuestXcr0                             ? 1 : 0)
+    uintptr_t const idx = (pVCpu->hmr0.s.fLoadSaveGuestXcr0                           ? 1 : 0)
                         | (pVCpu->cpum.GstCtx.fWorldSwitcher & CPUMCTX_WSF_IBPB_ENTRY ? 2 : 0)
                         | (pVCpu->cpum.GstCtx.fWorldSwitcher & CPUMCTX_WSF_IBPB_EXIT  ? 4 : 0);
@@ -1291 +1291 @@
     {
         STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTlbWorldSwitch);
-        pVCpu->hm.s.fForceTLBFlush = true;
+        pVCpu->hmr0.s.fForceTLBFlush = true;
         fNewAsid = true;
     }
@@ -1301 +1301 @@
     if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_TLB_FLUSH))
     {
-        pVCpu->hm.s.fForceTLBFlush = true;
+        pVCpu->hmr0.s.fForceTLBFlush = true;
         STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTlb);
     }
@@ -1324 +1324 @@
     {
         pVmcb->ctrl.TLBCtrl.n.u8TLBFlush = SVM_TLB_FLUSH_NOTHING;
-        if (pVCpu->hm.s.fForceTLBFlush)
+        if (pVCpu->hmr0.s.fForceTLBFlush)
         {
             /* Clear the VMCB Clean Bit for NP while flushing the TLB. See @bugref{7152}. */
@@ -1360 +1360 @@
             }
 
-            pVCpu->hm.s.fForceTLBFlush = false;
+            pVCpu->hmr0.s.fForceTLBFlush = false;
         }
     }
@@ -1669 +1669 @@
     /* Whether to save/load/restore XCR0 during world switch depends on CR4.OSXSAVE and host+guest XCR0. */
     bool const fLoadSaveGuestXcr0 = (pCtx->cr4 & X86_CR4_OSXSAVE) && pCtx->aXcr[0] != ASMGetXcr0();
-    if (fLoadSaveGuestXcr0 != pVCpu->hm.s.fLoadSaveGuestXcr0)
-    {
-        pVCpu->hm.s.fLoadSaveGuestXcr0 = fLoadSaveGuestXcr0;
+    if (fLoadSaveGuestXcr0 != pVCpu->hmr0.s.fLoadSaveGuestXcr0)
+    {
+        pVCpu->hmr0.s.fLoadSaveGuestXcr0 = fLoadSaveGuestXcr0;
         hmR0SvmUpdateVmRunFunction(pVCpu);
     }
@@ -1918 +1918 @@
     if (fStepping)
     {
-        pVCpu->hm.s.fClearTrapFlag = true;
+        pVCpu->hmr0.s.fClearTrapFlag = true;
         pVmcb->guest.u64RFlags |= X86_EFL_TF;
         fInterceptMovDRx = true; /* Need clean DR6, no guest mess. */
@@ -1952 +1952 @@
          *        with the same values. */
         fInterceptMovDRx = true;
-        pVCpu->hm.s.fUsingHyperDR7 = true;
+        pVCpu->hmr0.s.fUsingHyperDR7 = true;
         Log5(("hmR0SvmExportSharedDebugState: Loaded hyper DRx\n"));
     }
@@ -1967 +1967 @@
             pVmcb->ctrl.u32VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_DRX;
         }
-        pVCpu->hm.s.fUsingHyperDR7 = false;
+        pVCpu->hmr0.s.fUsingHyperDR7 = false;
 
         /*
@@ -2280 +2280 @@
                                    == (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_SVM_HOST_GUEST_SHARED_STATE));
 
-    pVCpu->hm.s.fLeaveDone = false;
+    pVCpu->hmr0.s.fLeaveDone = false;
     return VINF_SUCCESS;
 }
@@ -2308 +2308 @@
             VMMRZCallRing3Disable(pVCpu);
 
-            if (!pVCpu->hm.s.fLeaveDone)
+            if (!pVCpu->hmr0.s.fLeaveDone)
             {
                 hmR0SvmLeave(pVCpu, false /* fImportState */);
-                pVCpu->hm.s.fLeaveDone = true;
+                pVCpu->hmr0.s.fLeaveDone = true;
             }
 
@@ -2342 +2342 @@
                                            == (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_SVM_HOST_GUEST_SHARED_STATE));
 
-            pVCpu->hm.s.fLeaveDone = false;
+            pVCpu->hmr0.s.fLeaveDone = false;
 
             /* Restore longjmp state. */
@@ -2818 +2818 @@
             if (fWhat & CPUMCTX_EXTRN_DR6)
             {
-                if (!pVCpu->hm.s.fUsingHyperDR7)
+                if (!pVCpu->hmr0.s.fUsingHyperDR7)
                     pCtx->dr[6] = pVmcbGuest->u64DR6;
                 else
@@ -2826 +2826 @@
             if (fWhat & CPUMCTX_EXTRN_DR7)
             {
-                if (!pVCpu->hm.s.fUsingHyperDR7)
+                if (!pVCpu->hmr0.s.fUsingHyperDR7)
                     pCtx->dr[7] = pVmcbGuest->u64DR7;
                 else
@@ -2994 +2994 @@
     /* When thread-context hooks are used, we can avoid doing the leave again if we had been preempted before
        and done this from the SVMR0ThreadCtxCallback(). */
-    if (!pVCpu->hm.s.fLeaveDone)
+    if (!pVCpu->hmr0.s.fLeaveDone)
     {
         hmR0SvmLeave(pVCpu, true /* fImportState */);
-        pVCpu->hm.s.fLeaveDone = true;
+        pVCpu->hmr0.s.fLeaveDone = true;
     }
 
@@ -4620 +4620 @@
      * Clear the X86_EFL_TF if necessary.
      */
-    if (pVCpu->hm.s.fClearTrapFlag)
-    {
-        pVCpu->hm.s.fClearTrapFlag = false;
+    if (pVCpu->hmr0.s.fClearTrapFlag)
+    {
+        pVCpu->hmr0.s.fClearTrapFlag = false;
         pCtx->eflags.Bits.u1TF = 0;
     }
@@ -6553 +6553 @@
         bool const fLoadSaveGuestXcr0 = (pCtx->cr4 & X86_CR4_OSXSAVE) && pCtx->aXcr[0] != ASMGetXcr0();
         Log4Func(("New XCR0=%#RX64 fLoadSaveGuestXcr0=%RTbool (cr4=%#RX64)\n", pCtx->aXcr[0], fLoadSaveGuestXcr0, pCtx->cr4));
-        if (fLoadSaveGuestXcr0 != pVCpu->hm.s.fLoadSaveGuestXcr0)
-        {
-            pVCpu->hm.s.fLoadSaveGuestXcr0 = fLoadSaveGuestXcr0;
+        if (fLoadSaveGuestXcr0 != pVCpu->hmr0.s.fLoadSaveGuestXcr0)
+        {
+            pVCpu->hmr0.s.fLoadSaveGuestXcr0 = fLoadSaveGuestXcr0;
             hmR0SvmUpdateVmRunFunction(pVCpu);
         }