Changeset 78835 in vbox

Timestamp:

May 29, 2019 6:10:57 AM (6 years ago)

Author:

vboxsync

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

130935

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 GDTR, IDTR and LDTR_TR accesses are never intercepted and VM-exits are unexpected.

File:

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

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

@@ -396 +396 @@
 static FNVMXEXITHANDLERNSRC        hmR0VmxExitTprBelowThreshold;
 static FNVMXEXITHANDLER            hmR0VmxExitApicAccess;
-static FNVMXEXITHANDLER            hmR0VmxExitXdtrAccess;
 static FNVMXEXITHANDLER            hmR0VmxExitEptViolation;
 static FNVMXEXITHANDLER            hmR0VmxExitEptMisconfig;
@@ -602 +601 @@
     /* 44  VMX_EXIT_APIC_ACCESS             */  hmR0VmxExitApicAccess,
     /* 45  VMX_EXIT_VIRTUALIZED_EOI         */  hmR0VmxExitErrUnexpected,
-    /* 46  VMX_EXIT_GDTR_IDTR_ACCESS        */  hmR0VmxExitXdtrAccess,
-    /* 47  VMX_EXIT_LDTR_TR_ACCESS          */  hmR0VmxExitXdtrAccess,
+    /* 46  VMX_EXIT_GDTR_IDTR_ACCESS        */  hmR0VmxExitErrUnexpected,
+    /* 47  VMX_EXIT_LDTR_TR_ACCESS          */  hmR0VmxExitErrUnexpected,
     /* 48  VMX_EXIT_EPT_VIOLATION           */  hmR0VmxExitEptViolation,
     /* 49  VMX_EXIT_EPT_MISCONFIG           */  hmR0VmxExitEptMisconfig,
@@ -12534 +12533 @@
         case VMX_EXIT_MTF:                     VMEXIT_CALL_RET(0, hmR0VmxExitMtf(pVCpu, pVmxTransient));
         case VMX_EXIT_PAUSE:                   VMEXIT_CALL_RET(0, hmR0VmxExitPause(pVCpu, pVmxTransient));
-        case VMX_EXIT_GDTR_IDTR_ACCESS:        VMEXIT_CALL_RET(0, hmR0VmxExitXdtrAccess(pVCpu, pVmxTransient));
-        case VMX_EXIT_LDTR_TR_ACCESS:          VMEXIT_CALL_RET(0, hmR0VmxExitXdtrAccess(pVCpu, pVmxTransient));
         case VMX_EXIT_WBINVD:                  VMEXIT_CALL_RET(0, hmR0VmxExitWbinvd(pVCpu, pVmxTransient));
         case VMX_EXIT_XSETBV:                  VMEXIT_CALL_RET(0, hmR0VmxExitXsetbv(pVCpu, pVmxTransient));
@@ -12580 +12577 @@
         case VMX_EXIT_PML_FULL:
         case VMX_EXIT_VIRTUALIZED_EOI:
+        case VMX_EXIT_GDTR_IDTR_ACCESS:
+        case VMX_EXIT_LDTR_TR_ACCESS:
         case VMX_EXIT_APIC_WRITE:
         case VMX_EXIT_RDRAND:
@@ -13767 +13766 @@
      *    VM-exits.
      *
+     * VMX_EXIT_GDTR_IDTR_ACCESS:
+     * VMX_EXIT_LDTR_TR_ACCESS:
      * VMX_EXIT_RDRAND:
      * VMX_EXIT_RSM:
@@ -13784 +13785 @@
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
     AssertMsgFailed(("Unexpected VM-exit %u\n", pVmxTransient->uExitReason));
-    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
-}
-
-
-/**
- * VM-exit handler for XDTR (LGDT, SGDT, LIDT, SIDT) accesses
- * (VMX_EXIT_GDTR_IDTR_ACCESS) and LDT and TR access (LLDT, LTR, SLDT, STR).
- * Conditional VM-exit.
- */
-HMVMX_EXIT_DECL hmR0VmxExitXdtrAccess(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
-{
-    HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-
-    /* By default, we don't enable VMX_PROC_CTLS2_DESCRIPTOR_TABLE_EXIT. */
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitXdtrAccess);
-    PCVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
-    if (pVmcsInfo->u32ProcCtls2 & VMX_PROC_CTLS2_DESC_TABLE_EXIT)
-        return VERR_EM_INTERPRETER;
-    AssertMsgFailed(("Unexpected XDTR access\n"));
     HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
 }
@@ -16248 +16230 @@
         return IEMExecVmxVmexitInstrWithInfo(pVCpu, &ExitInfo);
     }
-    return hmR0VmxExitXdtrAccess(pVCpu, pVmxTransient);
+    return hmR0VmxExitErrUnexpected(pVCpu, pVmxTransient);
 }