Changeset 1502 in vbox for trunk

Timestamp:

Mar 15, 2007 10:00:42 AM (18 years ago)

Author:

vboxsync

Message:

Syncing of TSS virtual interrupt redirection bitmap added.

Location:

trunk/src/VBox/VMM

Files:

• SELM.cpp (modified) (5 diffs)
• SELMInternal.h (modified) (1 diff)
• VMMGC/SELMGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/SELM.cpp

@@ -108 +108 @@
     AssertRelease((RT_OFFSETOF(VM, selm.s.Tss)       & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.Tss));
     AssertRelease((RT_OFFSETOF(VM, selm.s.TssTrap08) & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.TssTrap08));
+    AssertRelease(sizeof(pVM->selm.s.Tss.redirBitmap) == 0x20);
 
     /*
@@ -170 +171 @@
     STAM_REG(pVM, &pVM->selm.s.StatGCWriteGuestLDT,            STAMTYPE_COUNTER, "/SELM/GC/Write/Guest/LDT",     STAMUNIT_OCCURENCES,     "The number of writes to the Guest LDT was detected.");
     STAM_REG(pVM, &pVM->selm.s.StatGCWriteGuestTSSHandled,     STAMTYPE_COUNTER, "/SELM/GC/Write/Guest/TSSInt",  STAMUNIT_OCCURENCES,     "The number of handled writes to the Guest TSS.");
+    STAM_REG(pVM, &pVM->selm.s.StatGCWriteGuestTSSRedir,       STAMTYPE_COUNTER, "/SELM/GC/Write/Guest/TSSRedir",STAMUNIT_OCCURENCES,     "The number of handled redir bitmap writes to the Guest TSS.");
     STAM_REG(pVM, &pVM->selm.s.StatGCWriteGuestTSSHandledChanged,STAMTYPE_COUNTER, "/SELM/GC/Write/Guest/TSSIntChg", STAMUNIT_OCCURENCES, "The number of handled writes to the Guest TSS where the R0 stack changed.");
     STAM_REG(pVM, &pVM->selm.s.StatGCWriteGuestTSSUnhandled,   STAMTYPE_COUNTER, "/SELM/GC/Write/Guest/TSSEmu",  STAMUNIT_OCCURENCES,     "The number of unhandled writes to the Guest TSS.");
@@ -1489 +1491 @@
             /* feeling very lazy; reading too much */
             VBOXTSS tss;
-            rc = PGMPhysReadGCPtr(pVM, &tss, GCPtrTss, sizeof(VBOXTSS));
+            rc = PGMPhysReadGCPtr(pVM, &tss, GCPtrTss, RT_OFFSETOF(VBOXTSS, offIoBitmap) + sizeof(tss.offIoBitmap));
             if (VBOX_SUCCESS(rc))
             {
@@ -1504 +1506 @@
                 /* Update our TSS structure for the guest's ring 1 stack */
                 SELMSetRing1Stack(pVM, tss.ss0 | 1, tss.esp0);
+
+                /* Should we sync the virtual interrupt redirection bitmap as well? */
+                if (CPUMGetGuestCR4(pVM) & X86_CR4_VME)
+                {
+                    uint32_t offRedirBitmap = tss.offIoBitmap - sizeof(tss.redirBitmap);
+                    
+                    /** @todo not sure how the partial case is handled; probably not allowed */
+                    if (offRedirBitmap + sizeof(tss.redirBitmap) <= cbTss)
+                    {
+                        rc = PGMPhysReadGCPtr(pVM, &pVM->selm.s.Tss.redirBitmap, GCPtrTss + offRedirBitmap, sizeof(tss.redirBitmap));
+                        AssertRC(rc);
+                    }
+                }
             }
             else
@@ -1509 +1524 @@
                 /* Note: the ring 0 stack selector and base address are updated on demand in this case. */
 
-                /* Note: handle these dependencies better! */
+                /** @todo handle these dependencies better! */
                 TRPMR3SetGuestTrapHandler(pVM, 0x2E, TRPM_INVALID_HANDLER);
                 TRPMR3SetGuestTrapHandler(pVM, 0x80, TRPM_INVALID_HANDLER);

trunk/src/VBox/VMM/SELMInternal.h

@@ -150 +150 @@
     STAMPROFILE             StatTSSSync;
 
-    /** GC: The number of handled write to the Guest's GDT. */
+    /** GC: The number of handled writes to the Guest's GDT. */
     STAMCOUNTER             StatGCWriteGuestGDTHandled;
     /** GC: The number of unhandled write to the Guest's GDT. */
     STAMCOUNTER             StatGCWriteGuestGDTUnhandled;
-    /** GC: The number of times write to Guest's LDT was detected. */
+    /** GC: The number of times writes to Guest's LDT was detected. */
     STAMCOUNTER             StatGCWriteGuestLDT;
-    /** GC: The number of handled write to the Guest's TSS. */
+    /** GC: The number of handled writes to the Guest's TSS. */
     STAMCOUNTER             StatGCWriteGuestTSSHandled;
-    /** GC: The number of handled write to the Guest's TSS where we detected a change. */
+    /** GC: The number of handled writes to the Guest's TSS where we detected a change. */
     STAMCOUNTER             StatGCWriteGuestTSSHandledChanged;
-    /** GC: The number of unhandled write to the Guest's TSS. */
+    /** GC: The number of handled redir writes to the Guest's TSS where we detected a change. */
+    STAMCOUNTER             StatGCWriteGuestTSSRedir;
+    /** GC: The number of unhandled writes to the Guest's TSS. */
     STAMCOUNTER             StatGCWriteGuestTSSUnhandled;
     /** The number of times we had to relocate our hypervisor selectors. */

trunk/src/VBox/VMM/VMMGC/SELMGC.cpp

@@ -284 +284 @@
             STAM_COUNTER_INC(&pVM->selm.s.StatGCWriteGuestTSSHandledChanged);
         }
+        if (CPUMGetGuestCR4(pVM) & X86_CR4_VME)
+        {
+            uint32_t offRedirBitmap = pGuestTSS->offIoBitmap - sizeof(pVM->selm.s.Tss.redirBitmap);
+
+            /** @todo not sure how the partial case is handled; probably not allowed */
+            if (offRedirBitmap + sizeof(pVM->selm.s.Tss.redirBitmap) <= pVM->selm.s.cbGuestTss)
+            {
+                /** @todo check if fault was in this range and, if so, only update the changed part. */
+                for (uint32_t i=0;i<sizeof(pVM->selm.s.Tss.redirBitmap)/8;i++)
+                {
+                    rc = MMGCRamRead(pVM, &pVM->selm.s.Tss.redirBitmap[i*8], (uint8_t *)pGuestTSS + offRedirBitmap + i*8, 8);
+                    AssertRC(rc);
+                }
+                STAM_COUNTER_INC(&pVM->selm.s.StatGCWriteGuestTSSRedir);
+            }
+
+        }
         STAM_COUNTER_INC(&pVM->selm.s.StatGCWriteGuestTSSHandled);
     }