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

Timestamp:

May 29, 2019 8:27:00 AM (6 years ago)

Author:

vboxsync

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

130937

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 RDPMC VM-exit handling.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -423 +423 @@
 //static FNVMXEXITHANDLERNSRC        hmR0VmxExitInvd;
 static FNVMXEXITHANDLER            hmR0VmxExitInvlpgNested;
-//static FNVMXEXITHANDLER            hmR0VmxExitRdpmc;
+static FNVMXEXITHANDLER            hmR0VmxExitRdpmcNested;
 //static FNVMXEXITHANDLER            hmR0VmxExitVmcall;
 //static FNVMXEXITHANDLER            hmR0VmxExitVmclear;
@@ -12695 +12695 @@
         case VMX_EXIT_LDTR_TR_ACCESS:   return hmR0VmxExitXdtrAccessNested(pVCpu, pVmxTransient);
 
-        case VMX_EXIT_RDPMC:
+        case VMX_EXIT_RDPMC:            return hmR0VmxExitRdpmcNested(pVCpu, pVmxTransient);
         case VMX_EXIT_VMREAD:
         case VMX_EXIT_VMWRITE:
@@ -15848 +15848 @@
 
 /**
+ * Nested-guest VM-exit handler for RDPMC (VMX_EXIT_RDPMC). Conditional VM-exit.
+ */
+HMVMX_EXIT_DECL hmR0VmxExitRdpmcNested(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
+{
+    HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
+
+    if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_RDPMC_EXIT))
+    {
+        int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+        AssertRCReturn(rc, rc);
+        return IEMExecVmxVmexitInstr(pVCpu, pVmxTransient->uExitReason, pVmxTransient->cbInstr);
+    }
+    return hmR0VmxExitRdpmc(pVCpu, pVmxTransient);
+}
+
+
+/**
  * Nested-guest VM-exit handler for RDTSC (VMX_EXIT_RDTSC). Conditional VM-exit.
  */