Changeset 11696 in vbox

Timestamp:

Aug 27, 2008 12:09:59 PM (17 years ago)

Author:

vboxsync

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

35421

Message:

Enabled MSR bitmap for VT-x.

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -218 +218 @@
         /** Virtual address of the virtual APIC mmio cache. */
         R0PTRTYPE(uint8_t *)        pAPIC;
+
+        /** R0 memory object for the MSR bitmap (1 page). */
+        RTR0MEMOBJ                  pMemObjMSRBitmap;
+        /** Physical address of the MSR bitmap (1 page). */
+        RTHCPHYS                    pMSRBitmapPhys;
+        /** Virtual address of the MSR bitmap (1 page). */
+        R0PTRTYPE(uint8_t *)        pMSRBitmap;
+
+        /** R0 memory object for the MSR entry load page (guest MSRs). */
+        RTR0MEMOBJ                  pMemObjMSREntryLoad;
+        /** Physical address of the MSR entry load page (guest MSRs). */
+        RTHCPHYS                    pMSREntryLoadPhys;
+        /** Virtual address of the MSR entry load page (guest MSRs). */
+        R0PTRTYPE(uint8_t *)        pMSREntryLoad;
+
+        /** R0 memory object for the MSR exit store page (guest MSRs). */
+        RTR0MEMOBJ                  pMemObjMSRExitStore;
+        /** Physical address of the MSR exit store page (guest MSRs). */
+        RTHCPHYS                    pMSRExitStorePhys;
+        /** Virtual address of the MSR exit store page (guest MSRs). */
+        R0PTRTYPE(uint8_t *)        pMSRExitStore;
+
+        /** R0 memory object for the MSR exit load page (host MSRs). */
+        RTR0MEMOBJ                  pMemObjMSRExitLoad;
+        /** Physical address of the MSR exit load page (host MSRs). */
+        RTHCPHYS                    pMSRExitLoadPhys;
+        /** Virtual address of the MSR exit load page (host MSRs). */
+        R0PTRTYPE(uint8_t *)        pMSRExitLoad;
 
         /** Ring 0 handlers for VT-x. */

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

@@ -189 +189 @@
     }
 
+    /* Allocate the MSR bitmap if this feature is supported. */
+    if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_MSR_BITMAPS)
+    {
+        rc = RTR0MemObjAllocCont(&pVM->hwaccm.s.vmx.pMemObjMSRBitmap, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
+        AssertRC(rc);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        pVM->hwaccm.s.vmx.pMSRBitmap     = (uint8_t *)RTR0MemObjAddress(pVM->hwaccm.s.vmx.pMemObjMSRBitmap);
+        pVM->hwaccm.s.vmx.pMSRBitmapPhys = RTR0MemObjGetPagePhysAddr(pVM->hwaccm.s.vmx.pMemObjMSRBitmap, 0);
+        memset(pVM->hwaccm.s.vmx.pMSRBitmap, 0xff, PAGE_SIZE);
+    }
 #ifdef LOG_ENABLED
     SUPR0Printf("VMXR0InitVM %x VMCS=%x (%x) RealModeTSS=%x (%x)\n", pVM, pVM->hwaccm.s.vmx.pVMCS, (uint32_t)pVM->hwaccm.s.vmx.pVMCSPhys, pVM->hwaccm.s.vmx.pRealModeTSS, (uint32_t)pVM->hwaccm.s.vmx.pRealModeTSSPhys);
@@ -223 +235 @@
         pVM->hwaccm.s.vmx.pAPIC       = 0;
         pVM->hwaccm.s.vmx.pAPICPhys   = 0;
+    }
+    if (pVM->hwaccm.s.vmx.pMemObjMSRBitmap != NIL_RTR0MEMOBJ)
+    {
+        RTR0MemObjFree(pVM->hwaccm.s.vmx.pMemObjMSRBitmap, false);
+        pVM->hwaccm.s.vmx.pMemObjMSRBitmap = NIL_RTR0MEMOBJ;
+        pVM->hwaccm.s.vmx.pMSRBitmap       = 0;
+        pVM->hwaccm.s.vmx.pMSRBitmapPhys   = 0;
     }
     return VINF_SUCCESS;
@@ -291 +310 @@
         val |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR8_STORE_EXIT | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR8_LOAD_EXIT;
 #endif
+
+    if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_MSR_BITMAPS)
+    {
+        Assert(pVM->hwaccm.s.vmx.pMSRBitmapPhys);
+        val |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_MSR_BITMAPS;
+    }
+
     /* Mask away the bits that the CPU doesn't support */
     /** @todo make sure they don't conflict with the above requirements. */
@@ -363 +389 @@
     {
         /* Optional */
-        rc  = VMXWriteVMCS(VMX_VMCS_CTRL_MSR_BITMAP_FULL, 0);
+        rc  = VMXWriteVMCS(VMX_VMCS_CTRL_MSR_BITMAP_FULL, pVM->hwaccm.s.vmx.pMSRBitmapPhys);
 #if HC_ARCH_BITS == 32
-        rc |= VMXWriteVMCS(VMX_VMCS_CTRL_MSR_BITMAP_HIGH, 0);
+        rc |= VMXWriteVMCS(VMX_VMCS_CTRL_MSR_BITMAP_HIGH, pVM->hwaccm.s.vmx.pMSRBitmapPhys >> 32);
 #endif
         AssertRC(rc);