Changeset 94944 in vbox

Timestamp:

May 9, 2022 9:45:33 AM (3 years ago)

Author:

vboxsync

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

151352

Message:

VMM/HM: Use g_CpumHostFeatures instead of the copy in the VM structure. bugref:10093

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/vm.h

@@ -1248 +1248 @@
             uint8_t                 abHidden0[64];
             /** Host CPU feature information. */
-            CPUMFEATURES            HostFeatures;
+            CPUMFEATURES            HostFeaturesX;
             /** Guest CPU feature information. */
             CPUMFEATURES            GuestFeatures;

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -792 +792 @@
      */
     PCVMCC pVM = pVCpu->CTX_SUFF(pVM);
-    bool const fFsGsBase    = pVM->cpum.ro.GuestFeatures.fFsGsBase;
-    bool const fXSaveRstor  = pVM->cpum.ro.GuestFeatures.fXSaveRstor;
-    bool const fFxSaveRstor = pVM->cpum.ro.GuestFeatures.fFxSaveRstor;
+    bool fFsGsBase    = pVM->cpum.ro.GuestFeatures.fFsGsBase;
+    bool fXSaveRstor  = pVM->cpum.ro.GuestFeatures.fXSaveRstor;
+    bool fFxSaveRstor = pVM->cpum.ro.GuestFeatures.fFxSaveRstor;
 
     /*
@@ -800 +800 @@
      * Ensure features exposed to the guest are present on the host.
      */
-    Assert(!fFsGsBase    || pVM->cpum.ro.HostFeatures.fFsGsBase);
-    Assert(!fXSaveRstor  || pVM->cpum.ro.HostFeatures.fXSaveRstor);
-    Assert(!fFxSaveRstor || pVM->cpum.ro.HostFeatures.fFxSaveRstor);
+    AssertStmt(!fFsGsBase    || g_CpumHostFeatures.s.fFsGsBase,    fFsGsBase = 0);
+    AssertStmt(!fXSaveRstor  || g_CpumHostFeatures.s.fXSaveRstor,  fXSaveRstor = 0);
+    AssertStmt(!fFxSaveRstor || g_CpumHostFeatures.s.fFxSaveRstor, fFxSaveRstor = 0);
 
     uint64_t const fGstMask = (  X86_CR4_PVI

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

@@ -4290 +4290 @@
      * This should be done -after- any RDTSCPs for obtaining the host timestamp (TM, STAM etc).
      */
-    if (   pVM->cpum.ro.HostFeatures.fRdTscP
+    if (   g_CpumHostFeatures.s.fRdTscP
         && !(pVmcb->ctrl.u64InterceptCtrl & SVM_CTRL_INTERCEPT_RDTSCP))
     {

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

@@ -2152 +2152 @@
      * See Intel "Model-Specific Registers" spec.
      */
-    uint32_t const uFamilyModel = (pVM->cpum.ro.HostFeatures.uFamily << 8)
-                                | pVM->cpum.ro.HostFeatures.uModel;
+    uint32_t const uFamilyModel = (g_CpumHostFeatures.s.uFamily << 8)
+                                | g_CpumHostFeatures.s.uModel;
     switch (uFamilyModel)
     {
@@ -3648 +3648 @@
         {
             /* Verify that the host is NX capable. */
-            Assert(pVCpu->CTX_SUFF(pVM)->cpum.ro.HostFeatures.fNoExecute);
+            Assert(g_CpumHostFeatures.s.fNoExecute);
             return true;
         }

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

@@ -730 +730 @@
      * Check if L1D flush is needed/possible.
      */
-    if (   !pVM->cpum.ro.HostFeatures.fFlushCmd
-        || pVM->cpum.ro.HostFeatures.enmMicroarch <  kCpumMicroarch_Intel_Core7_Nehalem
-        || pVM->cpum.ro.HostFeatures.enmMicroarch >= kCpumMicroarch_Intel_Core7_End
-        || pVM->cpum.ro.HostFeatures.fArchVmmNeedNotFlushL1d
-        || pVM->cpum.ro.HostFeatures.fArchRdclNo)
+    if (   !g_CpumHostFeatures.s.fFlushCmd
+        || g_CpumHostFeatures.s.enmMicroarch <  kCpumMicroarch_Intel_Core7_Nehalem
+        || g_CpumHostFeatures.s.enmMicroarch >= kCpumMicroarch_Intel_Core7_End
+        || g_CpumHostFeatures.s.fArchVmmNeedNotFlushL1d
+        || g_CpumHostFeatures.s.fArchRdclNo)
         pVM->hm.s.fL1dFlushOnSched = pVM->hm.s.fL1dFlushOnVmEntry = false;
 
@@ -741 +741 @@
      * On atoms and knight family CPUs, we will only allow clearing on scheduling.
      */
-    if (   !pVM->cpum.ro.HostFeatures.fMdsClear
-        || pVM->cpum.ro.HostFeatures.fArchMdsNo)
+    if (   !g_CpumHostFeatures.s.fMdsClear
+        || g_CpumHostFeatures.s.fArchMdsNo)
         pVM->hm.s.fMdsClearOnSched = pVM->hm.s.fMdsClearOnVmEntry = false;
-    else if (   (   pVM->cpum.ro.HostFeatures.enmMicroarch >=  kCpumMicroarch_Intel_Atom_Airmount
-                 && pVM->cpum.ro.HostFeatures.enmMicroarch <   kCpumMicroarch_Intel_Atom_End)
-             || (   pVM->cpum.ro.HostFeatures.enmMicroarch >=  kCpumMicroarch_Intel_Phi_KnightsLanding
-                 && pVM->cpum.ro.HostFeatures.enmMicroarch <   kCpumMicroarch_Intel_Phi_End))
+    else if (   (   g_CpumHostFeatures.s.enmMicroarch >=  kCpumMicroarch_Intel_Atom_Airmount
+                 && g_CpumHostFeatures.s.enmMicroarch <   kCpumMicroarch_Intel_Atom_End)
+             || (   g_CpumHostFeatures.s.enmMicroarch >=  kCpumMicroarch_Intel_Phi_KnightsLanding
+                 && g_CpumHostFeatures.s.enmMicroarch <   kCpumMicroarch_Intel_Phi_End))
     {
         if (!pVM->hm.s.fMdsClearOnSched)
@@ -753 +753 @@
         pVM->hm.s.fMdsClearOnVmEntry = false;
     }
-    else if (   pVM->cpum.ro.HostFeatures.enmMicroarch <  kCpumMicroarch_Intel_Core7_Nehalem
-             || pVM->cpum.ro.HostFeatures.enmMicroarch >= kCpumMicroarch_Intel_Core7_End)
+    else if (   g_CpumHostFeatures.s.enmMicroarch <  kCpumMicroarch_Intel_Core7_Nehalem
+             || g_CpumHostFeatures.s.enmMicroarch >= kCpumMicroarch_Intel_Core7_End)
         pVM->hm.s.fMdsClearOnSched = pVM->hm.s.fMdsClearOnVmEntry = false;