Changeset 89726 in vbox for trunk/src/VBox

Timestamp:

Jun 16, 2021 5:23:55 AM (4 years ago)

Author:

vboxsync

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

145177

Message:

Intel IOMMU: bugref:9967 Validate reserved bits in domain ID (if we ever choose a smaller domain ID size). Release build fixes.

File:

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

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

@@ -364 +364 @@
     /** Maximum guest-address width (MGAW) invalid address mask. */
     uint64_t                    fMgawInvMask;
+    /** Context-entry qword-1 valid mask. */
+    uint64_t                    fCtxEntryQw1ValidMask;
     /** Maximum supported paging level (3, 4 or 5). */
     uint8_t                     cMaxPagingLevel;
@@ -1402 +1404 @@
 static void dmarFaultEventRaiseInterrupt(PPDMDEVINS pDevIns)
 {
-    PDMAR    pThis   = PDMDEVINS_2_DATA(pDevIns, PDMAR);
     PCDMARCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PCDMARCC);
     DMAR_ASSERT_LOCK_IS_OWNER(pDevIns, pThisCC);
@@ -1408 +1409 @@
 #ifdef RT_STRICT
     {
+        PDMAR pThis = PDMDEVINS_2_DATA(pDevIns, PDMAR);
         uint32_t const uFstsReg = dmarRegReadRaw32(pThis, VTD_MMIO_OFF_FSTS_REG);
         uint32_t const fFaultMask = VTD_BF_FSTS_REG_PPF_MASK | VTD_BF_FSTS_REG_PFO_MASK
@@ -2445 +2447 @@
                     {
                         /* Validate reserved bits in the context-entry. */
+                        PCDMAR pThis = PDMDEVINS_2_DATA(pDevIns, PCDMAR);
                         if (   !(uCtxEntryQword0 & ~VTD_CONTEXT_ENTRY_0_VALID_MASK)
-                            && !(uCtxEntryQword1 & ~VTD_CONTEXT_ENTRY_1_VALID_MASK))
+                            && !(uCtxEntryQword1 & ~pThis->fCtxEntryQw1ValidMask))
                         {
                             /* Get the domain ID for this mapping. */
@@ -2452 +2455 @@
 
                             /* Validate the translation type (TT). */
-                            PCDMAR pThis = PDMDEVINS_2_DATA(pDevIns, PCDMAR);
                             uint8_t const fTt = RT_BF_GET(uCtxEntryQword0, VTD_BF_0_CONTEXT_ENTRY_TT);
                             switch (fTt)
@@ -2476 +2478 @@
                                             return dmarDrMemRangeLookup(pDevIns, dmarDrSecondLevelTranslate, pMemReqRemap);
                                         }
-                                        else
-                                            dmarAtFaultRecord(pDevIns, kDmarDiag_At_Lm_Ut_Aw_Invalid, pMemReqIn, pMemReqAux);
+                                        dmarAtFaultRecord(pDevIns, kDmarDiag_At_Lm_Ut_Aw_Invalid, pMemReqIn, pMemReqAux);
                                     }
                                     else
@@ -2562 +2563 @@
 static int dmarDrScalableModeRemapAddr(PPDMDEVINS pDevIns, uint64_t uRtaddrReg, PDMARMEMREQREMAP pMemReqRemap)
 {
-    RT_NOREF2(uRtaddrReg, pMemReqRemap);
-    PCDMAR pThis = PDMDEVINS_2_DATA(pDevIns, PDMAR);
-    Assert(pThis->fExtCapReg & VTD_BF_ECAP_REG_SMTS_MASK);
+    RT_NOREF3(pDevIns, uRtaddrReg, pMemReqRemap);
     return VERR_NOT_IMPLEMENTED;
 }
@@ -3832 +3831 @@
         uint8_t const fEsrtps  = 1;                                /* Enhanced SRTPS (auto invalidate cache on SRTP). */
         uint8_t const fEsirtps = 1;                                /* Enhanced SIRTPS (auto invalidate cache on SIRTP). */
-        AssertCompile(DMAR_ND <= 6);
 
         pThis->fCapReg = RT_BF_MAKE(VTD_BF_CAP_REG_ND,      fNd)
@@ -3857 +3855 @@
         dmarRegWriteRaw64(pThis, VTD_MMIO_OFF_CAP_REG, pThis->fCapReg);
 
-        pThis->fHawBaseMask    = ~(UINT64_MAX << cGstPhysAddrBits) & X86_PAGE_4K_BASE_MASK;
-        pThis->fMgawInvMask    = UINT64_MAX << cGstPhysAddrBits;
-        pThis->cMaxPagingLevel = vtdCapRegGetMaxPagingLevel(fSagaw);
+        AssertCompile(fNd <= RT_ELEMENTS(g_auNdMask));
+        pThis->fHawBaseMask          = ~(UINT64_MAX << cGstPhysAddrBits) & X86_PAGE_4K_BASE_MASK;
+        pThis->fMgawInvMask          = UINT64_MAX << cGstPhysAddrBits;
+        pThis->cMaxPagingLevel       = vtdCapRegGetMaxPagingLevel(fSagaw);
+        pThis->fCtxEntryQw1ValidMask = VTD_BF_1_CONTEXT_ENTRY_AW_MASK
+                                     | VTD_BF_1_CONTEXT_ENTRY_IGN_6_3_MASK
+                                     | RT_BF_MAKE(VTD_BF_1_CONTEXT_ENTRY_DID, g_auNdMask[fNd]);
     }