Changeset 13387

Timestamp:

10/20/08 13:42:28 (3 months ago)

Author:

vboxsync

Message:

First sketch of functionality to create guest physical address aliases.

Files:

• trunk/include/VBox/iom.h (modified) (1 diff)
• trunk/include/VBox/pgm.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (16 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (3 diffs)

trunk/include/VBox/iom.h

@@ -213 +213 @@
-VMMDECL(int)  IOMMMIOWrite(PVM pVM, RTGCPHYS GCPhys, uint32_t u32Value, size_t cbValue);
-VMMDECL(int)  IOMInterpretCheckPortIOAccess(PVM pVM, PCPUMCTXCORE pCtxCore, RTIOPORT Port, unsigned cb);
-
+
+
-
-#ifdef IN_GC

trunk/include/VBox/pgm.h

@@ -362 +362 @@
-VMMDECL(int)        PGMHandlerPhysicalJoin(PVM pVM, RTGCPHYS GCPhys1, RTGCPHYS GCPhys2);
-VMMDECL(int)        PGMHandlerPhysicalPageTempOff(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysPage);
+VMMDECL(int)        PGMHandlerPhysicalPageAlias(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysPage, RTGCPHYS GCPhysPageRemap);
-VMMDECL(int)        PGMHandlerPhysicalReset(PVM pVM, RTGCPHYS GCPhys);
-VMMDECL(int)        PGMHandlerPhysicalPageReset(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysPage);

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

@@ -35 +35 @@
-#include "IOMInternal.h"
-#include <VBox/vm.h>
+#include <VBox/hwaccm.h>
-
-#include <VBox/dis.h>
@@ -167 +168 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Pointer to CPUMCTXCORE guest registers structure.
- * @param   pCpu        Disassembler CPU state.
@@ -226 +227 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Pointer to CPUMCTXCORE guest registers structure.
- * @param   pCpu        Disassembler CPU state.
@@ -285 +286 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   uErrorCode  CPU Error code.
- * @param   pRegFrame   Trap register frame.
@@ -518 +519 @@
- * @returns VBox status code.
- *
-(GC pointer ofcourse)
+
- * @param   pRegFrame   Trap register frame.
- * @param   GCPhysFault The GC physical address corresponding to pvFault.
@@ -644 +645 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Trap register frame.
- * @param   GCPhysFault The GC physical address corresponding to pvFault.
@@ -692 +693 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Trap register frame.
- * @param   GCPhysFault The GC physical address corresponding to pvFault.
@@ -745 +746 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Trap register frame.
- * @param   GCPhysFault The GC physical address corresponding to pvFault.
@@ -834 +835 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Trap register frame.
- * @param   GCPhysFault The GC physical address corresponding to pvFault.
@@ -886 +887 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Trap register frame.
- * @param   GCPhysFault The GC physical address corresponding to pvFault.
@@ -936 +937 @@
- * @returns VBox status code.
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Trap register frame.
- * @param   GCPhysFault The GC physical address corresponding to pvFault.
@@ -1416 +1417 @@
- * @retval  VINF_EM_RESCHEDULE_REM      The exception was dispatched and cannot be executed in raw-mode. (TRPMRaiseXcptErr)
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame       Pointer to CPUMCTXCORE guest registers structure.
- * @param   uPort           IO Port
@@ -1533 +1534 @@
- * @retval  VINF_EM_RESCHEDULE_REM      The exception was dispatched and cannot be executed in raw-mode. (TRPMRaiseXcptErr)
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Pointer to CPUMCTXCORE guest registers structure.
- * @param   pCpu        Disassembler CPU state.
@@ -1577 +1578 @@
- * @retval  VINF_EM_RESCHEDULE_REM      The exception was dispatched and cannot be executed in raw-mode. (TRPMRaiseXcptErr)
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame       Pointer to CPUMCTXCORE guest registers structure.
- * @param   uPort           IO Port
@@ -1696 +1697 @@
- * @retval  VINF_EM_RESCHEDULE_REM      The exception was dispatched and cannot be executed in raw-mode. (TRPMRaiseXcptErr)
- *
- (GC pointer ofcourse)
+
- * @param   pRegFrame   Pointer to CPUMCTXCORE guest registers structure.
- * @param   pCpu        Disassembler CPU state.
@@ -1725 +1726 @@
-}
-
+#ifdef IN_RING0
+/**
+ * Modify an existing MMIO region page; map to another guest physical region and change the access flags
+ *
+ * @returns VBox status code. 
+ *
+ * @param   pVM             The virtual machine.
+ * @param   GCPhys          Physical address that's part of the MMIO region to be changed.
+ * @param   GCPhysRemapped  Remapped address.
+ * @param   fPageFlags      Page flags to set (typically X86_PTE_RW).
+ */
+VMMDECL(int)  IOMMMIOModifyPage(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped, uint64_t fPageFlags)
+{
+    Assert(fPageFlags == X86_PTE_RW);
+
+    Log(("IOMMMIOModifyPage %VGp -> %VGp flags=%RX64\n", GCPhys, GCPhysRemapped, fPageFlags));
+
+    /*
+     * Lookup the current context range node and statistics.
+     */
+    PIOMMMIORANGE pRange = iomMMIOGetRange(&pVM->iom.s, GCPhys);
+    AssertMsgReturn(pRange,
+                    ("Handlers and page tables are out of sync or something! GCPhys=%VGp\n", GCPhys),
+                    VERR_INTERNAL_ERROR);
+
+    GCPhys         &= 0xfff;
+    GCPhysRemapped &= 0xfff;
+
+    /* This currently only works in real mode, protected mode without paging or with nested paging. */
+    if (    CPUMIsGuestInPagedProtectedMode(pVM)
+        && !HWACCMIsNestedPagingActive(pVM))
+        return VINF_SUCCESS;    /* ignore */
+
+    int rc = PGMHandlerPhysicalPageAlias(pVM, pRange->GCPhys, GCPhys, GCPhysRemapped);
+    AssertRCReturn(rc, rc);
+
+    /* Mark it as writable and present so reads and writes no longer fault. */
+    rc = PGMShwSetPage(pVM, (RTGCPTR)GCPhys, PAGE_SIZE, X86_PTE_RW | X86_PTE_P);
+    AssertRC(rc);
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Reset a previously modified MMIO region; restore the access flags.
+ *
+ * @returns VBox status code. 
+ *
+ * @param   pVM             The virtual machine.
+ * @param   GCPhys          Physical address that's part of the MMIO region to be reset.
+ */
+VMMDECL(int)  IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys)
+{
+    unsigned cb;
+
+    Log(("IOMMMIOResetRegion %VGp\n", GCPhys));
+    /*
+     * Lookup the current context range node and statistics.
+     */
+    PIOMMMIORANGE pRange = iomMMIOGetRange(&pVM->iom.s, GCPhys);
+    AssertMsgReturn(pRange,
+                    ("Handlers and page tables are out of sync or something! GCPhys=%VGp\n", GCPhys),
+                    VERR_INTERNAL_ERROR);
+
+    /* This currently only works in real mode, protected mode without paging or with nested paging. */
+    if (    CPUMIsGuestInPagedProtectedMode(pVM)
+        && !HWACCMIsNestedPagingActive(pVM))
+        return VINF_SUCCESS;    /* ignore */
+
+
+    cb     = pRange->cb;
+    GCPhys = pRange->GCPhys;
+
+    while(cb)
+    {
+        int rc = PGMHandlerPhysicalPageReset(pVM, pRange->GCPhys, GCPhys);
+        AssertRC(rc);
+
+        /* Mark it as not present again to intercept all read and write access. */
+        rc = PGMShwSetPage(pVM, (RTGCPTR)GCPhys, PAGE_SIZE, 0);
+        AssertRC(rc);
+
+        cb     -= PAGE_SIZE;
+        GCPhys += PAGE_SIZE;
+    }
+    return VINF_SUCCESS;
+}
+#endif

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

@@ -884 +884 @@
-            AssertRCReturn(rc, rc);
-            PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, PGM_PAGE_HNDL_PHYS_STATE_DISABLED);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            HWACCMInvalidatePhysPage(pVM, GCPhysPage);
-#endif
@@ -928 +992 @@
-
-            AssertReturn(   pCur->enmType == PGMPHYSHANDLERTYPE_PHYSICAL_WRITE
-
+
+
-                         VERR_ACCESS_DENIED);
-
@@ -938 +1003 @@
-            AssertRCReturn(rc, rc);
-            PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, pgmHandlerPhysicalCalcState(pCur));
+#ifndef IN_GC
+            HWACCMInvalidatePhysPage(pVM, GCPhysPage);
+#endif
-            return VINF_SUCCESS;
-        }