Changeset 75511 in vbox

Timestamp:

Nov 16, 2018 11:25:07 AM (6 years ago)

Author:

vboxsync

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

126669

Message:

VMM: Nested VMX: bugref:9180 The APIC-access page handler is registered on VM-entry when the feature is present, so always return VINF_SUCCESS (implying caller should not proceed with the access) unless VM-exit fails.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllVmx.cpp (modified) (2 diffs)
• IEMAll.cpp (modified) (1 diff)

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

@@ -150 +150 @@
     RT_NOREF4(pVM, pvPhys, enmOrigin, pvUser);
 
+    Assert(CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.s.Guest));
+    Assert(CPUMIsGuestVmxProcCtls2Set(pVCpu, VMX_PROC_CTLS2_VIRT_APIC_ACCESS));
+
 #ifdef VBOX_STRICT
     RTGCPHYS const GCPhysApicBase   = CPUMGetGuestVmxApicAccessPageAddr(pVCpu, &pVCpu->cpum.s.Guest);
@@ -159 +162 @@
     bool const fWrite = RT_BOOL(enmAccessType == PGMACCESSTYPE_WRITE);
     VBOXSTRICTRC rcStrict = IEMExecVmxVirtApicAccessMem(pVCpu, offAccess, cbBuf, pvBuf, fWrite);
-    if (rcStrict == VINF_VMX_MODIFIES_BEHAVIOR)
-        rcStrict = VINF_SUCCESS;
-    return rcStrict;
+    if (RT_FAILURE(rcStrict))
+        return rcStrict;
+
+    /* Any access on this APIC-access page has been handled, caller should not carry out the access. */
+    return VINF_SUCCESS;
 }
 #endif

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

@@ -15686 +15686 @@
  * @returns Strict VBox status code.
  * @retval  VINF_VMX_MODIFIES_BEHAVIOR if the memory access was virtualized.
+ * @retval  VINF_VMX_VMEXIT if the access causes a VM-exit.
  *
  * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.