Changeset 78458 in vbox

Timestamp:

May 9, 2019 3:38:49 PM (5 years ago)

Author:

vboxsync

Message:

PCnet: Warn when guest sets up a misaligned descriptor ring.

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (3 diffs)

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

@@ -1604 +1604 @@
     CSR_CXST(pThis) = CSR_CXBC(pThis) = CSR_NXST(pThis) = CSR_NXBC(pThis) = 0;
 
-    LogRel(("PCnet#%d: Init: ss32=%d GCRDRA=%#010x[%d] GCTDRA=%#010x[%d]%s\n",
-            PCNET_INST_NR, BCR_SSIZE32(pThis),
+    LogRel(("PCnet#%d: Init: SWSTYLE=%d GCRDRA=%#010x[%d] GCTDRA=%#010x[%d]%s\n",
+            PCNET_INST_NR, BCR_SWSTYLE(pThis),
             pThis->GCRDRA, CSR_RCVRL(pThis), pThis->GCTDRA, CSR_XMTRL(pThis),
             !pThis->fSignalRxMiss ? " (CSR0_MISS disabled)" : ""));
+
+    if (pThis->GCRDRA & (pThis->iLog2DescSize - 1))
+        LogRel(("PCnet#%d: Warning: Misaligned RDRA\n", PCNET_INST_NR));
+    if (pThis->GCTDRA & (pThis->iLog2DescSize - 1))
+        LogRel(("PCnet#%d: Warning: Misaligned TDRA\n", PCNET_INST_NR));
 
     pThis->aCSR[0] |=  0x0101;       /* Initialization done */
@@ -3033 +3038 @@
                 pThis->GCRDRA = (pThis->GCRDRA & 0x0000ffff) | ((val & 0x0000ffff) << 16);
             Log(("#%d: WRITE CSR%d, %#06x => GCRDRA=%08x (alt init)\n", PCNET_INST_NR, u32RAP, val, pThis->GCRDRA));
+            if (pThis->GCRDRA & (pThis->iLog2DescSize - 1))
+                LogRel(("PCnet#%d: Warning: Misaligned RDRA (GCRDRA=%#010x)\n", PCNET_INST_NR, pThis->GCRDRA));
             break;
 
@@ -3051 +3058 @@
                 pThis->GCTDRA = (pThis->GCTDRA & 0x0000ffff) | ((val & 0x0000ffff) << 16);
             Log(("#%d: WRITE CSR%d, %#06x => GCTDRA=%08x (alt init)\n", PCNET_INST_NR, u32RAP, val, pThis->GCTDRA));
+            if (pThis->GCTDRA & (pThis->iLog2DescSize - 1))
+                LogRel(("PCnet#%d: Warning: Misaligned TDRA (GCTDRA=%#010x)\n", PCNET_INST_NR, pThis->GCTDRA));
             break;