[dpdk-dev] ixgbe: fix tx_bytes statistic with link down

Message ID 1448965540-18953-1-git-send-email-harry.van.haaren@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Van Haaren, Harry Dec. 1, 2015, 10:25 a.m. UTC
  This patch fixes tx byte statistics when transmitting packets
with link down.

Previously, the counter would decrement 4 bytes for each packet that
was transmitted with link down, causing the uint64 to wrap around.

Fixes: c03fcee9abbd ("ixgbe: remove CRC size from byte counters")

Reported-by: Michael Qiu <michael.qiu@intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
  

Comments

De Lara Guarch, Pablo Dec. 1, 2015, 10:43 a.m. UTC | #1
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Harry van Haaren
> Sent: Tuesday, December 01, 2015 10:26 AM
> To: Ananyev, Konstantin
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] ixgbe: fix tx_bytes statistic with link down
> 
> This patch fixes tx byte statistics when transmitting packets
> with link down.
> 
> Previously, the counter would decrement 4 bytes for each packet that
> was transmitted with link down, causing the uint64 to wrap around.
> 
> Fixes: c03fcee9abbd ("ixgbe: remove CRC size from byte counters")
> 
> Reported-by: Michael Qiu <michael.qiu@intel.com>
> Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
  
Thomas Monjalon Dec. 6, 2015, 9:24 p.m. UTC | #2
> > This patch fixes tx byte statistics when transmitting packets
> > with link down.
> > 
> > Previously, the counter would decrement 4 bytes for each packet that
> > was transmitted with link down, causing the uint64 to wrap around.
> > 
> > Fixes: c03fcee9abbd ("ixgbe: remove CRC size from byte counters")
> > 
> > Reported-by: Michael Qiu <michael.qiu@intel.com>
> > Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied, thanks
  

Patch

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 808ac69..1b6cd8e 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2341,7 +2341,6 @@  ixgbe_read_stats_registers(struct ixgbe_hw *hw,
 {
 	uint32_t bprc, lxon, lxoff, total;
 	uint32_t delta_gprc = 0;
-	uint32_t delta_gptc = 0;
 	unsigned i;
 	/* Workaround for RX byte count not including CRC bytes when CRC
 +	 * strip is enabled. CRC bytes are removed from counters when crc_strip
@@ -2388,7 +2387,6 @@  ixgbe_read_stats_registers(struct ixgbe_hw *hw,
 		uint32_t delta_qprdc = IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
 
 		delta_gprc += delta_qprc;
-		delta_gptc += delta_qptc;
 
 		hw_stats->qprc[i] += delta_qprc;
 		hw_stats->qptc[i] += delta_qptc;
@@ -2444,6 +2442,8 @@  ixgbe_read_stats_registers(struct ixgbe_hw *hw,
 	if (crc_strip == 0)
 		hw_stats->gorc -= delta_gprc * ETHER_CRC_LEN;
 
+	uint64_t delta_gptc = IXGBE_READ_REG(hw, IXGBE_GPTC);
+	hw_stats->gptc += delta_gptc;
 	hw_stats->gotc -= delta_gptc * ETHER_CRC_LEN;
 	hw_stats->tor -= (hw_stats->tpr - old_tpr) * ETHER_CRC_LEN;
 
@@ -2470,7 +2470,6 @@  ixgbe_read_stats_registers(struct ixgbe_hw *hw,
 	hw_stats->lxofftxc += lxoff;
 	total = lxon + lxoff;
 
-	hw_stats->gptc += IXGBE_READ_REG(hw, IXGBE_GPTC);
 	hw_stats->mptc += IXGBE_READ_REG(hw, IXGBE_MPTC);
 	hw_stats->ptc64 += IXGBE_READ_REG(hw, IXGBE_PTC64);
 	hw_stats->gptc -= total;