Changeset 87532 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 2, 2021 11:56:56 AM (4 years ago)

Author:

vboxsync

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

142558

Message:

VMM/HM: Moving the g_HmR0.hwvirt.svm.fSupported and g_HmR0.hwvirt.vmx.fSupported member out of the struct an into separate variables. bugref:9217

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0.cpp (modified) (23 diffs)
• include/HMInternal.h (modified) (3 diffs)

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

@@ -118 +118 @@
                 /** The shift mask employed by the VMX-Preemption timer. */
                 uint8_t                     cPreemptTimerShift;
-                /** Padding. */
-                uint8_t                     abPadding[3];
                 /** Whether we're using the preemption timer or not. */
                 bool                        fUsePreemptTimer;
@@ -127 +125 @@
                  * module termination. */
                 bool                        fCalledSUPR0EnableVTx;
-                /** Set to by us to indicate VMX is supported by the CPU. */
-                bool                        fSupported;
             } vmx;
 
@@ -138 +134 @@
                 /** SVM feature bits from cpuid 0x8000000a */
                 uint32_t                    u32Features;
-                /** Padding. */
-                bool                        afPadding[3];
-                /** Set by us to indicate SVM is supported by the CPU. */
-                bool                        fSupported;
             } svm;
         } u;
@@ -167 +159 @@
 } g_HmR0;
 
+
+/** Set if VT-x (VMX) is supported by the CPU. */
+bool        g_fHmVmxSupported = false;
+/** Set if AMD-V is supported by the CPU. */
+bool        g_fHmSvmSupported = false;
 /** Maximum allowed ASID/VPID (inclusive).
  * @todo r=bird: This is exclusive for VT-x according to source code comment.
@@ -316 +313 @@
         if (RT_SUCCESS(rc))
         {
-            g_HmR0.hwvirt.u.vmx.fSupported = true;
+            g_fHmVmxSupported = true;
             rc = SUPR0EnableVTx(false /* fEnable */);
             AssertLogRelRC(rc);
@@ -386 +383 @@
             if (RT_SUCCESS(rc))
             {
-                g_HmR0.hwvirt.u.vmx.fSupported = true;
+                g_fHmVmxSupported = true;
                 VMXDisable();
             }
@@ -403 +400 @@
                  */
                 g_HmR0.rcInit = VERR_VMX_IN_VMX_ROOT_MODE;
-                Assert(g_HmR0.hwvirt.u.vmx.fSupported == false);
+                Assert(g_fHmVmxSupported == false);
             }
 
@@ -416 +413 @@
         }
 
