Changeset 87556 in vbox

Timestamp:

Feb 3, 2021 11:02:09 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HMVMX: Copied fSupportsVmcsEfer from HM::vmxUse to g_fHmVmxSupportsVmcsEfer in ring-0. bugref:9217

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0.cpp (modified) (3 diffs)
• VMMR0/HMVMXR0.cpp (modified) (6 diffs)
• VMMR3/HM.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (4 diffs)

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

@@ -113 +113 @@
 /** Set if VT-x (VMX) is supported by the CPU. */
 bool                    g_fHmVmxSupported = false;
-/** Whether we're using the preemption timer or not. */
+/** VMX: Whether we're using the preemption timer or not. */
 bool                    g_fHmVmxUsePreemptTimer;
-/** The shift mask employed by the VMX-Preemption timer. */
+/** VMX: The shift mask employed by the VMX-Preemption timer. */
 uint8_t                 g_cHmVmxPreemptTimerShift;
-/** Whether we're using SUPR0EnableVTx or not. */
+/** VMX: Set if swapping EFER is supported.  */
+bool                    g_fHmVmxSupportsVmcsEfer = false;
+/** VMX: Whether we're using SUPR0EnableVTx or not. */
 static bool             g_fHmVmxUsingSUPR0EnableVTx = false;
-/** Set if we've called SUPR0EnableVTx(true) and should disable it during
+/** VMX: Set if we've called SUPR0EnableVTx(true) and should disable it during
  * module termination. */
 static bool             g_fHmVmxCalledSUPR0EnableVTx = false;
-/** Host CR4 value (set by ring-0 VMX init) */
+/** VMX: Host CR4 value (set by ring-0 VMX init) */
 uint64_t                g_uHmVmxHostCr4;
-/** Host EFER value (set by ring-0 VMX init) */
+/** VMX: Host EFER value (set by ring-0 VMX init) */
 uint64_t                g_uHmVmxHostMsrEfer;
-/** Host SMM monitor control (used for logging/diagnostics) */
+/** VMX: Host SMM monitor control (used for logging/diagnostics) */
 uint64_t                g_uHmVmxHostSmmMonitorCtl;
 
@@ -487 +489 @@
                         g_cHmVmxPreemptTimerShift = 0; /* This is about right most of the time here. */
                 }
+                else
+                    g_fHmVmxUsePreemptTimer   = false;
+
+                /*
+                 * Check for EFER swapping support.
+                 */
+                g_fHmVmxSupportsVmcsEfer = (g_HmMsrs.u.vmx.EntryCtls.n.allowed1 & VMX_ENTRY_CTLS_LOAD_EFER_MSR)
+                                        && (g_HmMsrs.u.vmx.ExitCtls.n.allowed1  & VMX_EXIT_CTLS_LOAD_EFER_MSR)
+                                        && (g_HmMsrs.u.vmx.ExitCtls.n.allowed1  & VMX_EXIT_CTLS_SAVE_EFER_MSR);
             }
             else
@@ -1182 +1193 @@
 
         /* Use the VMCS controls for swapping the EFER MSR if supported. */
-        Assert(!pVM->hm.s.vmx.fSupportsVmcsEfer);
-        if (   (g_HmMsrs.u.vmx.EntryCtls.n.allowed1 & VMX_ENTRY_CTLS_LOAD_EFER_MSR)
-            && (g_HmMsrs.u.vmx.ExitCtls.n.allowed1  & VMX_EXIT_CTLS_LOAD_EFER_MSR)
-            && (g_HmMsrs.u.vmx.ExitCtls.n.allowed1  & VMX_EXIT_CTLS_SAVE_EFER_MSR))
-            pVM->hm.s.vmx.fSupportsVmcsEfer = true;
+        pVM->hm.s.vmx.fSupportsVmcsEferForRing3 = g_fHmVmxSupportsVmcsEfer;
 
 #if 0

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

@@ -4879 +4879 @@
      * done as part of auto-load/store MSR area in the VMCS, see hmR0VmxExportGuestMsrs().
      */
