Changeset 86486 in vbox for trunk/src

Timestamp:

Oct 8, 2020 7:35:08 AM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 E1000: Use PCI interfaces while reading/writing guest physical memory.

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (14 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -1913 +1913 @@
         return 0;
     E1KRXDESC* pFirstEmptyDesc = &pThis->aRxDescriptors[pThis->nRxDFetched];
-    PDMDevHlpPhysRead(pDevIns,
-                      ((uint64_t)RDBAH << 32) + RDBAL + nFirstNotLoaded * sizeof(E1KRXDESC),
-                      pFirstEmptyDesc, nDescsInSingleRead * sizeof(E1KRXDESC));
+    PDMDevHlpPCIPhysRead(pDevIns,
+                         ((uint64_t)RDBAH << 32) + RDBAL + nFirstNotLoaded * sizeof(E1KRXDESC),
+                         pFirstEmptyDesc, nDescsInSingleRead * sizeof(E1KRXDESC));
     // uint64_t addrBase = ((uint64_t)RDBAH << 32) + RDBAL;
     // unsigned i, j;
@@ -1929 +1929 @@
     if (nDescsToFetch > nDescsInSingleRead)
     {
-        PDMDevHlpPhysRead(pDevIns,
-                          ((uint64_t)RDBAH << 32) + RDBAL,
-                          pFirstEmptyDesc + nDescsInSingleRead,
-                          (nDescsToFetch - nDescsInSingleRead) * sizeof(E1KRXDESC));
+        PDMDevHlpPCIPhysRead(pDevIns,
+                             ((uint64_t)RDBAH << 32) + RDBAL,
+                             pFirstEmptyDesc + nDescsInSingleRead,
+                             (nDescsToFetch - nDescsInSingleRead) * sizeof(E1KRXDESC));
         // Assert(i == pThis->nRxDFetched  + nDescsInSingleRead);
         // for (j = 0; i < pThis->nRxDFetched + nDescsToFetch; ++i, ++j)
@@ -2553 +2553 @@
         /* Load the descriptor pointed by head */
         E1KRXDESC desc, *pDesc = &desc;
-        PDMDevHlpPhysRead(pDevIns, e1kDescAddr(RDBAH, RDBAL, RDH), &desc, sizeof(desc));
+        PDMDevHlpPCIPhysRead(pDevIns, e1kDescAddr(RDBAH, RDBAL, RDH), &desc, sizeof(desc));
 # endif /* !E1K_WITH_RXD_CACHE */
         if (pDesc->u64BufAddr)
@@ -3925 +3925 @@
 DECLINLINE(void) e1kLoadDesc(PPDMDEVINS pDevIns, E1KTXDESC *pDesc, RTGCPHYS addr)
 {
-    PDMDevHlpPhysRead(pDevIns, addr, pDesc, sizeof(E1KTXDESC));
+    PDMDevHlpPCIPhysRead(pDevIns, addr, pDesc, sizeof(E1KTXDESC));
 }
 #else /* E1K_WITH_TXD_CACHE */
@@ -3956 +3956 @@
         return 0;
     E1KTXDESC* pFirstEmptyDesc = &pThis->aTxDescriptors[pThis->nTxDFetched];
-    PDMDevHlpPhysRead(pDevIns,
-                      ((uint64_t)TDBAH << 32) + TDBAL + nFirstNotLoaded * sizeof(E1KTXDESC),
-                      pFirstEmptyDesc, nDescsInSingleRead * sizeof(E1KTXDESC));
+    PDMDevHlpPCIPhysRead(pDevIns,
+                         ((uint64_t)TDBAH << 32) + TDBAL + nFirstNotLoaded * sizeof(E1KTXDESC),
+                         pFirstEmptyDesc, nDescsInSingleRead * sizeof(E1KTXDESC));
     E1kLog3(("%s Fetched %u TX descriptors at %08x%08x(0x%x), TDLEN=%08x, TDH=%08x, TDT=%08x\n",
              pThis->szPrf, nDescsInSingleRead,
@@ -3965 +3965 @@
     if (nDescsToFetch > nDescsInSingleRead)
     {
-        PDMDevHlpPhysRead(pDevIns,
-                          ((uint64_t)TDBAH << 32) + TDBAL,
-                          pFirstEmptyDesc + nDescsInSingleRead,
-                          (nDescsToFetch - nDescsInSingleRead) * sizeof(E1KTXDESC));
+        PDMDevHlpPCIPhysRead(pDevIns,
+                             ((uint64_t)TDBAH << 32) + TDBAL,
+                             pFirstEmptyDesc + nDescsInSingleRead,
+                             (nDescsToFetch - nDescsInSingleRead) * sizeof(E1KTXDESC));
         E1kLog3(("%s Fetched %u TX descriptors at %08x%08x\n",
                  pThis->szPrf, nDescsToFetch - nDescsInSingleRead,
@@ -4217 +4217 @@
     Assert(pThis->u32PayRemain + pThis->u16HdrRemain > 0);
 
-    PDMDevHlpPhysRead(pDevIns, PhysAddr, pThis->aTxPacketFallback + pThis->u16TxPktLen, u16Len);
+    PDMDevHlpPCIPhysRead(pDevIns, PhysAddr, pThis->aTxPacketFallback + pThis->u16TxPktLen, u16Len);
     E1kLog3(("%s Dump of the segment:\n"
              "%.*Rhxd\n"
@@ -4327 +4327 @@
 
     if (pThis->u16TxPktLen + u16Len <= sizeof(pThis->aTxPacketFallback))
-        PDMDevHlpPhysRead(pDevIns, PhysAddr, pThis->aTxPacketFallback + pThis->u16TxPktLen, u16Len);
+        PDMDevHlpPCIPhysRead(pDevIns, PhysAddr, pThis->aTxPacketFallback + pThis->u16TxPktLen, u16Len);
     else
         E1kLog(("%s e1kFallbackAddSegment: writing beyond aTxPacketFallback, u16TxPktLen=%d(0x%x) + u16Len=%d(0x%x) > %d\n",
@@ -4639 +4639 @@
                     pThis->szPrf, pTxSg->cbUsed, pTxSg->cbUsed, pThis->u16TxPktLen, pThis->u16TxPktLen));
 
-        PDMDevHlpPhysRead(pDevIns, PhysAddr, (uint8_t *)pTxSg->aSegs[0].pvSeg + pThis->u16TxPktLen, cbFragment);
+        PDMDevHlpPCIPhysRead(pDevIns, PhysAddr, (uint8_t *)pTxSg->aSegs[0].pvSeg + pThis->u16TxPktLen, cbFragment);
 
         pTxSg->cbUsed = cbNewPkt;
@@ -5448 +5448 @@
     {
         E1KTXDESC desc;
-        PDMDevHlpPhysRead(pDevIns , e1kDescAddr(TDBAH, TDBAL, i), &desc, sizeof(desc));
+        PDMDevHlpPCIPhysRead(pDevIns , e1kDescAddr(TDBAH, TDBAL, i), &desc, sizeof(desc));
         if (i == tdh)
             LogRel(("E1000: >>> "));
@@ -6407 +6407 @@
     {
         E1KRXDESC desc;
-        PDMDevHlpPhysRead(pDevIns, e1kDescAddr(RDBAH, RDBAL, RDH), &desc, sizeof(desc));
+        PDMDevHlpPCIPhysRead(pDevIns, e1kDescAddr(RDBAH, RDBAL, RDH), &desc, sizeof(desc));
         if (desc.status.fDD)
             cb = 0;
@@ -6436 +6436 @@
     {
         E1KRXDESC desc;
-        PDMDevHlpPhysRead(pDevIns, e1kDescAddr(RDBAH, RDBAL, RDH), &desc, sizeof(desc));
+        PDMDevHlpPCIPhysRead(pDevIns, e1kDescAddr(RDBAH, RDBAL, RDH), &desc, sizeof(desc));
         if (desc.status.fDD)
             rc = VERR_NET_NO_BUFFER_SPACE;
@@ -7328 +7328 @@
     {
         E1KRXDESC desc;
-        PDMDevHlpPhysRead(pDevIns, e1kDescAddr(RDBAH, RDBAL, i),
-                          &desc, sizeof(desc));
+        PDMDevHlpPCIPhysRead(pDevIns, e1kDescAddr(RDBAH, RDBAL, i),
+                             &desc, sizeof(desc));
         if (i == rdh)
             pHlp->pfnPrintf(pHlp, ">>> ");
@@ -7357 +7357 @@
     {
         E1KTXDESC desc;
-        PDMDevHlpPhysRead(pDevIns, e1kDescAddr(TDBAH, TDBAL, i),
-                          &desc, sizeof(desc));
+        PDMDevHlpPCIPhysRead(pDevIns, e1kDescAddr(TDBAH, TDBAL, i),
+                             &desc, sizeof(desc));
         if (i == tdh)
             pHlp->pfnPrintf(pHlp, ">>> ");