From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58127)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leonid.bloch@ravellosystems.com>) id 1Zniml-0000hQ-IX
	for qemu-devel@nongnu.org; Sun, 18 Oct 2015 03:53:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leonid.bloch@ravellosystems.com>) id 1Znimi-00017Y-6H
	for qemu-devel@nongnu.org; Sun, 18 Oct 2015 03:53:43 -0400
Received: from mail-wi0-f178.google.com ([209.85.212.178]:37866)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leonid.bloch@ravellosystems.com>) id 1Znimh-00017L-WB
	for qemu-devel@nongnu.org; Sun, 18 Oct 2015 03:53:40 -0400
Received: by wicfv8 with SMTP id fv8so39212691wic.0
	for <qemu-devel@nongnu.org>; Sun, 18 Oct 2015 00:53:39 -0700 (PDT)
From: Leonid Bloch <leonid.bloch@ravellosystems.com>
Date: Sun, 18 Oct 2015 10:53:16 +0300
Message-Id: <1445154799-31083-4-git-send-email-leonid.bloch@ravellosystems.com>
In-Reply-To: <1445154799-31083-1-git-send-email-leonid.bloch@ravellosystems.com>
References: <1445154799-31083-1-git-send-email-leonid.bloch@ravellosystems.com>
Subject: [Qemu-devel] [PATCH 3/6] e1000: Fixing the received/transmitted
	packets' counters
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Dmitry Fleytman <dmitry@daynix.com>, Jason Wang <jasowang@redhat.com>, Leonid Bloch <leonid@daynix.com>, Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>

According to Intel's specs, these counters (as all the other Statistic
registers) stick at 0xffffffff when the maximum value is reached.
Previously, they would reset after the max. value.

Signed-off-by: Leonid Bloch <leonid.bloch@ravellosystems.com>
Signed-off-by: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
---
 hw/net/e1000.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 6f754ac..5530285 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -575,6 +575,14 @@ putsum(uint8_t *data, uint32_t n, uint32_t sloc, uint32_t css, uint32_t cse)
     }
 }
 
+static inline void
+inc_reg_if_not_full(E1000State *s, int index)
+{
+    if (s->mac_reg[index] != 0xffffffff) {
+        s->mac_reg[index]++;
+    }
+}
+
 static inline int
 vlan_enabled(E1000State *s)
 {
@@ -669,8 +677,8 @@ xmit_seg(E1000State *s)
         e1000_send_packet(s, tp->vlan, tp->size + 4);
     } else
         e1000_send_packet(s, tp->data, tp->size);
-    s->mac_reg[TPT]++;
-    s->mac_reg[GPTC]++;
+    inc_reg_if_not_full(s, TPT);
+    s->mac_reg[GPTC] = s->mac_reg[TPT];
     n = s->mac_reg[TOTL];
     if ((s->mac_reg[TOTL] += s->tx.size) < n)
         s->mac_reg[TOTH]++;
@@ -1083,8 +1091,8 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt)
         }
     } while (desc_offset < total_size);
 
-    s->mac_reg[GPRC]++;
-    s->mac_reg[TPR]++;
+    inc_reg_if_not_full(s, TPR);
+    s->mac_reg[GPRC] = s->mac_reg[TPR];
     /* TOR - Total Octets Received:
      * This register includes bytes received in a packet from the <Destination
      * Address> field through the <CRC> field, inclusively.
-- 
2.4.3