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

Timestamp:

May 30, 2019 11:55:15 AM (6 years ago)

Author:

vboxsync

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

130990

Message:

VMM: Nested VMX: bugref:9180 APIC-access VM-exit handling.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (5 diffs)
• VMMR3/EM.cpp (modified) (3 diffs)
• VMMR3/VMM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -15929 +15929 @@
  * @param   pVCpu           The cross context virtual CPU structure of the calling EMT.
  * @param   uExitReason     The VM-exit reason.
+ * @param   uExitQual       The VM-exit qualification.
  * @thread  EMT(pVCpu)
- *
- * @remarks It is the responsibility of the caller to ensure VM-exit qualification
- *          is updated prior to calling this function!
- */
-VMM_INT_DECL(VBOXSTRICTRC) IEMExecVmxVmexit(PVMCPU pVCpu, uint32_t uExitReason)
-{
+ */
+VMM_INT_DECL(VBOXSTRICTRC) IEMExecVmxVmexit(PVMCPU pVCpu, uint32_t uExitReason, uint64_t uExitQual)
+{
+    iemVmxVmcsSetExitQual(pVCpu, uExitQual);
     VBOXSTRICTRC rcStrict = iemVmxVmexit(pVCpu, uExitReason);
     if (pVCpu->iem.s.cActiveMappings)

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

@@ -446 +446 @@
 static FNVMXEXITHANDLER            hmR0VmxExitPauseNested;
 //static FNVMXEXITHANDLERNSRC        hmR0VmxExitTprBelowThreshold;
-//static FNVMXEXITHANDLER            hmR0VmxExitApicAccess;
+static FNVMXEXITHANDLER            hmR0VmxExitApicAccessNested;
 static FNVMXEXITHANDLER            hmR0VmxExitXdtrAccessNested;
 //static FNVMXEXITHANDLER            hmR0VmxExitEptViolation;
@@ -15798 +15798 @@
 
     if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT))
-        return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason);
+        return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason, 0 /* uExitQual */);
     return hmR0VmxExitIntWindow(pVCpu, pVmxTransient);
 }
@@ -15811 +15811 @@
 
     if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_NMI_WINDOW_EXIT))
-        return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason);
+        return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason, 0 /* uExitQual */);
     return hmR0VmxExitIntWindow(pVCpu, pVmxTransient);
 }
@@ -16260 +16260 @@
 
     /** @todo NSTVMX: Should consider debugging nested-guests using VM debugger. */
-    return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason);
+    return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason, 0 /* uExitQual */);
 }
 
@@ -16301 +16301 @@
     }
     return hmR0VmxExitPause(pVCpu, pVmxTransient);
+}
+
+
+/**
+ * Nested-guest VM-exit handler for APIC access (VMX_EXIT_APIC_ACCESS). Conditional
+ * VM-exit.
+ */
+HMVMX_EXIT_DECL hmR0VmxExitApicAccessNested(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
+{
+    HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
+
+    /*
+     * All VMCS controls that cause APIC-access VM-exits (Virtualize APIC access,
+     * virtual-interrupt delivery, APIC-register virtualization) are all taken
+     * directly from the guest-hypervisor. So there should be no need to re-verify
+     * them here.
+     *
+     * Only the VM-exit qualification is relevant here.
+     */
+    int rc = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+    AssertRCReturn(rc, rc);
+    return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason, pVmxTransient->uExitQual);
 }
 

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -1729 +1729 @@
         && CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT))
     {
-        VBOXSTRICTRC rcStrict = IEMExecVmxVmexit(pVCpu, VMX_EXIT_INT_WINDOW);
+        VBOXSTRICTRC rcStrict = IEMExecVmxVmexit(pVCpu, VMX_EXIT_INT_WINDOW, 0 /* uExitQual */);
         if (RT_SUCCESS(rcStrict))
         {
@@ -2157 +2157 @@
         if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_MTF))
         {
-            rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexit(pVCpu, VMX_EXIT_MTF));
+            rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexit(pVCpu, VMX_EXIT_MTF, 0 /* uExitQual */));
             Assert(rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE);
             UPDATE_RC();
@@ -2179 +2179 @@
         if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW))
         {
-            rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexit(pVCpu, VMX_EXIT_NMI_WINDOW));
+            rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexit(pVCpu, VMX_EXIT_NMI_WINDOW, 0 /* uExitQual */));
             Assert(rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE);
             UPDATE_RC();

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -1647 +1647 @@
     PCCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVCpu);
     if (CPUMIsGuestInVmxNonRootMode(pCtx))
-        return VBOXSTRICTRC_TODO(IEMExecVmxVmexit(pVCpu, VMX_EXIT_INIT_SIGNAL));
+        return VBOXSTRICTRC_TODO(IEMExecVmxVmexit(pVCpu, VMX_EXIT_INIT_SIGNAL, 0 /* uExitQual */));
 #endif