Changeset 42033 in vbox

Timestamp:

Jul 6, 2012 3:27:36 AM (13 years ago)

Author:

vboxsync

Message:

VMM: RDTSCP support bits.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMR3/HWACCM.cpp (modified) (1 diff)

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

@@ -1849 +1849 @@
         }
 
+        case CPUMCPUIDFEATURE_RDTSCP:
+        {
+            if (pVM->cpum.s.aGuestCpuIdExt[0].eax >= 0x80000001)
+                pVM->cpum.s.aGuestCpuIdExt[1].edx &= ~X86_CPUID_EXT_FEATURE_EDX_RDTSCP;
+            LogRel(("CPUMClearGuestCpuIdFeature: Disabled RDTSCP!\n"));
+            break;
+        }
+
         case CPUMCPUIDFEATURE_HVP:
             if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)

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

@@ -1123 +1123 @@
                 pVM->hwaccm.s.vmx.fVPID = pVM->hwaccm.s.vmx.fAllowVPID;
 
+            /*
+             * Disallow RDTSCP in the guest if there is no secondary process-based VM execution controls as otherwise
+             * RDTSCP would cause a #UD. There might be no CPUs out there where this happens, as RDTSCP was introduced
+             * in Nehalems and secondary VM exec. controls should be supported in all of them, but nonetheless it's Intel...
+             */
+            if (!(pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_SECONDARY_EXEC_CTRL)
+                && CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_RDTSCP))
+            {
+                CPUMClearGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_RDTSCP);
+            }
+
             /* Unrestricted guest execution relies on EPT. */
             if (    pVM->hwaccm.s.fNestedPaging