Changeset 83941 in vbox for trunk/include/VBox/vmm

Timestamp:

Apr 23, 2020 10:22:56 AM (5 years ago)

Author:

vboxsync

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

137493

Message:

AMD IOMMU: bugref:9654 Hook into PCIPhys[Read|Write] for intercepting and translating device accesses through the IOMMU.

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (2 diffs)
• pdmdev.h (modified) (3 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -202 +202 @@
         struct PDMR0PERVM   s;
 #endif
-        uint8_t             padding[1920];
+        uint8_t             padding[2176];
     } pdmr0;
 
@@ -231 +231 @@
     /** Padding so aCpus starts on a page boundrary.  */
 #ifdef VBOX_WITH_NEM_R0
-    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024 - 256 - 64 - 1920 - 640 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
-#else
-    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024       - 64 - 1920 - 640 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024 - 256 - 64 - 2176 - 640 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+#else
+    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024       - 64 - 2176 - 640 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #endif
 

trunk/include/VBox/vmm/pdmdev.h

@@ -1254 +1254 @@
     /** Index into the PDM IOMMU array (PDM::aIommus) from ring-3. */
     uint32_t            idxIommu;
+
+    /**
+     * Performs a physical memory read transaction through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDeviceId   The device identifier (bus, device, function).
+     * @param   uDva        The device virtual address being read.
+     * @param   cbRead      The number of bytes being read.
+     * @param   pGCPhysOut  Where to store the translated physical address.
+     *
+     * @thread  Any.
+     */
+    DECLR0CALLBACKMEMBER(int, pfnMemRead,(PPDMDEVINS pDevIns, uint16_t uDeviceId, uint64_t uDva, size_t cbRead,
+                                          PRTGCPHYS pGCPhysOut));
+
+    /**
+     * Performs a physical memory write transaction through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDeviceId   The device identifier (bus, device, function).
+     * @param   uDva        The device virtual address being written.
+     * @param   cbRead      The number of bytes being written.
+     * @param   pGCPhysOut  Where to store the translated physical address.
+     *
+     * @thread  Any.
+     */
+    DECLR0CALLBACKMEMBER(int, pfnMemWrite,(PPDMDEVINS pDevIns, uint16_t uDeviceId, uint64_t uDva, size_t cbWrite,
+                                           PRTGCPHYS pGCPhysOut));
+
     /** Just a safety precaution. */
     uint32_t            u32TheEnd;
@@ -1274 +1305 @@
     /** Index into the PDM IOMMU array (PDM::aIommus) from ring-3. */
     uint32_t            idxIommu;
+
+    /**
+     * Performs a physical memory read transaction through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDeviceId   The device identifier (bus, device, function).
+     * @param   uDva        The device virtual address.
+     * @param   cbRead      The number of bytes being read.
+     * @param   pGCPhysOut  Where to store the translated physical address.
+     *
+     * @thread  Any.
+     */
+    DECLRCCALLBACKMEMBER(int, pfnMemRead,(PPDMDEVINS pDevIns, uint16_t uDeviceId, uint64_t uDva, size_t cbRead,
+                                          PRTGCPHYS pGCPhysOut));
+
+    /**
+     * Performs a physical memory write transaction through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDeviceId   The device identifier (bus, device, function).
+     * @param   uDva        The device virtual address being written.
+     * @param   cbRead      The number of bytes being written.
+     * @param   pGCPhysOut  Where to store the translated physical address.
+     *
+     * @thread  Any.
+     */
+    DECLRCCALLBACKMEMBER(int, pfnMemWrite,(PPDMDEVINS pDevIns, uint16_t uDeviceId, uint64_t uDva, size_t cbWrite,
+                                           PRTGCPHYS pGCPhysOut));
+
     /** Just a safety precaution. */
     uint32_t            u32TheEnd;
@@ -1292 +1354 @@
      *  version. */
     uint32_t            u32Version;
+    /** Padding. */
+    uint32_t            uPadding0;
+
+    /**
+     * Performs a physical memory read transaction through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDeviceId   The device identifier (bus, device, function).
+     * @param   uDva        The device virtual address being read.
+     * @param   cbRead      The number of bytes being read.
+     * @param   pGCPhysOut  Where to store the translated physical address.
+     *
+     * @thread  Any.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnMemRead,(PPDMDEVINS pDevIns, uint16_t uDeviceId, uint64_t uDva, size_t cbRead,
+                                          PRTGCPHYS pGCPhysOut));
+
+    /**
+     * Performs a physical memory write transaction through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDeviceId   The device identifier (bus, device, function).
+     * @param   uDva        The device virtual address being written.
+     * @param   cbWrite     The number of bytes being written.
+     * @param   pGCPhysOut  Where to store the translated physical address.
+     *
+     * @thread  Any.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnMemWrite,(PPDMDEVINS pDevIns, uint16_t uDeviceId, uint64_t uDva, size_t cbWrite,
+                                           PRTGCPHYS pGCPhysOut));
+
     /** Just a safety precaution. */
     uint32_t            u32TheEnd;