Changeset 102987 in vbox

Timestamp:

Jan 22, 2024 10:07:42 AM (15 months ago)

Author:

vboxsync

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

161219

Message:

VMM/HM: Nested VMX: bugref:10318 Log host CR0 and a couple of MSRs for split-lock disable status.

Location:

trunk/src/VBox/VMM

Files:

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

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

@@ -134 +134 @@
  * module termination. */
 static bool             g_fHmVmxCalledSUPR0EnableVTx = false;
+/** VMX: Host CR0 value (set by ring-0 VMX init) */
+uint64_t                g_uHmVmxHostCr0;
 /** VMX: Host CR4 value (set by ring-0 VMX init) */
 uint64_t                g_uHmVmxHostCr4;
@@ -140 +142 @@
 /** VMX: Host SMM monitor control (used for logging/diagnostics) */
 uint64_t                g_uHmVmxHostSmmMonitorCtl;
+/** VMX: Host core capabilities (set by ring-0 VMX init) */
+uint64_t                g_uHmVmxHostCoreCap;
+/** VMX: Host memory control register (set by ring-0 VMX init) */
+uint64_t                g_uHmVmxHostMemoryCtrl;
 
 
@@ -460 +466 @@
     {
         /* Read CR4 and EFER for logging/diagnostic purposes. */
+        g_uHmVmxHostCr0     = ASMGetCR0();
         g_uHmVmxHostCr4     = ASMGetCR4();
         g_uHmVmxHostMsrEfer = ASMRdMsr(MSR_K6_EFER);
@@ -474 +481 @@
         if (RT_BF_GET(uVmxBasicMsr, VMX_BF_BASIC_DUAL_MON))
             g_uHmVmxHostSmmMonitorCtl = ASMRdMsr(MSR_IA32_SMM_MONITOR_CTL);
+
+        /*
+         * Host core and memory capabilities MSRs.
+         * Primarily for logging split-lock disable status.
+         */
+        uint32_t uDummy, uStdExtFeatEdx;
+        ASMCpuId_Idx_ECX(7, 0, &uDummy, &uDummy, &uDummy, &uStdExtFeatEdx);
+        if (uStdExtFeatEdx & X86_CPUID_STEXT_FEATURE_EDX_CORECAP)
+        {
+            g_uHmVmxHostCoreCap = ASMRdMsr(MSR_IA32_CORE_CAPABILITIES);
+            if (g_uHmVmxHostCoreCap & MSR_IA32_CORE_CAP_SPLIT_LOCK_DISABLE)
+                g_uHmVmxHostMemoryCtrl = ASMRdMsr(MSR_MEMORY_CTRL);
+        }
 
         /* Initialize VPID - 16 bits ASID. */
@@ -1233 +1253 @@
         pVM->hm.s.vmx.fUsePreemptTimerCfg           = pVM->hmr0.s.vmx.fUsePreemptTimer;
         pVM->hm.s.vmx.cPreemptTimerShift            = g_cHmVmxPreemptTimerShift;
+        pVM->hm.s.ForR3.vmx.u64HostCr0              = g_uHmVmxHostCr0;
         pVM->hm.s.ForR3.vmx.u64HostCr4              = g_uHmVmxHostCr4;
         pVM->hm.s.ForR3.vmx.u64HostMsrEfer          = g_uHmVmxHostMsrEfer;
         pVM->hm.s.ForR3.vmx.u64HostSmmMonitorCtl    = g_uHmVmxHostSmmMonitorCtl;
+        pVM->hm.s.ForR3.vmx.u64HostCoreCap          = g_uHmVmxHostCoreCap;
+        pVM->hm.s.ForR3.vmx.u64HostMemoryCtrl       = g_uHmVmxHostMemoryCtrl;
         pVM->hm.s.ForR3.vmx.u64HostFeatCtrl         = g_HmMsrs.u.vmx.u64FeatCtrl;
         HMGetVmxMsrsFromHwvirtMsrs(&g_HmMsrs, &pVM->hm.s.ForR3.vmx.Msrs);

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

@@ -1638 +1638 @@
     LogRel(("HM: Using VT-x implementation 3.0\n"));
     LogRel(("HM: Max resume loops                  = %u\n",     pVM->hm.s.cMaxResumeLoopsCfg));
+    LogRel(("HM: Host CR0                          = %#RX64\n", pVM->hm.s.ForR3.vmx.u64HostCr0));
     LogRel(("HM: Host CR4                          = %#RX64\n", pVM->hm.s.ForR3.vmx.u64HostCr4));
     LogRel(("HM: Host EFER                         = %#RX64\n", pVM->hm.s.ForR3.vmx.u64HostMsrEfer));
-    LogRel(("HM: MSR_IA32_SMM_MONITOR_CTL          = %#RX64\n", pVM->hm.s.ForR3.vmx.u64HostSmmMonitorCtl));
+    LogRel(("HM: Host SMM_MONITOR_CTL              = %#RX64\n", pVM->hm.s.ForR3.vmx.u64HostSmmMonitorCtl));
+    LogRel(("HM: Host CORE_CAPABILITIES            = %#RX64\n", pVM->hm.s.ForR3.vmx.u64HostCoreCap));
+    LogRel(("HM: Host MEMORY_CTRL                  = %#RX64%s\n", pVM->hm.s.ForR3.vmx.u64HostMemoryCtrl,
+            pVM->hm.s.ForR3.vmx.u64HostMemoryCtrl & MSR_MEMORY_CTRL_SPLIT_LOCK_DISABLE ? " - split-lock disable!" : ""));
     LogRel(("HM: Host DR6 zero'ed                  = %#RX64%s\n", pVM->hm.s.ForR3.vmx.u64HostDr6Zeroed,
             pVM->hm.s.ForR3.vmx.fAlwaysInterceptMovDRx ? " - always intercept MOV DRx" : ""));

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

@@ -372 +372 @@
             bool                        fAlwaysInterceptMovDRx;
 
+            /** Host CR0 value (set by ring-0 VMX init, for logging). */
+            uint64_t                    u64HostCr0;
             /** Host CR4 value (set by ring-0 VMX init, for logging). */
             uint64_t                    u64HostCr4;
@@ -380 +382 @@
             /** Host IA32_FEATURE_CONTROL MSR (set by ring-0 VMX init, for logging). */
             uint64_t                    u64HostFeatCtrl;
+            /** Host IA32_CORE_CAPABILITIES MSR (set by ring-0 VMX init, for logging). */
+            uint64_t                    u64HostCoreCap;
+            /** Host MSR_MEMORY_CTRL MSR (set by ring-0 VMX init, for logging). */
+            uint64_t                    u64HostMemoryCtrl;
+
             /** Host zero'ed DR6 value (set by ring-0 VMX init, for logging). */
             uint64_t                    u64HostDr6Zeroed;
@@ -1186 +1193 @@
 extern uint8_t          g_cHmVmxPreemptTimerShift;
 extern bool             g_fHmVmxSupportsVmcsEfer;
+extern uint64_t         g_uHmVmxHostCr0;
 extern uint64_t         g_uHmVmxHostCr4;
 extern uint64_t         g_uHmVmxHostMsrEfer;
 extern uint64_t         g_uHmVmxHostSmmMonitorCtl;
+extern uint64_t         g_uHmVmxHostCoreCap;
+extern uint64_t         g_uHmVmxHostMemoryCtrl;
 extern bool             g_fHmSvmSupported;
 extern uint32_t         g_uHmSvmRev;