Changeset 89509 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Jun 4, 2021 12:55:37 PM (3 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Fix diagnostic reason not getting updated for qualified address translation faults.

File:

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

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

@@ -1468 +1468 @@
  *
  * @param   pDevIns     The IOMMU device instance.
- * @param   enmDiag     The diagnostic reason.
  * @param   uFrcdHi     The FRCD_HI_REG value for this fault.
  * @param   uFrcdLo     The FRCD_LO_REG value for this fault.
  */
-static void dmarPrimaryFaultRecord(PPDMDEVINS pDevIns, DMARDIAG enmDiag, uint64_t uFrcdHi, uint64_t uFrcdLo)
+static void dmarPrimaryFaultRecord(PPDMDEVINS pDevIns, uint64_t uFrcdHi, uint64_t uFrcdLo)
 {
     PDMAR    pThis   = PDMDEVINS_2_DATA(pDevIns, PDMAR);
@@ -1478 +1477 @@
 
     DMAR_LOCK(pDevIns, pThisCC);
-
-    /* Update the diagnostic reason. */
-    pThis->enmDiag = enmDiag;
 
     /* We don't support advance fault logging. */
@@ -1513 +1509 @@
 static void dmarIrFaultRecord(PPDMDEVINS pDevIns, DMARDIAG enmDiag, VTDIRFAULT enmIrFault, uint16_t idDevice, uint16_t idxIntr)
 {
+    /* Update the diagnostic reason. */
+    PDMAR pThis = PDMDEVINS_2_DATA(pDevIns, PDMAR);
+    pThis->enmDiag = enmDiag;
+
     uint64_t const uFrcdHi = RT_BF_MAKE(VTD_BF_1_FRCD_REG_SID, idDevice)
                            | RT_BF_MAKE(VTD_BF_1_FRCD_REG_FR,  enmIrFault)
                            | RT_BF_MAKE(VTD_BF_1_FRCD_REG_F,   1);
     uint64_t const uFrcdLo = (uint64_t)idxIntr << 48;
-    dmarPrimaryFaultRecord(pDevIns, enmDiag, uFrcdHi, uFrcdLo);
+    dmarPrimaryFaultRecord(pDevIns, uFrcdHi, uFrcdLo);
 }
 
@@ -1541 +1541 @@
     if (!(pIrte->au64[0] & VTD_BF_0_IRTE_FPD_MASK))
         return dmarIrFaultRecord(pDevIns, enmDiag, enmIrFault, idDevice, idxIntr);
+
+    /* Update the diagnostic reason (even if software wants to supress faults). */
+    PDMAR pThis = PDMDEVINS_2_DATA(pDevIns, PDMAR);
+    pThis->enmDiag = enmDiag;
 }
 
@@ -1556 +1560 @@
                                 PCDMARMEMREQAUX pMemReqAux)
 {
+    /* Update the diagnostic reason (even if software wants to supress faults). */
+    PDMAR pThis = PDMDEVINS_2_DATA(pDevIns, PDMAR);
+    pThis->enmDiag = enmDiag;
+
     /*
      * Qualified faults are those that can be suppressed by software using the FPD bit
@@ -1582 +1590 @@
                                | RT_BF_MAKE(VTD_BF_1_FRCD_REG_F,    1);
         uint64_t const uFrcdLo = pMemReqIn->AddrRange.uAddr & X86_PAGE_BASE_MASK;
-        dmarPrimaryFaultRecord(pDevIns, enmDiag, uFrcdHi, uFrcdLo);
+        dmarPrimaryFaultRecord(pDevIns, uFrcdHi, uFrcdLo);
     }
 }