From patchwork Thu Jun 24 23:32:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Schmidt X-Patchwork-Id: 56871 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 B4687B6F17 for ; Fri, 25 Jun 2010 09:49:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753862Ab0FXXtY (ORCPT ); Thu, 24 Jun 2010 19:49:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2623 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750997Ab0FXXtX (ORCPT ); Thu, 24 Jun 2010 19:49:23 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5ONnMgu004693 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 24 Jun 2010 19:49:22 -0400 Received: from leela.lan (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5ONnKvX024224 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Jun 2010 19:49:22 -0400 Received: from leela.lan (localhost [127.0.0.1]) by leela.lan (8.14.4/8.14.4) with ESMTP id o5ONWWFU005894; Fri, 25 Jun 2010 01:32:33 +0200 From: Michal Schmidt Subject: [PATCH] s2io: read rx_packets count from the hardware stats To: netdev@vger.kernel.org Cc: Ramkrishna Vepa , Sivakumar Subramani , Sreenivasa Honnur Date: Fri, 25 Jun 2010 01:32:32 +0200 Message-ID: <20100624233230.5864.67401.stgit@leela.lan> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Most of the statistics the s2io driver provides in /proc/net/dev it reads directly from the hardware counters. For some reason it does not do that for rx_packets. It counts rx_packets purely in software. A customer reported a bug where in /proc/net/dev the 'multicast' counter was increasing faster than 'packets' ( = rx_packets in the source code). This confuses userspace, especially snmpd. The hardware provides a counter for the total number of received frames (RMAC_VLD_FRMS) which the driver can use for the rx_packets statistic. By reading both statistics from the hardware it makes sure that all multicast frames are included in the total. The customer tested a patch like this (only modified for RHEL5) with S2io Inc. Xframe II 10Gbps Ethernet (rev 02) and it fixed the problem. Signed-off-by: Michal Schmidt --- drivers/net/s2io.c | 11 ++++++----- drivers/net/s2io.h | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) -- 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 diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 668327c..eefc4b2 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -4919,6 +4919,10 @@ static struct net_device_stats *s2io_get_stats(struct net_device *dev) sp->stats.tx_packets; sp->stats.tx_packets = le32_to_cpu(stats->tmac_frms); + dev->stats.rx_packets += le32_to_cpu(stats->rmac_vld_frms) - + sp->stats.rx_packets; + sp->stats.rx_packets = le32_to_cpu(stats->rmac_vld_frms); + dev->stats.tx_errors += le32_to_cpu(stats->tmac_any_err_frms) - sp->stats.tx_errors; sp->stats.tx_errors = le32_to_cpu(stats->tmac_any_err_frms); @@ -4935,12 +4939,11 @@ static struct net_device_stats *s2io_get_stats(struct net_device *dev) sp->stats.rx_length_errors; sp->stats.rx_length_errors = le64_to_cpu(stats->rmac_long_frms); - /* collect per-ring rx_packets and rx_bytes */ - dev->stats.rx_packets = dev->stats.rx_bytes = 0; + /* collect per-ring rx_bytes */ + dev->stats.rx_bytes = 0; for (i = 0; i < config->rx_ring_num; i++) { struct ring_info *ring = &mac_control->rings[i]; - dev->stats.rx_packets += ring->rx_packets; dev->stats.rx_bytes += ring->rx_bytes; } @@ -7455,8 +7458,6 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp) } } - /* Updating statistics */ - ring_data->rx_packets++; rxdp->Host_Control = 0; if (sp->rxd_mode == RXD_MODE_1) { int len = RXD_GET_BUFFER0_SIZE_1(rxdp->Control_2); diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 47c36e0..4da9ab8 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h @@ -747,7 +747,6 @@ struct ring_info { struct buffAdd **ba; /* per-Ring statistics */ - unsigned long rx_packets; unsigned long rx_bytes; } ____cacheline_aligned;