Re: [PATCH net-next] via-rhine: add 64bit statistics.

[Jamie Gloudon <jamie.gloudon@gmail.com>]

On Wed, Jan 23, 2013 at 08:17:18AM -0800, Eric Dumazet wrote:
> On Wed, 2013-01-23 at 11:41 -0400, Jamie Gloudon wrote:
> > On Wed, Jan 23, 2013 at 06:38:04AM -0800, Eric Dumazet wrote:
> > > On Wed, 2013-01-23 at 10:31 -0400, Jamie Gloudon wrote:
> > > > Switch to use ndo_get_stats64 to get 64bit statistics.
> > > > 
> > > > Signed-off-by: Jamie Gloudon <jamie.gloudon@gmail.com>
> > > > ---
> > > 
> > > > +
> > > > +	stats->rx_errors = dev->stats.rx_errors;
> > > > +	stats->tx_errors = dev->stats.tx_errors;
> > > > +	stats->rx_dropped = dev->stats.rx_dropped;
> > > > +	stats->tx_dropped = dev->stats.tx_dropped;
> > > > +	stats->collisions = dev->stats.collisions;
> > > > +
> > > > +	stats->rx_length_errors = dev->stats.rx_length_errors;
> > > > +	stats->rx_crc_errors = dev->stats.rx_crc_errors;
> > > > +	stats->rx_frame_errors = dev->stats.rx_frame_errors;
> > > > +	stats->rx_fifo_errors = dev->stats.rx_fifo_errors;
> > > > +	stats->rx_missed_errors = dev->stats.rx_missed_errors;
> > > > +
> > > > +	stats->tx_aborted_errors = dev->stats.tx_aborted_errors;
> > > > +	stats->tx_carrier_errors = dev->stats.tx_carrier_errors;
> > > > +	stats->tx_fifo_errors = dev->stats.tx_fifo_errors;
> > > > +	stats->tx_heartbeat_errors = dev->stats.tx_heartbeat_errors;
> > > > +	stats->tx_window_errors = dev->stats.tx_window_errors;
> > > > +
> > > > +	return stats;
> > > >  }
> > > >  
> > > 
> > > Hi Jamie
> > > 
> > > Please use netdev_stats_to_stats64() for this block
> > > 
> > > commit 77a1abf54f4b003ad6e59c535045b2ad89fedfeb
> > > Author: Eric Dumazet <eric.dumazet@gmail.com>
> > > Date:   Mon Mar 5 04:50:09 2012 +0000
> > > 
> > >     net: export netdev_stats_to_stats64
> > >     
> > >     Some drivers use internal netdev stats member to store part of their
> > >     stats, yet advertize ndo_get_stats64() to implement some 64bit fields.
> > >     
> > >     Allow them to use netdev_stats_to_stats64() helper to make the copy of
> > >     netdev stats before they compute their 64bit counters.
> > > 
> > >
> > 
> > Definitely looks cleaner now. Thanks!
> 
> Well, no ;)
> 
> Please read again the changelog I copied, and highlight the word
> _before_
> 
> If you cant test the patch, please ask someone to do so.
> 
> 
>

Eric, do you mean like this below? If not, please illustrate.

+       netdev_stats_to_stats64(stats, &dev->stats);
+
+       do {
+               start = u64_stats_fetch_begin_bh(&rp->rx_stats.syncp);
+               stats->rx_packets = rp->rx_stats.packets;
+               stats->rx_bytes = rp->rx_stats.bytes;
+       } while (u64_stats_fetch_retry_bh(&rp->rx_stats.syncp, start));
+
+       do {
+               start = u64_stats_fetch_begin_bh(&rp->tx_stats.syncp);
+               stats->tx_packets = rp->tx_stats.packets;
+               stats->tx_bytes = rp->tx_stats.bytes;
+       } while (u64_stats_fetch_retry_bh(&rp->tx_stats.syncp, start));
+
+       return stats;