Changeset 91305 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 17, 2021 8:56:45 PM (3 years ago)

Author:

vboxsync

Message:

VMM/CPUM,++: Moved the nested VT-X I/O permission bitmap allocations into CPUMCTX. bugref:10093

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (4 diffs)
• IEMAllCImplVmxInstr.cpp.h (modified) (2 diffs)

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

@@ -2478 +2478 @@
  *
  * @returns @c true if the I/O port access must cause a VM-exit, @c false otherwise.
- * @param   pvIoBitmap  Pointer to I/O bitmap.
+ * @param   pbIoBitmap  Pointer to I/O bitmap.
  * @param   uPort       The I/O port being accessed.
  * @param   cbAccess    e size of the I/O access in bytes (1, 2 or 4 bytes).
  */
-static bool cpumGetVmxIoBitmapPermission(void const *pvIoBitmap, uint16_t uPort, uint8_t cbAccess)
+static bool cpumGetVmxIoBitmapPermission(uint8_t const *pbIoBitmap, uint16_t uPort, uint8_t cbAccess)
 {
     Assert(cbAccess == 1 || cbAccess == 2 || cbAccess == 4);
@@ -2504 +2504 @@
      * If any bit corresponding to the I/O access is set, we must cause a VM-exit.
      */
-    uint8_t const *pbIoBitmap = (uint8_t const *)pvIoBitmap;
     uint16_t const offPerm    = uPort >> 3;                         /* Byte offset of the port. */
     uint16_t const idxPermBit = uPort - (offPerm << 3);             /* Bit offset within byte. */
@@ -2513 +2512 @@
     /* Fetch 8 or 16-bits depending on whether the access spans 8-bit boundary. */
     RTUINT16U uPerm;
-    uPerm.s.Lo = *(pbIoBitmap + offPerm);
+    uPerm.s.Lo = pbIoBitmap[offPerm];
     if (idxPermBit + cbAccess > 8)
-        uPerm.s.Hi = *(pbIoBitmap + 1 + offPerm);
+        uPerm.s.Hi = pbIoBitmap[offPerm + 1];
     else
         uPerm.s.Hi = 0;
@@ -2802 +2801 @@
 
     if (CPUMIsGuestVmxProcCtlsSet(pCtx, VMX_PROC_CTLS_USE_IO_BITMAPS))
-    {
-        uint8_t const *pbIoBitmap = (uint8_t const *)pCtx->hwvirt.vmx.CTX_SUFF(pvIoBitmap);
-        Assert(pbIoBitmap);
-        return cpumGetVmxIoBitmapPermission(pbIoBitmap, u16Port, cbAccess);
-    }
+        return cpumGetVmxIoBitmapPermission(pCtx->hwvirt.vmx.abIoBitmap, u16Port, cbAccess);
 
     return false;

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

@@ -6663 +6663 @@
         /* Read the IO bitmap A. */
         RTGCPHYS const GCPhysIoBitmapA = pVmcs->u64AddrIoBitmapA.u;
-        Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvIoBitmap));
-        int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvIoBitmap),
+        int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), &pVCpu->cpum.GstCtx.hwvirt.vmx.abIoBitmap[0],
                                          GCPhysIoBitmapA, VMX_V_IO_BITMAP_A_SIZE);
         if (RT_SUCCESS(rc))
@@ -6673 +6672 @@
         /* Read the IO bitmap B. */
         RTGCPHYS const GCPhysIoBitmapB = pVmcs->u64AddrIoBitmapB.u;
-        uint8_t *pbIoBitmapB = (uint8_t *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvIoBitmap) + VMX_V_IO_BITMAP_A_SIZE;
-        rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), pbIoBitmapB, GCPhysIoBitmapB, VMX_V_IO_BITMAP_B_SIZE);
+        rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), &pVCpu->cpum.GstCtx.hwvirt.vmx.abIoBitmap[VMX_V_IO_BITMAP_A_SIZE],
+                                     GCPhysIoBitmapB, VMX_V_IO_BITMAP_B_SIZE);
         if (RT_SUCCESS(rc))
         { /* likely */ }