From patchwork Sun Jun 21 08:15:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Petrilin X-Patchwork-Id: 28946 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 352A7B71C9 for ; Sun, 21 Jun 2009 17:26:01 +1000 (EST) Received: by ozlabs.org (Postfix) id 2480EDDDA1; Sun, 21 Jun 2009 17:26:01 +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 AC023DDDA0 for ; Sun, 21 Jun 2009 17:26:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752532AbZFUHZo (ORCPT ); Sun, 21 Jun 2009 03:25:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752357AbZFUHZn (ORCPT ); Sun, 21 Jun 2009 03:25:43 -0400 Received: from mail.mellanox.co.il ([194.90.237.43]:51476 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752211AbZFUHZn (ORCPT ); Sun, 21 Jun 2009 03:25:43 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yevgenyp@mellanox.co.il) with SMTP; 21 Jun 2009 10:25:40 +0300 Received: from sw275.lab.mtl.com ([10.4.12.75]) by mtlexch01.mtl.com with Microsoft SMTPSVC(6.0.3790.3959); Sun, 21 Jun 2009 10:25:40 +0300 Message-ID: <4A3DEC23.3050004@mellanox.co.il> Date: Sun, 21 Jun 2009 11:15:31 +0300 From: Yevgeny Petrilin User-Agent: Thunderbird 2.0.0.21 (X11/20090302) MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org, Tziporet Koren Subject: [PATCH 1/6] mlx4_en: Counting all the dropped packets on the TX side X-OriginalArrivalTime: 21 Jun 2009 07:25:40.0434 (UTC) FILETIME=[7AD4EB20:01C9F241] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-5.600.1016-16716.005 X-TM-AS-Result: No--5.082600-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Reporting the counter's value through 'ethtool -S' Signed-off-by: Yevgeny Petrilin --- drivers/net/mlx4/en_tx.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c index 5dc7466..c0177c3 100644 --- a/drivers/net/mlx4/en_tx.c +++ b/drivers/net/mlx4/en_tx.c @@ -515,14 +515,12 @@ static int get_real_size(struct sk_buff *skb, struct net_device *dev, else { if (netif_msg_tx_err(priv)) en_warn(priv, "Non-linear headers\n"); - dev_kfree_skb_any(skb); return 0; } } if (unlikely(*lso_header_size > MAX_LSO_HDR_SIZE)) { if (netif_msg_tx_err(priv)) en_warn(priv, "LSO header size too big\n"); - dev_kfree_skb_any(skb); return 0; } } else { @@ -622,7 +620,7 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) } real_size = get_real_size(skb, dev, &lso_header_size); if (unlikely(!real_size)) - return NETDEV_TX_OK; + goto tx_drop; /* Allign descriptor to TXBB size */ desc_size = ALIGN(real_size, TXBB_SIZE); @@ -630,8 +628,7 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(nr_txbb > MAX_DESC_TXBBS)) { if (netif_msg_tx_err(priv)) en_warn(priv, "Oversized header or SG list\n"); - dev_kfree_skb_any(skb); - return NETDEV_TX_OK; + goto tx_drop; } tx_ind = skb->queue_mapping; @@ -657,8 +654,7 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(!priv->port_up)) { if (netif_msg_tx_err(priv)) en_warn(priv, "xmit: port down!\n"); - dev_kfree_skb_any(skb); - return NETDEV_TX_OK; + goto tx_drop; } /* Track current inflight packets for performance analysis */ @@ -785,5 +781,10 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) mlx4_en_xmit_poll(priv, tx_ind); return 0; + +tx_drop: + dev_kfree_skb_any(skb); + priv->stats.tx_dropped++; + return NETDEV_TX_OK; }