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

Timestamp:

May 14, 2019 4:46:15 AM (6 years ago)

Author:

vboxsync

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

130527

Message:

VMM/IEM: Nested VMX: bugref:9180 Fix RDTSCP VM-exit. We have to first check if RDTSCP is enabled in VMX non-root mode and then check the intercept before applying TSC offsetting (if supported).

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (2 diffs)

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

@@ -6613 +6613 @@
         return iemRaiseUndefinedOpcode(pVCpu);
 
+    if (    IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
+        && !IEM_VMX_IS_PROCCTLS2_SET(pVCpu, VMX_PROC_CTLS2_RDTSCP))
+    {
+        Log(("rdtscp: Not enabled for VMX non-root mode -> #UD\n"));
+        return iemRaiseUndefinedOpcode(pVCpu);
+    }
+
     if (pVCpu->iem.s.uCpl != 0)
     {
@@ -6624 +6631 @@
 
     if (   IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
-        && IEM_VMX_IS_PROCCTLS2_SET(pVCpu, VMX_PROC_CTLS2_RDTSCP))
+        && IEM_VMX_IS_PROCCTLS_SET(pVCpu, VMX_PROC_CTLS_RDTSC_EXIT))
     {
         Log(("rdtscp: Guest intercept -> VM-exit\n"));