[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 07/12] e1000: Fixing the received/transmitted octe
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL v2 07/12] e1000: Fixing the received/transmitted octets' counters |
Date: |
Thu, 12 Nov 2015 16:32:25 +0800 |
From: Leonid Bloch <address@hidden>
Previously, these 64-bit registers did not stick at their maximal
values when (and if) they reached them, as they should do, according to
the specs.
This patch introduces a function that takes care of such registers,
avoiding code duplication, making the relevant parts more compatible
with the QEMU coding style, while ensuring that in the unlikely case
of reaching the maximal value, the counter will stick there, as it
supposed to.
Signed-off-by: Leonid Bloch <address@hidden>
Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/e1000.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 57a61f6..9967b5d 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -588,6 +588,20 @@ inc_reg_if_not_full(E1000State *s, int index)
}
}
+static void
+grow_8reg_if_not_full(E1000State *s, int index, int size)
+{
+ uint64_t sum = s->mac_reg[index] | (uint64_t)s->mac_reg[index+1] << 32;
+
+ if (sum + size < sum) {
+ sum = ~0ULL;
+ } else {
+ sum += size;
+ }
+ s->mac_reg[index] = sum;
+ s->mac_reg[index+1] = sum >> 32;
+}
+
static inline int
vlan_enabled(E1000State *s)
{
@@ -637,7 +651,7 @@ static void
xmit_seg(E1000State *s)
{
uint16_t len, *sp;
- unsigned int frames = s->tx.tso_frames, css, sofar, n;
+ unsigned int frames = s->tx.tso_frames, css, sofar;
struct e1000_tx *tp = &s->tx;
if (tp->tse && tp->cptse) {
@@ -686,10 +700,8 @@ xmit_seg(E1000State *s)
}
inc_reg_if_not_full(s, TPT);
+ grow_8reg_if_not_full(s, TOTL, s->tx.size);
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]++;
}
static void
@@ -1104,11 +1116,9 @@ e1000_receive_iov(NetClientState *nc, const struct iovec
*iov, int iovcnt)
/* TOR - Total Octets Received:
* This register includes bytes received in a packet from the <Destination
* Address> field through the <CRC> field, inclusively.
+ * Always include FCS length (4) in size.
*/
- n = s->mac_reg[TORL] + size + /* Always include FCS length. */ 4;
- if (n < s->mac_reg[TORL])
- s->mac_reg[TORH]++;
- s->mac_reg[TORL] = n;
+ grow_8reg_if_not_full(s, TORL, size+4);
n = E1000_ICS_RXT0;
if ((rdt = s->mac_reg[RDT]) < s->mac_reg[RDH])
--
2.1.4
- [Qemu-devel] [PULL v2 00/12] Net patches, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 01/12] slirp: Fix type casts and format strings in debug code, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 02/12] e1000: Cosmetic and alignment fixes, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 03/12] e1000: Add support for migrating the entire MAC registers' array, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 04/12] e1000: Introduced an array to control the access to the MAC registers, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 05/12] e1000: Trivial implementation of various MAC registers, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 06/12] e1000: Fixing the received/transmitted packets' counters, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 07/12] e1000: Fixing the received/transmitted octets' counters,
Jason Wang <=
- [Qemu-devel] [PULL v2 08/12] e1000: Fixing the packet address filtering procedure, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 09/12] e1000: Implementing various counters, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 10/12] e1000: Introducing backward compatibility command line parameter, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 11/12] net: netmap: Fix compilation issue, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 12/12] net: netmap: use error_setg() helpers in place of error_report(), Jason Wang, 2015/11/12
- Re: [Qemu-devel] [PULL v2 00/12] Net patches, Peter Maydell, 2015/11/12