From patchwork Tue Nov 15 19:25:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 125865 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 47EA9B6F82 for ; Wed, 16 Nov 2011 06:28:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757290Ab1KOT1x (ORCPT ); Tue, 15 Nov 2011 14:27:53 -0500 Received: from mail-ww0-f74.google.com ([74.125.82.74]:32794 "EHLO mail-ww0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757317Ab1KOT0H (ORCPT ); Tue, 15 Nov 2011 14:26:07 -0500 Received: by mail-ww0-f74.google.com with SMTP id 5so146965wwe.1 for ; Tue, 15 Nov 2011 11:26:07 -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=8MAf8vxUBCisQvfx0zdPkjTkQ1IOrLa9b4FxOyIUatc=; b=cnuFTwFBjaoqiE3pzjOINF23MM9TGs3OUTCXVSnyUB4R0TYEuDC2qoJRF1W9uYajkA WOz0tLdBZetkSpcuV+PA== Received: by 10.14.11.198 with SMTP id 46mr1675447eex.16.1321385166604; Tue, 15 Nov 2011 11:26:06 -0800 (PST) Received: by 10.14.11.198 with SMTP id 46mr1675386eex.16.1321385166103; Tue, 15 Nov 2011 11:26:06 -0800 (PST) Received: from hpza9.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id d10si15814513eed.3.2011.11.15.11.26.06 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 15 Nov 2011 11:26:06 -0800 (PST) Received: from wpaz5.hot.corp.google.com (wpaz5.hot.corp.google.com [172.24.198.69]) by hpza9.eem.corp.google.com (Postfix) with ESMTPS id BCA635C005E; Tue, 15 Nov 2011 11:26:05 -0800 (PST) Received: from decotigny.mtv.corp.google.com (decotigny.mtv.corp.google.com [172.18.64.159]) by wpaz5.hot.corp.google.com with ESMTP id pAFJQ2UX009928; Tue, 15 Nov 2011 11:26:02 -0800 Received: by decotigny.mtv.corp.google.com (Postfix, from userid 128857) id 0E7A3255B8; Tue, 15 Nov 2011 11:26:00 -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 v4 6/8] forcedeth: account for dropped RX frames Date: Tue, 15 Nov 2011 11:25:39 -0800 Message-Id: <005cae310e19433c9f68c178805f16c774e8dedd.1321384662.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 | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index ff01d5e..a50c839 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c @@ -819,6 +819,7 @@ struct fe_priv { u64 stat_rx_packets; u64 stat_rx_bytes; /* not always available in HW */ u64 stat_rx_missed_errors; + u64 stat_rx_dropped; /* media detection workaround. * Locking: Within irq hander or disable_irq+spin_lock(&np->lock); @@ -1762,6 +1763,7 @@ nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage) storage->tx_packets = np->stat_tx_packets; storage->rx_bytes = np->stat_rx_bytes; storage->tx_bytes = np->stat_tx_bytes; + storage->rx_dropped = np->stat_rx_dropped; storage->tx_dropped = np->stat_tx_dropped; storage->rx_missed_errors = np->stat_rx_missed_errors; } while (u64_stats_fetch_retry(&np->swstats_syncp, syncp_start)); @@ -1826,8 +1828,12 @@ 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 { + u64_stats_update_begin(&np->swstats_syncp); + np->stat_rx_dropped++; + u64_stats_update_end(&np->swstats_syncp); return 1; + } } return 0; } @@ -1858,8 +1864,12 @@ 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 { + u64_stats_update_begin(&np->swstats_syncp); + np->stat_rx_dropped++; + u64_stats_update_end(&np->swstats_syncp); return 1; + } } return 0; }