Changeset 813 in vbox

Timestamp:

Feb 9, 2007 3:53:12 PM (18 years ago)

Author:

vboxsync

Message:

Try to deal with illegal descriptors

File:

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

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

@@ -1922 +1922 @@
 }
 
+/**
+ * Fails a TMD with a generic error.
+ */
+static void pcnetXmitFailTMDGeneric(PCNetState *pData, TMD *pTmd)
+{
+    /* make carrier error - hope this is correct. */
+    pTmd->tmd2.lcar = pTmd->tmd1.err = 1;
+    pData->aCSR[0] |= BIT(15) | BIT(13); /* ERR | CERR */
+    pData->Led.Asserted.s.fError = pData->Led.Actual.s.fError = 1;
+    Log(("#%d pcnetTransmit: Signaling send error. swstyle=%#x\n",
+         PCNETSTATE_2_DEVINS(pData)->iInstance, pData->aBCR[BCR_SWS]));
+}
+
 
 /**
@@ -2045 +2058 @@
             const unsigned cb = 4096 - tmd.tmd1.bcnt;
             Log(("#%d pcnetTransmit: stp&enp: cb=%d xmtrc=%#x\n", PCNETSTATE_2_DEVINS(pData)->iInstance, cb, CSR_XMTRC(pData)));
+
             if (RT_LIKELY(pcnetIsLinkUp(pData) || CSR_LOOP(pData)))
             {
                 RTR3PTR pv;
 
-                int rc = PDMDevHlpPhys2HCVirt(pData->pDevInsHC,
-                                              PHYSADDR(pData, tmd.tmd0.tbadr), cb, &pv);
-                if (RT_SUCCESS(rc))
-                    pcnetXmitZeroCopyFrame(pData, pv, cb);
+                if (RT_LIKELY(cb < 4096))
+                {
+                    int rc = PDMDevHlpPhys2HCVirt(pData->pDevInsHC,
+                                                  PHYSADDR(pData, tmd.tmd0.tbadr), cb, &pv);
+                    if (RT_SUCCESS(rc))
+                        pcnetXmitZeroCopyFrame(pData, pv, cb);
+                    else
+                    {
+                        pcnetXmitRead1st(pData, PHYSADDR(pData, tmd.tmd0.tbadr), cb);
+                    }
+                    if (CSR_LOOP(pData))
+                        pcnetXmitLoopbackFrame(pData);
+                    else
+                    {
+                        int rc = pcnetXmitCompleteFrame(pData);
+                        if (VBOX_FAILURE(rc))
+                            return rc; /* can happen during termination */
+                    }
+                }
                 else
                 {
-                    pcnetXmitRead1st(pData, PHYSADDR(pData, tmd.tmd0.tbadr), cb);
-                }
-                if (CSR_LOOP(pData))
-                    pcnetXmitLoopbackFrame(pData);
-                else
-                {
-                    int rc = pcnetXmitCompleteFrame(pData);
-                    if (VBOX_FAILURE(rc))
-                        return rc; /* can happen during termination */
+                    /* This is only acceptable if it's not the last buffer in the chain (stp=1, enp=0) */
+                    LogRel(("PCNET: pcnetAsyncTransmit: illegal 4kb frame -> signalling error\n"));
+
+                    pcnetXmitFailTMDGeneric(pData, &tmd);
                 }
             }
@@ -2173 +2197 @@
              * Simply stop the transmitting for now.
              */
+            /** @todo according to the specs we're supposed to clear the own bit and move on to the next one. */
             Log(("#%d pcnetTransmit: guest is giving us shit!\n", PCNETSTATE_2_DEVINS(pData)->iInstance));
             break;
@@ -2187 +2212 @@
             pData->aCSR[0] |= 0x0200;    /* set TINT */
         }
+
+        /** @todo should we continue after an error (tmd.tmd1.err) or not? */
 
         STAM_COUNTER_INC(&pData->aStatXmitChainCounts[RT_MIN(cBuffers,