Home » Mailing list archives » linux-netdev » 2008 » August » 5

[PATCH] catch up device stats when multicast > total frames

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Neil Horman <nhorman@...>
To: <netdev@...>
Cc: <nhorman@...>, <e1000-devel@...>, <jeffrey.t.kirsher@...>, <jesse.brandeburg@...>, <bruce.w.allan@...>, <john.ronciak@...>
Subject: [PATCH] catch up device stats when multicast &gt; total frames
Date: Tuesday, August 5, 2008 - 7:50 am

Hey-
	REcently observed a problem wherein, if a BMC or other IPMI device is
attached to a NIC, multicast frames can be consumed by the aformentioned device
without ever being seen by the driver.  Since multicast frames are counted in
the hardware and the total frame counter is counted in the driver napi routine,
its possible to have a condition in which the number of received multicast
frames exceeds the total number of frames.  This patch re-aligns those values on
receive, so that the total frame count is always at least as large as the
received frame count.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>


 e1000_main.c |    6 ++++++
 1 file changed, 6 insertions(+)


diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 59579b1..66afee8 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3761,6 +3761,8 @@ e1000_update_stats(struct e1000_adapter *adapter)
 	/* Fill out the OS statistics structure */
 	adapter->net_stats.multicast = adapter->stats.mprc;
 	adapter->net_stats.collisions = adapter->stats.colc;
+	if (adapter->net_stats.rx_packets < adapter->net_stats.multicast)
+		adapter->net_stats.rx_packets = adapter->net_stats.multicast;
 
 	/* Rx Errors */
 
@@ -4347,6 +4349,8 @@ next_desc:
 		adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
 
 	adapter->total_rx_packets += total_rx_packets;
+	if (adapter->total_rx_packets < adapter->net_stats.multicast)
+		adapter->total_rx_packets = adapter->net_stats.multicast;
 	adapter->total_rx_bytes += total_rx_bytes;
 	adapter->net_stats.rx_bytes += total_rx_bytes;
 	adapter->net_stats.rx_packets += total_rx_packets;
@@ -4536,6 +4540,8 @@ next_desc:
 		adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
 
 	adapter->total_rx_packets += total_rx_packets;
+	if (adapter->total_rx_packets < adapter->net_stats.multicast)
+		adapter->total_rx_packets = adapter->net_stats.multicast;
 	adapter->total_rx_bytes += total_rx_bytes;
 	adapter->net_stats.rx_bytes += total_rx_bytes;
 	adapter->net_stats.rx_packets += total_rx_packets;
-- 
/****************************************************
 * Neil Horman <nhorman@tuxdriver.com>
 * Software Engineer, Red Hat
 ****************************************************/
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] catch up device stats when multicast > total frames, Neil Horman, (Tue Aug 5, 7:50 am)
Re: [PATCH] catch up device stats when multicast &gt; total ..., Ben Hutchings, (Tue Aug 5, 8:15 am)
Re: [PATCH] catch up device stats when multicast &gt; total ..., Neil Horman, (Tue Aug 5, 9:16 am)
RE: [PATCH] catch up device stats when multicast &gt; total ..., Ronciak, John, (Tue Aug 5, 12:52 pm)
Re: [PATCH] catch up device stats when multicast &gt; total ..., Neil Horman, (Tue Aug 5, 2:03 pm)
RE: [E1000-devel] [PATCH] catch up device stats when multica..., Brandeburg, Jesse, (Tue Aug 5, 12:43 pm)
Re: [E1000-devel] [PATCH] catch up device stats when multica..., Neil Horman, (Tue Aug 5, 12:53 pm)
Re: [E1000-devel] [PATCH] catch up device stats when multica..., Ingo Oeser, (Tue Aug 5, 1:12 pm)