From patchwork Wed Jan 23 15:41:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamie Gloudon X-Patchwork-Id: 214991 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CA7C22C0084 for ; Thu, 24 Jan 2013 02:48:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754919Ab3AWPsY (ORCPT ); Wed, 23 Jan 2013 10:48:24 -0500 Received: from mail-yh0-f44.google.com ([209.85.213.44]:60964 "EHLO mail-yh0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753155Ab3AWPsY (ORCPT ); Wed, 23 Jan 2013 10:48:24 -0500 Received: by mail-yh0-f44.google.com with SMTP id f11so1335543yha.31 for ; Wed, 23 Jan 2013 07:48:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to; bh=bwPWLjLwyhF/bXwT7Njdmo5y3tipspLXMEMukP70Duw=; b=H6wL3Xe1a3EeVZ2hTu3OBH7Z0QP3w6ZM+jmBwUYYiUU9SElJ0+FHJ8srw2FCu5Q0Ql /qgIRkETTFNTrF+Ajra+YfIQfKHlJgGo16EbhvA8WPq+o9AioPGDqGOOjEX8PH5UKSpf Zp3ASf7yd1ngFMU4AQm8d7PymuJLpMecttWkn1Yd/kn+KMZ1h1VHwNfdRvvMWE5WKW42 Yxe/kST/flRByczTteRv8JzNA5pAFsIYGG9cNI5N+3BsZ603KWeozu3lu6SV3bmFJ8rE Hgd3DSdhRiorEHH7TF5HJ1+z5bwN3hXcDaFUs/DDGtR5WJDKZ0BvQ9JQEdrBLNOCan2P sFag== X-Received: by 10.236.204.72 with SMTP id g48mr1840338yho.102.1358955683921; Wed, 23 Jan 2013 07:41:23 -0800 (PST) Received: from ([190.83.186.38]) by mx.google.com with ESMTPS id k24sm20314368yhd.5.2013.01.23.07.41.21 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Jan 2013 07:41:23 -0800 (PST) Date: Wed, 23 Jan 2013 11:41:16 -0400 From: Jamie Gloudon To: netdev@vger.kernel.org Cc: Eric Dumazet , davem@davemloft.net Subject: Re: [PATCH net-next] via-rhine: add 64bit statistics. Message-ID: <510004a3.2444ec0a.1ba7.ffff98b3@mx.google.com> References: <50fff42d.094e640a.3ace.6ae4@mx.google.com> <1358951884.12374.790.camel@edumazet-glaptop> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1358951884.12374.790.camel@edumazet-glaptop> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 > > --- > > > + > > + 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 > 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! Signed-off-by: Jamie Gloudon --- drivers/net/ethernet/via/via-rhine.c | 48 ++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index eab63e1..82813ed 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -417,6 +417,12 @@ enum chip_cmd_bits { Cmd1NoTxPoll=0x08, Cmd1Reset=0x80, }; +struct rhine_stats { + u64 packets; + u64 bytes; + struct u64_stats_sync syncp; +}; + struct rhine_private { /* Bit mask for configured VLAN ids */ unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; @@ -458,6 +464,8 @@ struct rhine_private { unsigned int cur_rx, dirty_rx; /* Producer/consumer ring indices */ unsigned int cur_tx, dirty_tx; unsigned int rx_buf_sz; /* Based on MTU+slack. */ + struct rhine_stats rx_stats; + struct rhine_stats tx_stats; u8 wolopts; u8 tx_thresh, rx_thresh; @@ -495,7 +503,8 @@ static irqreturn_t rhine_interrupt(int irq, void *dev_instance); static void rhine_tx(struct net_device *dev); static int rhine_rx(struct net_device *dev, int limit); static void rhine_set_rx_mode(struct net_device *dev); -static struct net_device_stats *rhine_get_stats(struct net_device *dev); +static struct rtnl_link_stats64 *rhine_get_stats64(struct net_device *dev, + struct rtnl_link_stats64 *stats); static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static const struct ethtool_ops netdev_ethtool_ops; static int rhine_close(struct net_device *dev); @@ -842,7 +851,7 @@ static const struct net_device_ops rhine_netdev_ops = { .ndo_open = rhine_open, .ndo_stop = rhine_close, .ndo_start_xmit = rhine_start_tx, - .ndo_get_stats = rhine_get_stats, + .ndo_get_stats64 = rhine_get_stats64, .ndo_set_rx_mode = rhine_set_rx_mode, .ndo_change_mtu = eth_change_mtu, .ndo_validate_addr = eth_validate_addr, @@ -1790,8 +1799,11 @@ static void rhine_tx(struct net_device *dev) dev->stats.collisions += txstatus & 0x0F; netif_dbg(rp, tx_done, dev, "collisions: %1.1x:%1.1x\n", (txstatus >> 3) & 0xF, txstatus & 0xF); - dev->stats.tx_bytes += rp->tx_skbuff[entry]->len; - dev->stats.tx_packets++; + + u64_stats_update_begin(&rp->tx_stats.syncp); + rp->tx_stats.bytes += rp->tx_skbuff[entry]->len; + rp->tx_stats.packets++; + u64_stats_update_end(&rp->tx_stats.syncp); } /* Free the original skb. */ if (rp->tx_skbuff_dma[entry]) { @@ -1857,6 +1869,7 @@ static int rhine_rx(struct net_device *dev, int limit) "Oversized Ethernet frame %p vs %p\n", rp->rx_head_desc, &rp->rx_ring[entry]); + dev->stats.rx_dropped++; dev->stats.rx_length_errors++; } else if (desc_status & RxErr) { /* There was a error. */ @@ -1923,8 +1936,11 @@ static int rhine_rx(struct net_device *dev, int limit) if (unlikely(desc_length & DescTag)) __vlan_hwaccel_put_tag(skb, vlan_tci); netif_receive_skb(skb); - dev->stats.rx_bytes += pkt_len; - dev->stats.rx_packets++; + + u64_stats_update_begin(&rp->rx_stats.syncp); + rp->rx_stats.bytes += pkt_len; + rp->rx_stats.packets++; + u64_stats_update_end(&rp->rx_stats.syncp); } entry = (++rp->cur_rx) % RX_RING_SIZE; rp->rx_head_desc = &rp->rx_ring[entry]; @@ -2019,15 +2035,31 @@ out_unlock: mutex_unlock(&rp->task_lock); } -static struct net_device_stats *rhine_get_stats(struct net_device *dev) +static struct rtnl_link_stats64 * +rhine_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) { struct rhine_private *rp = netdev_priv(dev); + unsigned int start; spin_lock_bh(&rp->lock); rhine_update_rx_crc_and_missed_errord(rp); spin_unlock_bh(&rp->lock); - return &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)); + + netdev_stats_to_stats64(stats, &dev->stats); + + return stats; } static void rhine_set_rx_mode(struct net_device *dev)