From patchwork Fri Sep 4 03:02:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 32964 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id A9D3AB70B3 for ; Fri, 4 Sep 2009 13:02:25 +1000 (EST) Received: by ozlabs.org (Postfix) id 9DD8BDDD0B; Fri, 4 Sep 2009 13:02:25 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 318A9DDD1B for ; Fri, 4 Sep 2009 13:02:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932753AbZIDDCR (ORCPT ); Thu, 3 Sep 2009 23:02:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932748AbZIDDCR (ORCPT ); Thu, 3 Sep 2009 23:02:17 -0400 Received: from sj-iport-5.cisco.com ([171.68.10.87]:6507 "EHLO sj-iport-5.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932740AbZIDDCQ (ORCPT ); Thu, 3 Sep 2009 23:02:16 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AhgFAAcgoEqrR7MV/2dsb2JhbACBU8BJiEEBkCsFhBs X-IronPort-AV: E=Sophos;i="4.44,329,1249257600"; d="scan'208";a="92985146" Received: from sj-dkim-1.cisco.com ([171.71.179.21]) by sj-iport-5.cisco.com with ESMTP; 04 Sep 2009 03:02:19 +0000 Received: from sj-core-2.cisco.com (sj-core-2.cisco.com [171.71.177.254]) by sj-dkim-1.cisco.com (8.12.11/8.12.11) with ESMTP id n8432Jbe002695; Thu, 3 Sep 2009 20:02:19 -0700 Received: from palito_client100.nuovasystems.com (savbu-palito-client100.cisco.com [10.193.70.13]) by sj-core-2.cisco.com (8.13.8/8.14.3) with ESMTP id n8432J9P010077; Fri, 4 Sep 2009 03:02:19 GMT From: Scott Feldman Subject: [net-next PATCH 06/11] enic: bug fix: included MAC drops in rx_dropped netstat To: davem@davemloft.net Cc: netdev@vger.kernel.org Date: Thu, 03 Sep 2009 20:02:19 -0700 Message-ID: <20090904030219.5047.40334.stgit@palito_client100.nuovasystems.com> In-Reply-To: <20090904030046.5047.46509.stgit@palito_client100.nuovasystems.com> References: <20090904030046.5047.46509.stgit@palito_client100.nuovasystems.com> User-Agent: StGIT/0.12.1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; l=1794; t=1252033339; x=1252897339; c=relaxed/simple; s=sjdkim1004; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=scofeldm@cisco.com; z=From:=20Scott=20Feldman=20 |Subject:=20[net-next=20PATCH=2006/11]=20enic=3A=20bug=20fi x=3A=20included=20MAC=20drops=20in=0A=09rx_dropped=20netstat |Sender:=20; bh=yWBUA088HpNOKaS0CRZGZlz4kCu6t+X2wLybVp8VI04=; b=Yi+ZlR0V5cNMFwW9UgonQ8q8SjfqsjqP2JnO5zThDeBeyxzQetey8WIL6r LQ7q/jAG3RNrf/vVFrUPBcjAiovjtlXzAvaaIPl+ZetkP8jWfQNUm2lBSW5T JHWGXV2n2dJhcxgEmweeGFXJ8p7FZGt6gr8NQQCFGtR2fMs7Y2Nxk=; Authentication-Results: sj-dkim-1; header.From=scofeldm@cisco.com; dkim=pass ( sig from cisco.com/sjdkim1004 verified; ); Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org enic: bug fix: included MAC drops in rx_dropped netstat Bug fix: included MAC drops in rx_dropped netstat. Also track Rx trunctations stat at the MAC Signed-off-by: Scott Feldman --- drivers/net/enic/enic.h | 1 + drivers/net/enic/enic_main.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 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/enic/enic.h b/drivers/net/enic/enic.h index cfe94b2..f7c5b33 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -99,6 +99,7 @@ struct enic { ____cacheline_aligned struct vnic_rq rq[1]; unsigned int rq_count; int (*rq_alloc_buf)(struct vnic_rq *rq); + u64 rq_truncated_pkts; u64 rq_bad_fcs; struct napi_struct napi; struct net_lro_mgr lro_mgr; diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 8d54deb..139c380 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -737,8 +737,9 @@ static struct net_device_stats *enic_get_stats(struct net_device *netdev) net_stats->rx_bytes = stats->rx.rx_bytes_ok; net_stats->rx_errors = stats->rx.rx_errors; net_stats->multicast = stats->rx.rx_multicast_frames_ok; + net_stats->rx_over_errors = enic->rq_truncated_pkts; net_stats->rx_crc_errors = enic->rq_bad_fcs; - net_stats->rx_dropped = stats->rx.rx_no_bufs; + net_stats->rx_dropped = stats->rx.rx_no_bufs + stats->rx.rx_drop; return net_stats; } @@ -1028,8 +1029,12 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq, if (packet_error) { - if (bytes_written > 0 && !fcs_ok) - enic->rq_bad_fcs++; + if (!fcs_ok) { + if (bytes_written > 0) + enic->rq_bad_fcs++; + else if (bytes_written == 0) + enic->rq_truncated_pkts++; + } dev_kfree_skb_any(skb);