From: Jeff Kirsher <jeffrey.t.kirsher@intel•com>
To: greg@kroah•com
Cc: stable@kernel•org, netdev@vger•kernel.org, gospo@redhat•com,
bphilips@novell•com, Eric Dumazet <eric.dumazet@gmail•com>,
Jeff Kirsher <jeffrey.t.kirsher@intel•com>
Subject: [stable-2.6.32 PATCH] igb: rx_fifo_errors counter fix
Date: Tue, 05 Oct 2010 16:04:09 -0700 [thread overview]
Message-ID: <20101005230407.24172.84596.stgit@localhost.localdomain> (raw)
From: Eric Dumazet <eric.dumazet@gmail•com>
Alexey Vlasov reported insane rx_queue_drop_packet_count
(rx_fifo_errors) values.
IGB drivers is doing an accumulation for 82575, instead using a zero
value for rqdpc_total.
Reported-by: Alexey Vlasov <renton@renton•name>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail•com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel•com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel•com>
---
drivers/net/igb/igb_main.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 8111776..a13705b 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3552,6 +3552,7 @@ void igb_update_stats(struct igb_adapter *adapter)
struct e1000_hw *hw = &adapter->hw;
struct pci_dev *pdev = adapter->pdev;
u16 phy_tmp;
+ unsigned long rqdpc_total = 0;
#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
@@ -3645,7 +3646,6 @@ void igb_update_stats(struct igb_adapter *adapter)
if (hw->mac.type != e1000_82575) {
u32 rqdpc_tmp;
- u64 rqdpc_total = 0;
int i;
/* Read out drops stats per RX queue. Notice RQDPC (Receive
* Queue Drop Packet Count) stats only gets incremented, if
@@ -3660,7 +3660,6 @@ void igb_update_stats(struct igb_adapter *adapter)
adapter->rx_ring[i].rx_stats.drops += rqdpc_tmp;
rqdpc_total += adapter->rx_ring[i].rx_stats.drops;
}
- adapter->net_stats.rx_fifo_errors = rqdpc_total;
}
/* Note RNBC (Receive No Buffers Count) is an not an exact
@@ -3668,7 +3667,7 @@ void igb_update_stats(struct igb_adapter *adapter)
* one of the reason for saving it in rx_fifo_errors, as its
* potentially not a true drop.
*/
- adapter->net_stats.rx_fifo_errors += adapter->stats.rnbc;
+ adapter->net_stats.rx_fifo_errors = rqdpc_total + adapter->stats.rnbc;
/* RLEC on some newer hardware can be incorrect so build
* our own version based on RUC and ROC */
next reply other threads:[~2010-10-05 23:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-05 23:04 Jeff Kirsher [this message]
2010-10-05 23:14 ` [stable-2.6.32 PATCH] igb: rx_fifo_errors counter fix David Miller
2010-10-05 23:19 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101005230407.24172.84596.stgit@localhost.localdomain \
--to=jeffrey.t.kirsher@intel$(echo .)com \
--cc=bphilips@novell$(echo .)com \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=gospo@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=stable@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox