Changeset 89284 in vbox for trunk/src/VBox/Devices

Timestamp:

May 26, 2021 6:52:15 AM (4 years ago)

Author:

vboxsync

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

144630

Message:

Intel IOMMU: bugref:9967 Address translation, WIP. Scaffolding for PASID (if and when we implement PASID in future).

File:

• trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

@@ -143 +143 @@
 /** The current saved state version. */
 #define DMAR_SAVED_STATE_VERSION                    1
-
-/** @name DMAR_IO_PERM_XXX: DMAR I/O permissions.
- * These are not according to the spec. other than the value of the READ and WRITE
- * permissions. */
-#define DMAR_IO_PERM_READ                           RT_BIT(0)
-#define DMAR_IO_PERM_WRITE                          RT_BIT(1)
-#define DMAR_IO_PERM_EXECUTE                        RT_BIT(2)
-#define DMAR_IO_PERM_SUPERVISOR                     RT_BIT(3)
-/** @} */
 
 
@@ -434 +425 @@
 {
     /** The device ID (bus, device, function). */
-    uint16_t        idDevice;
-    uint16_t        uPadding0;
-    /** The DMA remapping operation request type. */
-    VTDREQTYPE      enmReqType;
+    uint16_t                idDevice;
+    uint16_t                uPadding0;
+    /** The PASID if present, can be NIL_PCIPASID. */
+    PCIPASID                Pasid;
+    /* The address type of the memory request. */
+    PCIADDRTYPE             enmAddrType;
+    /** The type of the translation request. */
+    VTDREQTYPE              enmReqType;
     /** The DMA address being accessed. */
-    uint64_t        uDmaAddr;
+    uint64_t                uDmaAddr;
     /** The size of the DMA access (in bytes). */
-    size_t          cbDma;
+    size_t                  cbDma;
 
     /** The translated system-physical address (HPA). */
-    RTGCPHYS        GCPhysSpa;
+    RTGCPHYS                GCPhysSpa;
     /** The size of the contiguous translated region (in bytes). */
-    size_t          cbContiguous;
+    size_t                  cbContiguous;
 } DMARADDRMAP;
 /** Pointer to a DMA address map. */
@@ -1416 +1411 @@
  */
 static void dmarAtFaultRecordEx(PPDMDEVINS pDevIns, DMARDIAG enmDiag, VTDATFAULT enmAtFault, uint16_t idDevice,
-                                uint64_t uFaultAddr, VTDREQTYPE enmReqType, uint8_t uAddrType, bool fHasPasid, uint32_t uPasid,
-                                uint8_t fReqAttr)
+                                uint64_t uFaultAddr, VTDREQTYPE enmReqType, uint8_t uAddrType, bool fHasPasid,
+                                uint32_t uPasid, uint8_t fReqAttr)
 {
     uint8_t const fType1 = enmReqType & RT_BIT(1);
@@ -1455 +1450 @@
 {
     dmarAtFaultRecordEx(pDevIns, enmDiag, enmAtFault, idDevice, uFaultAddr, enmReqType, 0 /* uAddrType */,
-                          false /* fHasPasid */, 0 /* uPasid */, 0 /* fReqAttr */);
+                        false /* fHasPasid */, 0 /* uPasid */, 0 /* fReqAttr */);
 }
 
@@ -1899 +1894 @@
  * @param   pDevIns         The IOMMU device instance.
  * @param   uRtaddrReg      The current RTADDR_REG value.
- * @param   enmAddrType     The PCI memory request address type.
  * @param   pAddrRemap      The DMA address remap info.
  */
-static int dmarDrLegacyModeRemapAddr(PPDMDEVINS pDevIns, uint64_t uRtaddrReg, PCIADDRTYPE enmAddrType, PDMARADDRMAP pAddrRemap)
+static int dmarDrLegacyModeRemapAddr(PPDMDEVINS pDevIns, uint64_t uRtaddrReg, PDMARADDRMAP pAddrRemap)
 {
     uint8_t const idxRootEntry = RT_HI_U8(pAddrRemap->idDevice);
@@ -1937 +1931 @@
                                 case 0:
                                 {
-                                    if (enmAddrType == PCIADDRTYPE_UNTRANSLATED)
+                                    if (pAddrRemap->enmAddrType == PCIADDRTYPE_UNTRANSLATED)
                                     {
                                         /** @todo perform second-level translation. */
@@ -1966 +1960 @@
                                 {
                                     dmarAtFaultQualifiedRecord(pDevIns, kDmarDiag_Atf_Lct_4_2, VTDATFAULT_LCT_4_2,
-                                                               pAddrRemap->idDevice, pAddrRemap->uDmaAddr, pAddrRemap->enmReqType,
-                                                               uCtxEntryQword0);
+                                                               pAddrRemap->idDevice, pAddrRemap->uDmaAddr,
+                                                               pAddrRemap->enmReqType, uCtxEntryQword0);
                                     break;
                                 }
@@ -2005 +1999 @@
  * @param   pDevIns         The IOMMU device instance.
  * @param   uRtaddrReg      The current RTADDR_REG value.
- * @param   enmAddrType     The PCI memory request address type.
  * @param   pAddrRemap      The DMA address remap info.
  */
-static int dmarDrScalableModeRemapAddr(PPDMDEVINS pDevIns, uint64_t uRtaddrReg, PCIADDRTYPE enmAddrType, PDMARADDRMAP pAddrRemap)
-{
-    RT_NOREF(enmAddrType);
+static int dmarDrScalableModeRemapAddr(PPDMDEVINS pDevIns, uint64_t uRtaddrReg, PDMARADDRMAP pAddrRemap)
+{
     PCDMAR pThis = PDMDEVINS_2_DATA(pDevIns, PDMAR);
     if (pThis->fExtCapReg & VTD_BF_ECAP_REG_SMTS_MASK)
@@ -2093 +2085 @@
 
         DMARADDRMAP AddrRemap;
-        AddrRemap.idDevice     = idDevice;
-        AddrRemap.enmReqType   = enmReqType;
-        AddrRemap.uDmaAddr     = uIova;
-        AddrRemap.cbDma        = cbIova;
-        AddrRemap.GCPhysSpa    = NIL_RTGCPHYS;
-        AddrRemap.cbContiguous = 0;
+        AddrRemap.idDevice       = idDevice;
+        AddrRemap.Pasid          = NIL_PCIPASID;
+        AddrRemap.enmAddrType    = PCIADDRTYPE_UNTRANSLATED;
+        AddrRemap.enmReqType     = enmReqType;
+        AddrRemap.uDmaAddr       = uIova;
+        AddrRemap.cbDma          = cbIova;
+        AddrRemap.GCPhysSpa      = NIL_RTGCPHYS;
+        AddrRemap.cbContiguous   = 0;
 
         int rc;
@@ -2106 +2100 @@
             case VTD_TTM_LEGACY_MODE:
             {
-                rc = dmarDrLegacyModeRemapAddr(pDevIns, uRtaddrReg, PCIADDRTYPE_UNTRANSLATED, &AddrRemap);
+                rc = dmarDrLegacyModeRemapAddr(pDevIns, uRtaddrReg, &AddrRemap);
                 break;
             }
@@ -2112 +2106 @@
             case VTD_TTM_SCALABLE_MODE:
             {
-                rc = dmarDrScalableModeRemapAddr(pDevIns, uRtaddrReg, PCIADDRTYPE_UNTRANSLATED, &AddrRemap);
+                rc = dmarDrScalableModeRemapAddr(pDevIns, uRtaddrReg, &AddrRemap);
                 break;
             }