Merge zizzer.eecs.umich.edu:/bk/m5

into shizzle.(none):/home/hsul/work/linux-clean

--HG--
extra : convert_revision : cd46aa31dab82e43c3c4f8bb6f0fe2e018acfd12

2 files changed, 84 insertions, 0 deletions

diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 64f255e6b..c6fc5513d 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -187,6 +187,59 @@ NSGigE::regStats()
         .prereq(rxBytes)
         ;
 
+    txIPChecksums
+        .name(name() + ".txIPChecksums")
+        .desc("Number of tx IP Checksums done by device")
+        .precision(0)
+        .prereq(txBytes)
+        ;
+
+    rxIPChecksums
+        .name(name() + ".rxIPChecksums")
+        .desc("Number of rx IP Checksums done by device")
+        .precision(0)
+        .prereq(rxBytes)
+        ;
+
+    txTCPChecksums
+        .name(name() + ".txTCPChecksums")
+        .desc("Number of tx TCP Checksums done by device")
+        .precision(0)
+        .prereq(txBytes)
+        ;
+
+    rxTCPChecksums
+        .name(name() + ".rxTCPChecksums")
+        .desc("Number of rx TCP Checksums done by device")
+        .precision(0)
+        .prereq(rxBytes)
+        ;
+
+    descDmaReads
+        .name(name() + ".descDMAReads")
+        .desc("Number of descriptors the device read w/ DMA")
+        .precision(0)
+        ;
+
+    descDmaWrites
+        .name(name() + ".descDMAWrites")
+        .desc("Number of descriptors the device wrote w/ DMA")
+        .precision(0)
+        ;
+
+    descDmaRdBytes
+        .name(name() + ".descDmaReadBytes")
+        .desc("number of descriptor bytes read w/ DMA")
+        .precision(0)
+        ;
+
+   descDmaWrBytes
+        .name(name() + ".descDmaWriteBytes")
+        .desc("number of descriptor bytes write w/ DMA")
+        .precision(0)
+        ;
+
+
     txBandwidth
         .name(name() + ".txBandwidth")
         .desc("Transmit Bandwidth (bits/s)")
@@ -1273,6 +1326,9 @@ NSGigE::rxKick()
             rxDmaLen = sizeof(rxDescCache.link);
             rxDmaFree = dmaDescFree;
 
+            descDmaReads++;
+            descDmaRdBytes += rxDmaLen;
+
             if (doRxDmaRead())
                 goto exit;
         } else {
@@ -1283,6 +1339,9 @@ NSGigE::rxKick()
             rxDmaLen = sizeof(ns_desc);
             rxDmaFree = dmaDescFree;
 
+            descDmaReads++;
+            descDmaRdBytes += rxDmaLen;
+
             if (doRxDmaRead())
                 goto exit;
         }
@@ -1400,15 +1459,18 @@ NSGigE::rxKick()
 
             if (rxPacket->isIpPkt() && extstsEnable) {
                 rxDescCache.extsts |= EXTSTS_IPPKT;
+                rxIPChecksums++;
                 if (!ipChecksum(rxPacket, false)) {
                     DPRINTF(EthernetCksum, "Rx IP Checksum Error\n");
                     rxDescCache.extsts |= EXTSTS_IPERR;
                 }
                 if (rxPacket->isTcpPkt()) {
                     rxDescCache.extsts |= EXTSTS_TCPPKT;
+                    rxTCPChecksums++;
                     if (!tcpChecksum(rxPacket, false)) {
                         DPRINTF(EthernetCksum, "Rx TCP Checksum Error\n");
                         rxDescCache.extsts |= EXTSTS_TCPERR;
+
                     }
                 } else if (rxPacket->isUdpPkt()) {
                     rxDescCache.extsts |= EXTSTS_UDPPKT;
@@ -1434,6 +1496,9 @@ NSGigE::rxKick()
             rxDmaLen = sizeof(rxDescCache.cmdsts) + sizeof(rxDescCache.extsts);
             rxDmaFree = dmaDescFree;
 
+            descDmaWrites++;
+            descDmaWrBytes += rxDmaLen;
+
             if (doRxDmaWrite())
                 goto exit;
         }
@@ -1707,6 +1772,9 @@ NSGigE::txKick()
             txDmaLen = sizeof(txDescCache.link);
             txDmaFree = dmaDescFree;
 
+            descDmaReads++;
+            descDmaRdBytes += txDmaLen;
+
             if (doTxDmaRead())
                 goto exit;
 
@@ -1718,6 +1786,9 @@ NSGigE::txKick()
             txDmaLen = sizeof(ns_desc);
             txDmaFree = dmaDescFree;
 
+            descDmaReads++;
+            descDmaRdBytes += txDmaLen;
+
             if (doTxDmaRead())
                 goto exit;
         }
@@ -1780,9 +1851,11 @@ NSGigE::txKick()
                         udpChecksum(txPacket, true);
                     } else if (txDescCache.extsts & EXTSTS_TCPPKT) {
                         tcpChecksum(txPacket, true);
+                        txTCPChecksums++;
                     }
                     if (txDescCache.extsts & EXTSTS_IPPKT) {
                         ipChecksum(txPacket, true);
+                        txIPChecksums++;
                     }
                 }
 
@@ -1813,6 +1886,9 @@ NSGigE::txKick()
                 txDmaLen = sizeof(txDescCache.cmdsts) + sizeof(txDescCache.extsts);
                 txDmaFree = dmaDescFree;
 
+                descDmaWrites++;
+                descDmaWrBytes += txDmaLen;
+
                 if (doTxDmaWrite())
                     goto exit;
 
diff --git a/dev/ns_gige.hh b/dev/ns_gige.hh
index 191c867ce..a8d8d1f18 100644
--- a/dev/ns_gige.hh
+++ b/dev/ns_gige.hh
@@ -366,6 +366,14 @@ class NSGigE : public PciDev
     Stats::Scalar<> rxBytes;
     Stats::Scalar<> txPackets;
     Stats::Scalar<> rxPackets;
+    Stats::Scalar<> txIPChecksums;
+    Stats::Scalar<> rxIPChecksums;
+    Stats::Scalar<> txTCPChecksums;
+    Stats::Scalar<> rxTCPChecksums;
+    Stats::Scalar<> descDmaReads;
+    Stats::Scalar<> descDmaWrites;
+    Stats::Scalar<> descDmaRdBytes;
+    Stats::Scalar<> descDmaWrBytes;
     Stats::Formula txBandwidth;
     Stats::Formula rxBandwidth;
     Stats::Formula txPacketRate;