Changeset 78493 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

May 14, 2019 5:46:35 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 rdmsr, wrmsr VM-exit handling.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

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

@@ -12596 +12596 @@
         case VMX_EXIT_TASK_SWITCH:
         case VMX_EXIT_PREEMPT_TIMER:
+
         case VMX_EXIT_RDMSR:
+        {
+            uint32_t fMsrpm;
+            if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_USE_MSR_BITMAPS))
+                fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), pVCpu->cpum.GstCtx.ecx);
+            else
+                fMsrpm = VMXMSRPM_EXIT_RD;
+
+            if (fMsrpm & VMXMSRPM_EXIT_RD)
+            {
+                int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+                AssertRCReturn(rc, rc);
+                rcStrict = IEMExecVmxVmexitInstr(pVCpu, uExitReason, pVmxTransient->cbInstr);
+            }
+            else
+                rcStrict = hmR0VmxExitRdmsr(pVCpu, pVmxTransient);
+            break;
+        }
+
         case VMX_EXIT_WRMSR:
+        {
+            uint32_t fMsrpm;
+            if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_USE_MSR_BITMAPS))
+                fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), pVCpu->cpum.GstCtx.ecx);
+            else
+                fMsrpm = VMXMSRPM_EXIT_WR;
+
+            if (fMsrpm & VMXMSRPM_EXIT_WR)
+            {
+                int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+                AssertRCReturn(rc, rc);
+                rcStrict = IEMExecVmxVmexitInstr(pVCpu, uExitReason, pVmxTransient->cbInstr);
+            }
+            else
+                rcStrict = hmR0VmxExitWrmsr(pVCpu, pVmxTransient);
+            break;
+        }
+
         case VMX_EXIT_VMCALL:
         case VMX_EXIT_MOV_DRX: