Changeset 23757 in vbox

Timestamp:

Oct 14, 2009 12:05:46 PM (15 years ago)

Author:

vboxsync

Message:

#4330: Fixed E1K hang and ARP offload problem in QNX.

File:

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

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

@@ -48 +48 @@
 #include <iprt/crc32.h>
 #include <iprt/ctype.h>
+#include <iprt/net.h>
 #include <iprt/semaphore.h>
 #include <iprt/string.h>
@@ -1801 +1802 @@
 
 /**
+ * Set IXSM, IPCS and TCPCS flags according to the packet type.
+ *
+ * @remarks We emulate checksum offloading for major packets types only.
+ *
+ * @returns VBox status code.
+ * @param   pState          The device state structure.
+ * @param   pFrame          The available data.
+ * @param   cb              Number of bytes available in the buffer.
+ * @param   status          Bit fields containing status info.
+ */
+static int e1kRxChecksumOffload(E1KSTATE* pState, const uint8_t *pFrame, size_t cb, E1KRXDST *pStatus)
+{
+    uint16_t uEtherType = ntohs(*(uint16_t*)(pFrame + 12));
+    PRTNETIPV4 pIpHdr4;
+
+    E1kLog2(("%s e1kRxChecksumOffload: EtherType=%x\n", INSTANCE(pState), uEtherType));
+
+    //pStatus->fIPE   = false;
+    //pStatus->fTCPE  = false;
+    switch (uEtherType)
+    {
+        case 0x800: /* IPv4 */
+            pStatus->fIXSM  = false;
+            pStatus->fIPCS  = true;
+            pIpHdr4 = (PRTNETIPV4)(pFrame + 14);
+            /* TCP/UDP checksum offloading works with TCP and UDP only */
+            pStatus->fTCPCS = pIpHdr4->ip_p == 6 || pIpHdr4->ip_p == 17;
+            break;
+        case 0x86DD: /* IPv6 */
+            pStatus->fIXSM = false;
+            pStatus->fIPCS  = false;
+            pStatus->fTCPCS = true;
+            break;
+        default: /* ARP, VLAN, etc. */
+            pStatus->fIXSM = true;
+            break;
+    }
+
+    return VINF_SUCCESS;
+}
+
+/**
  * Pad and store received packet.
  *
@@ -1848 +1891 @@
     /* Compute checksum of complete packet */
     uint16_t checksum = e1kCSum16(rxPacket + GET_BITS(RXCSUM, PCSS), cb);
+    e1kRxChecksumOffload(pState, rxPacket, cb, &status);
 
     /* Update stats */
@@ -1890 +1934 @@
             desc.u16Checksum   = checksum;
             desc.status.fDD    = true;
-            //desc.fIXSM       = true;
-            desc.status.fIPCS  = true;
-            desc.status.fTCPCS = true;
-            //desc.status.fIPE   = false;
-            //desc.status.fTCPE  = false;
+
             /*
              * We need to leave Rx critical section here or we risk deadlocking
@@ -2215 +2255 @@
         if (value)
         {
-            if (IMS)
+            /*
+             * Not clearing ICR causes QNX to hang as it reads ICR in a loop
+             * with disabled interrupts.
+             */
+            //if (IMS)
+            if (1)
             {
                 /*