Changeset 107762 in vbox for trunk

Timestamp:

Jan 14, 2025 4:10:51 PM (4 weeks ago)

Author:

vboxsync

Message:

VMM/CPUM: Pass thru more MSR_IA32_SPEC_CTRL related stuff to the guest. [bugfix] jiraref:VBP-947

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp (modified) (1 diff)

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

@@ -1636 +1636 @@
 
     /* NB: The STIBP bit can be set even when IBRS is present, regardless of whether STIBP is actually implemented. */
-    if (uValue & ~(MSR_IA32_SPEC_CTRL_F_IBRS | MSR_IA32_SPEC_CTRL_F_STIBP))
+    PCPUMFEATURES const pFeatures = &pVCpu->CTX_SUFF(pVM)->cpum.s.GuestFeatures;
+    uint64_t const fValidMask = (pFeatures->fIbrs      ? MSR_IA32_SPEC_CTRL_F_IBRS : 0)
+                              | (pFeatures->fStibp     ? MSR_IA32_SPEC_CTRL_F_STIBP : 0)
+                              | (pFeatures->fSsbd      ? MSR_IA32_SPEC_CTRL_F_SSBD : 0)
+                              | (pFeatures->fIpredCtrl ? MSR_IA32_SPEC_CTRL_F_IPRED_DIS_U | MSR_IA32_SPEC_CTRL_F_IPRED_DIS_S : 0)
+                              | (pFeatures->fRrsbaCtrl ? MSR_IA32_SPEC_CTRL_F_RRSBA_DIS_U | MSR_IA32_SPEC_CTRL_F_RRSBA_DIS_S : 0)
+                              | (pFeatures->fPsfd      ? MSR_IA32_SPEC_CTRL_F_PSFD : 0)
+                              | (pFeatures->fDdpdU     ? MSR_IA32_SPEC_CTRL_F_DDPD_U : 0)
+                              | (pFeatures->fBhiCtrl   ? MSR_IA32_SPEC_CTRL_F_BHI_DIS_S : 0);
+    if (uValue & ~fValidMask)
     {
         Log(("CPUM: Invalid IA32_SPEC_CTRL bits (trying to write %#llx)\n", uValue));