Changeset 87552 in vbox

Timestamp:

Feb 3, 2021 10:41:38 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HMVMX: Use g_uHmVmxHostMsrEfer instead of pVM->hm.s.vmx.u64HostMsrEfer in ring-0. bugref:9217

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMVMXR0.cpp (modified) (5 diffs)
• include/HMInternal.h (modified) (1 diff)

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

@@ -2472 +2472 @@
          */
         if (pHostMsrLoad[i].u32Msr == MSR_K6_EFER)
-            pHostMsrLoad[i].u64Value = pVCpu->CTX_SUFF(pVM)->hm.s.vmx.u64HostMsrEfer;
+            pHostMsrLoad[i].u64Value = g_uHmVmxHostMsrEfer;
         else
             pHostMsrLoad[i].u64Value = ASMRdMsr(pHostMsrLoad[i].u32Msr);
@@ -2710 +2710 @@
     {
         uint64_t const uHostEferMsr      = ASMRdMsr(MSR_K6_EFER);
-        uint64_t const uHostEferMsrCache = pVCpu->CTX_SUFF(pVM)->hm.s.vmx.u64HostMsrEfer;
+        uint64_t const uHostEferMsrCache = g_uHmVmxHostMsrEfer;
         uint64_t       uVmcsEferMsrVmcs;
         int rc = VMXReadVmcs64(VMX_VMCS64_HOST_EFER_FULL, &uVmcsEferMsrVmcs);
@@ -2778 +2778 @@
                              pHostMsrLoad->u32Msr, pHostMsrLoad->u64Value, u64HostMsr, cMsrs));
 
-        /* Verify that cached host EFER MSR matches what's loaded the CPU. */
+        /* Verify that cached host EFER MSR matches what's loaded on the CPU. */
         bool const fIsEferMsr = RT_BOOL(pHostMsrLoad->u32Msr == MSR_K6_EFER);
-        if (fIsEferMsr)
-        {
-            AssertMsgReturnVoid(u64HostMsr == pVCpu->CTX_SUFF(pVM)->hm.s.vmx.u64HostMsrEfer,
-                                ("Cached=%#RX64 ASMRdMsr=%#RX64 cMsrs=%u\n",
-                                 pVCpu->CTX_SUFF(pVM)->hm.s.vmx.u64HostMsrEfer, u64HostMsr, cMsrs));
-        }
+        AssertMsgReturnVoid(!fIsEferMsr || u64HostMsr == g_uHmVmxHostMsrEfer,
+                            ("Cached=%#RX64 ASMRdMsr=%#RX64 cMsrs=%u\n", g_uHmVmxHostMsrEfer, u64HostMsr, cMsrs));
 
         /* Verify that the accesses are as expected in the MSR bitmap for auto-load/store MSRs. */
@@ -4885 +4881 @@
     if (pVM->hm.s.vmx.fSupportsVmcsEfer)
     {
-        rc = VMXWriteVmcs64(VMX_VMCS64_HOST_EFER_FULL, pVM->hm.s.vmx.u64HostMsrEfer);
+        rc = VMXWriteVmcs64(VMX_VMCS64_HOST_EFER_FULL, g_uHmVmxHostMsrEfer);
         AssertRC(rc);
     }
@@ -4915 +4911 @@
     PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
-    uint64_t const u64HostEfer  = pVM->hm.s.vmx.u64HostMsrEfer;
+    uint64_t const u64HostEfer  = g_uHmVmxHostMsrEfer;
     uint64_t const u64GuestEfer = pCtx->msrEFER;
 

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

@@ -511 +511 @@
         uint32_t                    cPleWindowTicks;
 
-        /** Host CR4 value (set by ring-0 VMX init) */
+        /** Host CR4 value (set by ring-0 VMX init, for logging). */
         uint64_t                    u64HostCr4;
-        /** Host SMM monitor control (set by ring-0 VMX init) */
+        /** Host SMM monitor control (set by ring-0 VMX init, for logging). */
         uint64_t                    u64HostSmmMonitorCtl;
-        /** Host EFER value (set by ring-0 VMX init) */
+        /** 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. */