Changeset 80036 in vbox for trunk/src

Timestamp:

Jul 29, 2019 7:44:29 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Nested SVM: bugref:7243 Move u64HostTscAux to svm union.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMSVMR0.cpp (modified) (2 diffs)
• include/HMInternal.h (modified) (2 diffs)
• include/HMInternal.mac (modified) (1 diff)

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

@@ -4626 +4626 @@
     {
         uint64_t const uGuestTscAux = CPUMGetGuestTscAux(pVCpu);
-        pVCpu->hm.s.u64HostTscAux   = ASMRdMsr(MSR_K8_TSC_AUX);
-        if (uGuestTscAux != pVCpu->hm.s.u64HostTscAux)
+        pVCpu->hm.s.svm.u64HostTscAux   = ASMRdMsr(MSR_K8_TSC_AUX);
+        if (uGuestTscAux != pVCpu->hm.s.svm.u64HostTscAux)
             ASMWrMsr(MSR_K8_TSC_AUX, uGuestTscAux);
         hmR0SvmSetMsrPermission(pVCpu, pbMsrBitmap, MSR_K8_TSC_AUX, SVMMSREXIT_PASSTHRU_READ, SVMMSREXIT_PASSTHRU_WRITE);
@@ -4723 +4723 @@
         uint64_t u64GuestTscAuxMsr = ASMRdMsr(MSR_K8_TSC_AUX);
         CPUMSetGuestTscAux(pVCpu, u64GuestTscAuxMsr);
-        if (u64GuestTscAuxMsr != pVCpu->hm.s.u64HostTscAux)
-            ASMWrMsr(MSR_K8_TSC_AUX, pVCpu->hm.s.u64HostTscAux);
+        if (u64GuestTscAuxMsr != pVCpu->hm.s.svm.u64HostTscAux)
+            ASMWrMsr(MSR_K8_TSC_AUX, pVCpu->hm.s.svm.u64HostTscAux);
     }
 

trunk/src/VBox/VMM/include/HMInternal.h

@@ -973 +973 @@
     /** CPU-context changed flags (see HM_CHANGED_xxx). */
     uint64_t                    fCtxChanged;
-    /** Host's TSC_AUX MSR (used when RDTSCP doesn't cause VM-exits). */
-    uint64_t                    u64HostTscAux;  /** @todo r=ramshankar: Can be removed and put in SVMTRANSIENT instead! */
 
     union /* no tag! */
@@ -1082 +1080 @@
             bool                        fSyncVTpr;
             uint8_t                     au8Alignment0[7];
+
+            /** Host's TSC_AUX MSR (used when RDTSCP doesn't cause VM-exits). */
+            uint64_t                    u64HostTscAux;
 
             /** Cache of the nested-guest's VMCB fields that we modify in order to run the

trunk/src/VBox/VMM/include/HMInternal.mac

@@ -87 +87 @@
     alignb 8
     .fCtxChanged            resq    1
-    .u64HostTscAux          resq    1
 
     ; incomplete to save unnecessary pain...