Changeset 91304 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

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

Author:

vboxsync

Message:

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

File:

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

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

@@ -2127 +2127 @@
  *
  * @returns @c true if the MSR is intercepted, @c false otherwise.
- * @param   pvMsrBitmap     The MSR bitmap.
+ * @param   pbMsrBitmap     The MSR bitmap.
  * @param   offMsr          The MSR byte offset.
  * @param   iBit            The bit offset from the byte offset.
  */
-DECLINLINE(bool) hmR0VmxIsMsrBitSet(const void *pvMsrBitmap, uint16_t offMsr, int32_t iBit)
-{
-    uint8_t const * const pbMsrBitmap = (uint8_t const * const)pvMsrBitmap;
-    Assert(pbMsrBitmap);
+DECLINLINE(bool) hmR0VmxIsMsrBitSet(uint8_t const *pbMsrBitmap, uint16_t offMsr, int32_t iBit)
+{
     Assert(offMsr + (iBit >> 3) <= X86_PAGE_4K_SIZE);
     return ASMBitTest(pbMsrBitmap + offMsr, iBit);
@@ -2204 +2202 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
         bool const fClear = !fIsNstGstVmcs ? true
-                          : !hmR0VmxIsMsrBitSet(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), offMsrRead, iBit);
+                          : !hmR0VmxIsMsrBitSet(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, offMsrRead, iBit);
 #else
         RT_NOREF2(pVCpu, fIsNstGstVmcs);
@@ -2224 +2222 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
         bool const fClear = !fIsNstGstVmcs ? true
-                          : !hmR0VmxIsMsrBitSet(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), offMsrWrite, iBit);
+                          : !hmR0VmxIsMsrBitSet(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, offMsrWrite, iBit);
 #else
         RT_NOREF2(pVCpu, fIsNstGstVmcs);
@@ -2840 +2838 @@
                      * allow passthrough too.
                      */
-                    void const *pvMsrBitmapNstGst = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap);
+                    void const *pvMsrBitmapNstGst = pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap;
                     Assert(pvMsrBitmapNstGst);
                     uint32_t const fMsrpmNstGst = CPUMGetVmxMsrPermission(pvMsrBitmapNstGst, pGuestMsrLoad->u32Msr);
@@ -10422 +10420 @@
     if (pVmcsNstGst->u32ProcCtls & VMX_PROC_CTLS_USE_MSR_BITMAPS)
     {
-        uint64_t const *pu64MsrBitmapNstGst = (uint64_t const *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap);
+        uint64_t const *pu64MsrBitmapNstGst = (uint64_t const *)&pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap[0];
         uint64_t const *pu64MsrBitmapGst    = (uint64_t const *)pVmcsInfoGst->pvMsrBitmap;
         Assert(pu64MsrBitmapNstGst);
@@ -17325 +17323 @@
     uint32_t fMsrpm;
     if (CPUMIsGuestVmxProcCtlsSet(&pVCpu->cpum.GstCtx, VMX_PROC_CTLS_USE_MSR_BITMAPS))
-        fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), pVCpu->cpum.GstCtx.ecx);
+        fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, pVCpu->cpum.GstCtx.ecx);
     else
         fMsrpm = VMXMSRPM_EXIT_RD;
@@ -17347 +17345 @@
     uint32_t fMsrpm;
     if (CPUMIsGuestVmxProcCtlsSet(&pVCpu->cpum.GstCtx, VMX_PROC_CTLS_USE_MSR_BITMAPS))
-        fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), pVCpu->cpum.GstCtx.ecx);
+        fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, pVCpu->cpum.GstCtx.ecx);
     else
         fMsrpm = VMXMSRPM_EXIT_WR;