Changeset 78455 in vbox for trunk/src/VBox

Timestamp:

May 9, 2019 8:36:06 AM (6 years ago)

Author:

vboxsync

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

130464

Message:

VMM/IEM: Nested VMX: bugref:9180 Use the CPUM function for determining VMX I/O intercepts.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -3031 +3031 @@
 
 /**
- * Checks whether an I/O instruction for the given port is intercepted (causes a
- * VM-exit)  or not.
- *
- * @returns @c true if the instruction is intercepted, @c false otherwise.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   u16Port     The I/O port being accessed by the instruction.
- * @param   cbAccess    The size of the I/O access in bytes (1, 2 or 4 bytes).
- */
-IEM_STATIC bool iemVmxIsIoInterceptSet(PCVMCPU pVCpu, uint16_t u16Port, uint8_t cbAccess)
-{
-    PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
-    Assert(pVmcs);
-
-    /*
-     * Check whether the I/O instruction must cause a VM-exit or not.
-     * See Intel spec. 25.1.3 "Instructions That Cause VM Exits Conditionally".
-     */
-    if (pVmcs->u32ProcCtls & VMX_PROC_CTLS_UNCOND_IO_EXIT)
-        return true;
-
-    if (pVmcs->u32ProcCtls & VMX_PROC_CTLS_USE_IO_BITMAPS)
-    {
-        uint8_t const *pbIoBitmapA = (uint8_t const *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvIoBitmap);
-        uint8_t const *pbIoBitmapB = (uint8_t const *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvIoBitmap) + VMX_V_IO_BITMAP_A_SIZE;
-        Assert(pbIoBitmapA);
-        Assert(pbIoBitmapB);
-        return CPUMGetVmxIoBitmapPermission(pbIoBitmapA, pbIoBitmapB, u16Port, cbAccess);
-    }
-
-    return false;
-}
-
-
-/**
  * VMX VM-exit handler for VM-exits due to INVLPG.
  *
@@ -3535 +3501 @@
     Assert(cbAccess == 1 || cbAccess == 2 || cbAccess == 4);
 
-    bool const fIntercept = iemVmxIsIoInterceptSet(pVCpu, u16Port, cbAccess);
+    bool const fIntercept = CPUMIsGuestVmxIoInterceptSet(pVCpu, u16Port, cbAccess);
     if (fIntercept)
     {
@@ -3577 +3543 @@
     Assert(uInstrId != VMXINSTRID_IO_INS || ExitInstrInfo.StrIo.iSegReg == X86_SREG_ES);
 
-    bool const fIntercept = iemVmxIsIoInterceptSet(pVCpu, u16Port, cbAccess);
+    bool const fIntercept = CPUMIsGuestVmxIoInterceptSet(pVCpu, u16Port, cbAccess);
     if (fIntercept)
     {