Changeset 78622 in vbox for trunk/src/VBox

Timestamp:

May 21, 2019 9:03:53 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 hlt, invlpg, wbinvd, invpcid VM-exit handling.

File:

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

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

@@ -12577 +12577 @@
         }
 
+        case VMX_EXIT_HLT:
+        {
+            int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+            AssertRCReturn(rc, rc);
+            if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_HLT_EXIT))
+                rcStrict = IEMExecVmxVmexitInstr(pVCpu, uExitReason, pVmxTransient->cbInstr);
+            else
+                rcStrict = hmR0VmxExitHlt(pVCpu, pVmxTransient);
+            break;
+        }
+
         case VMX_EXIT_RDTSC:
         {
@@ -12652 +12663 @@
         }
 
+        case VMX_EXIT_INVLPG:
+        {
+            if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INVLPG_EXIT))
+            {
+                int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+                rc    |= hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+                AssertRCReturn(rc, rc);
+
+                VMXVEXITINFO ExitInfo;
+                RT_ZERO(ExitInfo);
+                ExitInfo.uReason   = uExitReason;
+                ExitInfo.cbInstr   = pVmxTransient->cbInstr;
+                ExitInfo.u64Qual   = pVmxTransient->uExitQual;
+                rcStrict = IEMExecVmxVmexitInstrWithInfo(pVCpu, &ExitInfo);
+            }
+            else
+                rcStrict = hmR0VmxExitInvlpg(pVCpu, pVmxTransient);
+            break;
+        }
+
+        case VMX_EXIT_INVPCID:
+        {
+            if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INVLPG_EXIT))
+            {
+                int rc  = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+                rc     |= hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+                rc     |= hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
+                AssertRCReturn(rc, rc);
+
+                VMXVEXITINFO ExitInfo;
+                RT_ZERO(ExitInfo);
+                ExitInfo.uReason   = uExitReason;
+                ExitInfo.cbInstr   = pVmxTransient->cbInstr;
+                ExitInfo.u64Qual   = pVmxTransient->uExitQual;
+                ExitInfo.InstrInfo = pVmxTransient->ExitInstrInfo;
+                rcStrict = IEMExecVmxVmexitInstrWithInfo(pVCpu, &ExitInfo);
+            }
+            else
+                rcStrict = hmR0VmxExitInvpcid(pVCpu, pVmxTransient);
+            break;
+        }
+
         case VMX_EXIT_APIC_ACCESS:
         case VMX_EXIT_XCPT_OR_NMI:
@@ -12701 +12754 @@
         }
 
+        case VMX_EXIT_WBINVD:
+        {
+            if (CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_WBINVD_EXIT))
+            {
+                int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+                AssertRCReturn(rc, rc);
+                rcStrict = IEMExecVmxVmexitInstr(pVCpu, uExitReason, pVmxTransient->cbInstr);
+            }
+            else
+                rcStrict = hmR0VmxExitInvpcid(pVCpu, pVmxTransient);
+            break;
+        }
+
         case VMX_EXIT_MOV_DRX:
-        case VMX_EXIT_HLT:
-        case VMX_EXIT_INVLPG:
         case VMX_EXIT_RSM:
         case VMX_EXIT_MTF:
@@ -12709 +12773 @@
         case VMX_EXIT_GDTR_IDTR_ACCESS:
         case VMX_EXIT_LDTR_TR_ACCESS:
-        case VMX_EXIT_WBINVD:
         case VMX_EXIT_RDRAND:
-        case VMX_EXIT_INVPCID:
         case VMX_EXIT_RDPMC:
         case VMX_EXIT_VMREAD: