From patchwork Tue Nov 15 00:11:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 125639 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 58C39B71F8 for ; Tue, 15 Nov 2011 11:12:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756891Ab1KOAL7 (ORCPT ); Mon, 14 Nov 2011 19:11:59 -0500 Received: from mail-wy0-f202.google.com ([74.125.82.202]:59965 "EHLO mail-wy0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756832Ab1KOAL6 (ORCPT ); Mon, 14 Nov 2011 19:11:58 -0500 Received: by mail-wy0-f202.google.com with SMTP id 20so104359wye.1 for ; Mon, 14 Nov 2011 16:11:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=beta; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:organization:x-system-of-record; bh=NiTz5XJ3g0UzWSYlQaMYGKS063DK1jteGiHSKnY8Hug=; b=qLEJ9ot0xcCnx9G9fp6KxMKYRnaVum9XqUs3P+b7bsBKomDt+M9OswanGRsfuigx2c +sAX0r8WiBX/uTBDm+Iw== Received: by 10.14.20.19 with SMTP id o19mr1430363eeo.15.1321315916360; Mon, 14 Nov 2011 16:11:56 -0800 (PST) Received: by 10.14.20.19 with SMTP id o19mr1430313eeo.15.1321315916091; Mon, 14 Nov 2011 16:11:56 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id n13si10032075eef.2.2011.11.14.16.11.56 (version=TLSv1/SSLv3 cipher=AES128-SHA); Mon, 14 Nov 2011 16:11:56 -0800 (PST) Received: from wpaz37.hot.corp.google.com (wpaz37.hot.corp.google.com [172.24.198.101]) by hpza10.eem.corp.google.com (Postfix) with ESMTPS id C155E20004E; Mon, 14 Nov 2011 16:11:55 -0800 (PST) Received: from decotigny.mtv.corp.google.com (decotigny.mtv.corp.google.com [172.18.64.159]) by wpaz37.hot.corp.google.com with ESMTP id pAF0BqJg005894; Mon, 14 Nov 2011 16:11:52 -0800 Received: by decotigny.mtv.corp.google.com (Postfix, from userid 128857) id 44DF923919; Mon, 14 Nov 2011 16:11:40 -0800 (PST) From: David Decotigny To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Ian Campbell , Eric Dumazet , Jeff Kirsher , Ben Hutchings , Jiri Pirko , Joe Perches , Szymon Janc , Richard Jones , Ayaz Abdulla , David Decotigny Subject: [PATCH net-next v3 6/9] forcedeth: account for dropped RX frames Date: Mon, 14 Nov 2011 16:11:16 -0800 Message-Id: <5f53bf68b155c8b8c5c045a5af6bdba414a9f11e.1321313729.git.david.decotigny@google.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: References: In-Reply-To: References: Organization: Google, Inc. X-System-Of-Record: true Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This adds the stats counter for dropped RX frames. Signed-off-by: David Decotigny --- drivers/net/ethernet/nvidia/forcedeth.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index a67c1f4..84e8d17 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c @@ -824,6 +824,7 @@ struct fe_priv { struct nv_driver_stat stat_rx_packets; struct nv_driver_stat stat_rx_bytes; /* not always available in HW */ struct nv_driver_stat stat_rx_missed_errors; + struct nv_driver_stat stat_rx_dropped; /* media detection workaround. * Locking: Within irq hander or disable_irq+spin_lock(&np->lock); @@ -1740,6 +1741,7 @@ static void nv_update_stats(struct net_device *dev) NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_rx_packets); NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_rx_bytes); NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_rx_missed_errors); + NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_rx_dropped); NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_tx_packets); NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_tx_bytes); @@ -1786,6 +1788,8 @@ nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage) &np->stat_tx_bytes); storage->rx_errors = np->estats.rx_errors_total; storage->tx_errors = np->estats.tx_errors_total; + storage->rx_dropped = NV_DRIVER_STAT_GET_TOTAL( + &np->stat_rx_dropped); storage->tx_dropped = NV_DRIVER_STAT_GET_TOTAL( &np->stat_tx_dropped); @@ -1841,8 +1845,10 @@ static int nv_alloc_rx(struct net_device *dev) np->put_rx.orig = np->first_rx.orig; if (unlikely(np->put_rx_ctx++ == np->last_rx_ctx)) np->put_rx_ctx = np->first_rx_ctx; - } else + } else { + NV_DRIVER_STAT_ATOMIC_INC(&np->stat_rx_dropped); return 1; + } } return 0; } @@ -1873,8 +1879,10 @@ static int nv_alloc_rx_optimized(struct net_device *dev) np->put_rx.ex = np->first_rx.ex; if (unlikely(np->put_rx_ctx++ == np->last_rx_ctx)) np->put_rx_ctx = np->first_rx_ctx; - } else + } else { + NV_DRIVER_STAT_ATOMIC_INC(&np->stat_rx_dropped); return 1; + } } return 0; }