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

Timestamp:

Jul 30, 2018 3:19:54 PM (6 years ago)

Author:

vboxsync

Message:

VMM, CPUM: Nested VMX: bugref:9180 Implement Cr0Fixed[0|1] and Cr4Fixed[0|1] MSRs, nits.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (5 diffs)
• HMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

@@ -1295 +1295 @@
     if (pGuestFeatures->fVmx)
     {
-        *puValue = RT_BF_MAKE(VMX_BF_BASIC_VMCS_ID,       VMX_VMCS_REVISION_ID          )
+        *puValue = RT_BF_MAKE(VMX_BF_BASIC_VMCS_ID,       VMX_E_VMCS_REVISION_ID        )
                  | RT_BF_MAKE(VMX_BF_BASIC_DUAL_MON,      0                             )
                  | RT_BF_MAKE(VMX_BF_BASIC_VMCS_MEM_TYPE, VMX_BASIC_MEM_TYPE_WB         )
@@ -1437 +1437 @@
 static DECLCALLBACK(VBOXSTRICTRC) cpumMsrRd_Ia32VmxCr0Fixed0(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
 {
-    RT_NOREF_PV(pVCpu); RT_NOREF_PV(idMsr); RT_NOREF_PV(pRange);
-    *puValue = 0;
+    RT_NOREF_PV(idMsr); RT_NOREF_PV(pRange);
+    PCCPUMFEATURES pGuestFeatures = &pVCpu->CTX_SUFF(pVM)->cpum.s.GuestFeatures;
+    if (pGuestFeatures->fVmx)
+        *puValue = VMX_E_CR0_FIXED0;
+    else
+        *puValue = 0;
     return VINF_SUCCESS;
 }
@@ -1446 +1450 @@
 static DECLCALLBACK(VBOXSTRICTRC) cpumMsrRd_Ia32VmxCr0Fixed1(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
 {
-    RT_NOREF_PV(pVCpu); RT_NOREF_PV(idMsr); RT_NOREF_PV(pRange);
-    *puValue = 0;
+    RT_NOREF_PV(pRange);
+    PCCPUMFEATURES pGuestFeatures = &pVCpu->CTX_SUFF(pVM)->cpum.s.GuestFeatures;
+    if (pGuestFeatures->fVmx)
+    {
+        int rc = HMVmxGetHostMsr(pVCpu->CTX_SUFF(pVM), idMsr, puValue);
+        AssertRCReturn(rc, rc);
+        *puValue |= VMX_E_CR0_FIXED0;   /* Make sure the CR0 MB1 bits are not clear. */
+    }
+    else
+        *puValue = 0;
     return VINF_SUCCESS;
 }
@@ -1455 +1467 @@
 static DECLCALLBACK(VBOXSTRICTRC) cpumMsrRd_Ia32VmxCr4Fixed0(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
 {
-    RT_NOREF_PV(pVCpu); RT_NOREF_PV(idMsr); RT_NOREF_PV(pRange);
-    *puValue = 0;
+    RT_NOREF_PV(idMsr); RT_NOREF_PV(pRange);
+    PCCPUMFEATURES pGuestFeatures = &pVCpu->CTX_SUFF(pVM)->cpum.s.GuestFeatures;
+    if (pGuestFeatures->fVmx)
+        *puValue = VMX_E_CR4_FIXED0;
+    else
+        *puValue = 0;
     return VINF_SUCCESS;
 }
@@ -1464 +1480 @@
 static DECLCALLBACK(VBOXSTRICTRC) cpumMsrRd_Ia32VmxCr4Fixed1(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
 {
-    RT_NOREF_PV(pVCpu); RT_NOREF_PV(idMsr); RT_NOREF_PV(pRange);
-    *puValue = 0;
+    RT_NOREF_PV(pRange);
+    PCCPUMFEATURES pGuestFeatures = &pVCpu->CTX_SUFF(pVM)->cpum.s.GuestFeatures;
+    if (pGuestFeatures->fVmx)
+    {
+        int rc = HMVmxGetHostMsr(pVCpu->CTX_SUFF(pVM), idMsr, puValue);
+        AssertRCReturn(rc, rc);
+        *puValue |= VMX_E_CR4_FIXED0;   /* Make sure the CR4 MB1 bits are not clear. */
+    }
+    else
+        *puValue = 0;
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -581 +581 @@
 
 
-#if 0 /** @todo Update comment hm_vmx.h VMXMSRS struct if this is removed. */
 /**
  * Gets the specified VMX host MSR that was read by HM during ring-0
@@ -633 +632 @@
     return VINF_SUCCESS;
 }
-#endif