Changeset 91323 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 22, 2021 10:04:56 AM (3 years ago)

Author:

vboxsync

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

146984

Message:

VMM: bugref:10106 Fixed IA32_FEATURE_CONTROL MSR reported to the guest.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (2 diffs)
• HMAll.cpp (modified) (1 diff)
• IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)

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

@@ -236 +236 @@
 }
 
+/**
+ * Get IA32_FEATURE_CONTROL value for IEM, NEM and cpumMsrRd_Ia32FeatureControl.
+ *
+ * @returns IA32_FEATURE_CONTROL value.
+ * @param   pVCpu           The cross context per CPU structure.
+ */
+VMM_INT_DECL(uint64_t) CPUMGetGuestIa32FeatCtrl(PCVMCPUCC pVCpu)
+{
+    uint64_t uFeatCtrlMsr = MSR_IA32_FEATURE_CONTROL_LOCK;
+    if (pVCpu->CTX_SUFF(pVM)->cpum.s.GuestFeatures.fVmx)
+        uFeatCtrlMsr |= MSR_IA32_FEATURE_CONTROL_VMXON;
+    return uFeatCtrlMsr;
+}
+
 
 /** @callback_method_impl{FNCPUMRDMSR} */
@@ -241 +255 @@
 {
     RT_NOREF_PV(idMsr); RT_NOREF_PV(pRange);
-    *puValue = pVCpu->cpum.s.Guest.hwvirt.vmx.Msrs.u64FeatCtrl;
+    *puValue = CPUMGetGuestIa32FeatCtrl(pVCpu);
     return VINF_SUCCESS;
 }

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

@@ -821 +821 @@
     AssertReturnVoid(pHwvirtMsrs);
     AssertReturnVoid(pVmxMsrs);
-    pVmxMsrs->u64FeatCtrl      = pHwvirtMsrs->u.vmx.u64FeatCtrl;
     pVmxMsrs->u64Basic         = pHwvirtMsrs->u.vmx.u64Basic;
     pVmxMsrs->PinCtls.u        = pHwvirtMsrs->u.vmx.PinCtls.u;

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -8495 +8495 @@
 
         /* Feature control MSR's LOCK and VMXON bits. */
-        uint64_t const uMsrFeatCtl = pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.u64FeatCtrl;
+        uint64_t const uMsrFeatCtl = CPUMGetGuestIa32FeatCtrl(pVCpu);
         if ((uMsrFeatCtl & (MSR_IA32_FEATURE_CONTROL_LOCK | MSR_IA32_FEATURE_CONTROL_VMXON))
                         == (MSR_IA32_FEATURE_CONTROL_LOCK | MSR_IA32_FEATURE_CONTROL_VMXON))