-    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
-    if (pVM->hm.s.vmx.fSupportsVmcsEfer)
+    if (g_fHmVmxSupportsVmcsEfer)
     {
         rc = VMXWriteVmcs64(VMX_VMCS64_HOST_EFER_FULL, g_uHmVmxHostMsrEfer);
@@ -5036 +5035 @@
              * of the VM-entry MSR load area.
              */
-            if (   pVM->hm.s.vmx.fSupportsVmcsEfer
+            if (   g_fHmVmxSupportsVmcsEfer
                 && hmR0VmxShouldSwapEferMsr(pVCpu, pVmxTransient))
                 fVal |= VMX_ENTRY_CTLS_LOAD_EFER_MSR;
@@ -5103 +5102 @@
              * used the "load IA32_EFER" control while exporting VM-entry controls.
              */
-            if (   pVM->hm.s.vmx.fSupportsVmcsEfer
+            if (   g_fHmVmxSupportsVmcsEfer
                 && hmR0VmxShouldSwapEferMsr(pVCpu, pVmxTransient))
             {
@@ -6796 +6795 @@
              * but to use the auto-load store MSR area in the VMCS for swapping EFER. See @bugref{7368}.
              */
-            if (pVM->hm.s.vmx.fSupportsVmcsEfer)
+            if (g_fHmVmxSupportsVmcsEfer)
             {
                 int rc = VMXWriteVmcs64(VMX_VMCS64_GUEST_EFER_FULL, uGuestEferMsr);
@@ -6814 +6813 @@
             Log4Func(("efer=%#RX64 shadow=%#RX64\n", uGuestEferMsr, pCtx->msrEFER));
         }
-        else if (!pVM->hm.s.vmx.fSupportsVmcsEfer)
+        else if (!g_fHmVmxSupportsVmcsEfer)
             hmR0VmxRemoveAutoLoadStoreMsr(pVCpu, pVmxTransient, MSR_K6_EFER);
 
@@ -9849 +9848 @@
         if (pVmcsInfo->u32EntryCtls & VMX_ENTRY_CTLS_LOAD_EFER_MSR)
         {
-            Assert(pVM->hm.s.vmx.fSupportsVmcsEfer);
+            Assert(g_fHmVmxSupportsVmcsEfer);
             rc = VMXReadVmcs64(VMX_VMCS64_GUEST_EFER_FULL, &u64Val);
             AssertRC(rc);

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

@@ -1662 +1662 @@
     }
 
-    LogRel(("HM: Supports VMCS EFER fields         = %RTbool\n", pVM->hm.s.vmx.fSupportsVmcsEfer));
+    LogRel(("HM: Supports VMCS EFER fields         = %RTbool\n", pVM->hm.s.vmx.fSupportsVmcsEferForRing3));
     LogRel(("HM: Enabled VMX\n"));
     pVM->hm.s.vmx.fEnabled = true;

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

@@ -503 +503 @@
         /** The shift mask employed by the VMX-Preemption timer (set by ring-0). */
         uint8_t                     cPreemptTimerShift;
-        /** Padding. */
-        bool                        afPadding0[1];
+        bool                        fAlignment1;
 
         /** Pause-loop exiting (PLE) gap in ticks. */
@@ -517 +516 @@
         /** Host EFER value (set by ring-0 VMX init, for logging and guest NX). */
         uint64_t                    u64HostMsrEfer;
-        /** Whether the CPU supports VMCS fields for swapping EFER. */
-        bool                        fSupportsVmcsEfer;
+        /** Whether the CPU supports VMCS fields for swapping EFER (set by ring-0 VMX
+         *  init, for logging). */
+        bool                        fSupportsVmcsEferForRing3;
         /** Whether to use VMCS shadowing. */
         bool                        fUseVmcsShadowing;
         /** Set if Last Branch Record (LBR) is enabled. */
         bool                        fLbr;
-        uint8_t                     u8Alignment2[5];
+        bool                        fAlignment2;
+
+        /** The host LBR TOS (top-of-stack) MSR id. */
+        uint32_t                    idLbrTosMsr;
 
         /** The first valid host LBR branch-from-IP stack range. */
@@ -534 +537 @@
         /** The last valid host LBR branch-to-IP stack range. */
         uint32_t                    idLbrToIpMsrLast;
-
-        /** The host LBR TOS (top-of-stack) MSR id. */
-        uint32_t                    idLbrTosMsr;
-        /** Padding. */
-        uint32_t                    u32Alignment1;
 
         /** Host-physical address for a failing VMXON instruction (for diagnostics, ring-3). */
@@ -1456 +1454 @@
 extern bool             g_fHmVmxUsePreemptTimer;
 extern uint8_t          g_cHmVmxPreemptTimerShift;
+extern bool             g_fHmVmxSupportsVmcsEfer;
 extern uint64_t         g_uHmVmxHostCr4;
 extern uint64_t         g_uHmVmxHostMsrEfer;