Changeset 22263 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 14, 2009 3:10:12 PM (16 years ago)

Author:

vboxsync

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

51097

Message:

Selectively enable TPR patching for certain Windows guests.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (2 diffs)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -328 +328 @@
      */
     PCFGMNODE pRoot      = CFGMR3GetRoot(pVM);
+
+    char *pszOSType = NULL;
+    rc = CFGMR3QueryStringAlloc(pRoot, "OSType", &pszOSType);
+    AssertRC(rc);
+    
+    pVM->hwaccm.s.fTRPPatchingAllowed = false;
+    if (pszOSType)
+    {
+        /* @todo Not exactly pretty to check strings; VBOXOSTYPE would be better, but that requires quite a bit of API change in Main. */
+        if (    !RTStrCmp(pszOSType, "WindowsNT4")
+            ||  !RTStrCmp(pszOSType, "WindowsNT")
+            ||  !RTStrCmp(pszOSType, "Windows 2000")
+            ||  !RTStrCmp(pszOSType, "WindowsXP")
+            ||  !RTStrCmp(pszOSType, "Windows 2003"))
+        {
+            /* Only allow TPR patching for NT, Win2k, XP and Windows Server 2003. (32 bits mode)
+             * (IO-APIC presence is checked later on in HWACCMR3InitFinalizeR0)
+             *
+             * We may want to consider adding more guest OSes (Solaris) later on.
+             */
+            pVM->hwaccm.s.fTRPPatchingAllowed = true;
+        }
+        MMR3HeapFree(pszOSType);
+    }
+
     PCFGMNODE pHWVirtExt = CFGMR3GetChild(pRoot, "HWVirtExt/");
     /* Nested paging: disabled by default. */
@@ -646 +671 @@
 
     pVM->hwaccm.s.fHasIoApic = PDMHasIoApic(pVM);
+    /* No TPR patching is required when the IO-APIC is not enabled for this VM. */
+    if (!pVM->hwaccm.s.fHasIoApic)
+        pVM->hwaccm.s.fTRPPatchingAllowed = false;
 
     if (pVM->hwaccm.s.vmx.fSupported)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -274 +274 @@
     bool                        fHasIoApic;
 
+    /** Set when TPR patching is allowed. */
+    bool                        fTRPPatchingAllowed;
+
     /** Explicit alignment padding to make 32-bit gcc align u64RegisterMask
      *  naturally. */
-    bool                        padding[2];
+    bool                        padding[1];
 
     /** And mask for copying register contents. */

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

@@ -1641 +1641 @@
 #ifdef VBOX_HWACCM_WITH_GUEST_PATCHING
             /* Shortcut for APIC TPR reads and writes; 32 bits guests only */
-            if (    (uFaultAddress & 0xfff) == 0x080
-                &&  pVM->hwaccm.s.fHasIoApic
+            if (    pVM->hwaccm.s.fTRPPatchingAllowed
+                &&  (uFaultAddress & 0xfff) == 0x080
                 &&  !(errCode & X86_TRAP_PF_P)  /* not present */
                 &&  CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)) == 0
@@ -1809 +1809 @@
 #ifdef VBOX_HWACCM_WITH_GUEST_PATCHING
         /* Shortcut for APIC TPR reads and writes; 32 bits guests only */
-        if (    (uFaultAddress & 0xfff) == 0x080
-            &&  pVM->hwaccm.s.fHasIoApic
+        if (    pVM->hwaccm.s.fTRPPatchingAllowed
+            &&  (uFaultAddress & 0xfff) == 0x080
             &&  !(errCode & X86_TRAP_PF_P)  /* not present */
             &&  CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)) == 0