-        if (g_HmR0.hwvirt.u.vmx.fSupported)
+        if (g_fHmVmxSupported)
         {
             rc = VMXR0GlobalInit();
@@ -510 +507 @@
     {
         SUPR0GetHwvirtMsrs(&g_HmR0.hwvirt.Msrs, SUPVTCAPS_AMD_V, false /* fForce */);
-        g_HmR0.hwvirt.u.svm.fSupported = true;
+        g_fHmSvmSupported = true;
     }
     else
@@ -562 +559 @@
     /* Default is global VT-x/AMD-V init. */
     g_HmR0.fGlobalInit         = true;
+
+    g_fHmVmxSupported  = false;
+    g_fHmSvmSupported  = false;
+    g_uHmMaxAsid       = 0;
 
     /*
@@ -623 +624 @@
 {
     int rc;
-    if (   g_HmR0.hwvirt.u.vmx.fSupported
+    if (   g_fHmVmxSupported
         && g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx)
     {
@@ -647 +648 @@
     else
     {
-        Assert(!g_HmR0.hwvirt.u.vmx.fSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
+        Assert(!g_fHmVmxSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
 
         /* Doesn't really matter if this fails. */
@@ -694 +695 @@
      *        should move into their respective modules. */
     /* Finally, call global VT-x/AMD-V termination. */
-    if (g_HmR0.hwvirt.u.vmx.fSupported)
+    if (g_fHmVmxSupported)
         VMXR0GlobalTerm();
-    else if (g_HmR0.hwvirt.u.svm.fSupported)
+    else if (g_fHmSvmSupported)
         SVMR0GlobalTerm();
 
@@ -765 +766 @@
 
     int rc;
-    if (   g_HmR0.hwvirt.u.vmx.fSupported
+    if (   g_fHmVmxSupported
         && g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx)
         rc = g_HmR0.pfnEnableCpu(pHostCpu, pVM, NULL /* pvCpuPage */, NIL_RTHCPHYS, true, &g_HmR0.hwvirt.Msrs);
@@ -838 +839 @@
 
     int rc;
-    if (   g_HmR0.hwvirt.u.vmx.fSupported
+    if (   g_fHmVmxSupported
         && g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx)
     {
@@ -942 +943 @@
     PHMPHYSCPU pHostCpu = &g_HmR0.aCpuInfo[idCpu];
 
-    Assert(!g_HmR0.hwvirt.u.vmx.fSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
+    Assert(!g_fHmVmxSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
@@ -1011 +1012 @@
 {
     NOREF(pvData);
-    Assert(!g_HmR0.hwvirt.u.vmx.fSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
+    Assert(!g_fHmVmxSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
 
     /*
@@ -1052 +1053 @@
 {
     NOREF(pvUser);
-    Assert(!g_HmR0.hwvirt.u.vmx.fSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
+    Assert(!g_fHmVmxSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
 
 #ifdef LOG_ENABLED
@@ -1084 +1085 @@
             /* Reinit the CPUs from scratch as the suspend state might have
                messed with the MSRs. (lousy BIOSes as usual) */
-            if (g_HmR0.hwvirt.u.vmx.fSupported)
+            if (g_fHmVmxSupported)
                 rc = RTMpOnAll(hmR0InitIntelCpu, &FirstRc, NULL);
             else
@@ -1313 +1314 @@
     if (!g_HmR0.fGlobalInit)
     {
-        Assert(!g_HmR0.hwvirt.u.vmx.fSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
+        Assert(!g_fHmVmxSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
         rc = hmR0EnableCpu(pVM, idCpu);
         if (RT_FAILURE(rc))
@@ -1328 +1329 @@
     if (!g_HmR0.fGlobalInit)
     {
-        Assert(!g_HmR0.hwvirt.u.vmx.fSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
+        Assert(!g_fHmVmxSupported || !g_HmR0.hwvirt.u.vmx.fUsingSUPR0EnableVTx);
         int rc2 = hmR0DisableCpu(idCpu);
         AssertRC(rc2);
@@ -1381 +1382 @@
 
     /* Reload host-state (back from ring-3/migrated CPUs) and shared guest/host bits. */
-    if (g_HmR0.hwvirt.u.vmx.fSupported)
+    if (g_fHmVmxSupported)
         pVCpu->hm.s.fCtxChanged |= HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_HOST_GUEST_SHARED_STATE;
     else
@@ -1410 +1411 @@
     if (RT_SUCCESS(rc))
     {
-        if (g_HmR0.hwvirt.u.vmx.fSupported)
-        {
-            Assert((pVCpu->hm.s.fCtxChanged & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_HOST_GUEST_SHARED_STATE))
-                                           == (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_HOST_GUEST_SHARED_STATE));
-        }
+        if (g_fHmVmxSupported)
+            Assert(   (pVCpu->hm.s.fCtxChanged & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_HOST_GUEST_SHARED_STATE))
+                   ==                            (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_HOST_GUEST_SHARED_STATE));
         else
-        {
-            Assert((pVCpu->hm.s.fCtxChanged & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_SVM_HOST_GUEST_SHARED_STATE))
-                                           == (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_SVM_HOST_GUEST_SHARED_STATE));
-        }
+            Assert(   (pVCpu->hm.s.fCtxChanged & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_SVM_HOST_GUEST_SHARED_STATE))
+                   ==                            (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_SVM_HOST_GUEST_SHARED_STATE));
 
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE

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

@@ -548 +548 @@
         uint32_t                    u32Alignment1;
 
-        /** Host-physical address for a failing VMXON instruction. */
+        /** Host-physical address for a failing VMXON instruction (diagnostics). */
         RTHCPHYS                    HCPhysVmxEnableError;
 
@@ -578 +578 @@
         uint8_t                     u8Alignment0[2];
 
-        /* HWCR MSR (for diagnostics) */
+        /** HWCR MSR (for diagnostics). */
         uint64_t                    u64MsrHwcr;
 
@@ -1443 +1443 @@
 
 #ifdef IN_RING0
+extern bool     g_fHmVmxSupported;
+extern bool     g_fHmSvmSupported;
 extern uint32_t g_uHmMaxAsid;