From patchwork Thu Feb 11 16:20:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kovvuri X-Patchwork-Id: 581955 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 9287F140BF8 for ; Fri, 12 Feb 2016 03:19:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Gyi2xTXE; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751636AbcBKQTk (ORCPT ); Thu, 11 Feb 2016 11:19:40 -0500 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35380 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751443AbcBKQRh (ORCPT ); Thu, 11 Feb 2016 11:17:37 -0500 Received: by mail-pa0-f66.google.com with SMTP id fl4so2612990pad.2; Thu, 11 Feb 2016 08:17:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dScBFwbALpEQnLeyML/fMyrptfmva9duU74qCIOHZOQ=; b=Gyi2xTXE/vbpOxfqklNJ3mXEE83NnTqFx9vpkCEJBLNx64kY852KoZd0EL4LGXPu7I +Tar3j7BjkKlEiB5awpYOLxlIeFKTB5UY1tjv0sDUgC2lo6O/X9VnE9SwFgUAAu9zqd7 thKUgXThHMFL3EGXZNkN/eQkJ6PtnHRRVsejx6qsALvuHrUyQY+PQdx2yFx+816FCFoc RGPaAfPHANtBjxsMHoDFZfWa2A98NIlsR1wxoTIRCbCndrs/tcK33IgWhtkk2uYsQ95z rsurV0w39eZ59BqSduXvWGveV45g7yEw4BV/82GCOhOHwAteNZ4ySpTwDghE34PuEi4q VauA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dScBFwbALpEQnLeyML/fMyrptfmva9duU74qCIOHZOQ=; b=G2uzqnaYxP2IfPkDFPkYyuHZs5gTHO4hPcLueeLd8NlGcl588E1I67v5se3ELGPz+u /5MPQcd+wMl0Wt4wRK/UNZ9syrd/k9KIwjR/I6WAE0RCiTk8Eg7L+bkPiC5pGW24xgSy xeWFlnk51J0Kh3ZIOZtio5y8GGpobTDezsboTHZjytZmVHDXQQjpFSxi9lJbgakQMRmD 9+IhTSvZFMnaDQ/muTTVyuZzPUzTfXllCY8y3f0twQM59E2OoDZqdLbLYecKF0CCe9uE EwAoTy30NAKDBV2gwOKOnBgKu/3ShwN0oTfXuOgb3lqUn/7JHxAuY+oaJGKC8mhW/kEI hUoQ== X-Gm-Message-State: AG10YOSD6m+M72o2x6INEjycyN8lYgN5gsQKO9OTp+cQsmQqip4as/3U2pyfx8w1eKsfIg== X-Received: by 10.66.232.132 with SMTP id to4mr67623537pac.95.1455207456790; Thu, 11 Feb 2016 08:17:36 -0800 (PST) Received: from localhost.localdomain ([14.140.2.178]) by smtp.googlemail.com with ESMTPSA id s90sm13355894pfa.49.2016.02.11.08.17.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2016 08:17:35 -0800 (PST) From: sunil.kovvuri@gmail.com To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, sgoutham@cavium.com, robert.richter@caviumnetworks.com, Thanneeru Srinivasulu Subject: [PATCH v2 1/6] net, thunderx: Add TX timeout and RX buffer alloc failure stats. Date: Thu, 11 Feb 2016 21:50:21 +0530 Message-Id: <1455207626-35488-2-git-send-email-sunil.kovvuri@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1455207626-35488-1-git-send-email-sunil.kovvuri@gmail.com> References: <1455207626-35488-1-git-send-email-sunil.kovvuri@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thanneeru Srinivasulu When system is low on atomic memory, too many error messages are logged. Since this is not a total failure but a simple switch to non-atomic allocation better to have a stat. Also add a stat for reset, kicked due to transmit watchdog timeout. Signed-off-by: Thanneeru Srinivasulu Signed-off-by: Sunil Goutham --- drivers/net/ethernet/cavium/thunder/nic.h | 3 +++ .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 ++ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 1 + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 3 +-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h index 6888288..8af363a 100644 --- a/drivers/net/ethernet/cavium/thunder/nic.h +++ b/drivers/net/ethernet/cavium/thunder/nic.h @@ -248,10 +248,13 @@ struct nicvf_drv_stats { u64 rx_frames_jumbo; u64 rx_drops; + u64 rcv_buffer_alloc_failures; + /* Tx */ u64 tx_frames_ok; u64 tx_drops; u64 tx_tso; + u64 tx_timeout; u64 txq_stop; u64 txq_wake; }; diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c index a12b2e3..d2d8ef2 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c @@ -89,9 +89,11 @@ static const struct nicvf_stat nicvf_drv_stats[] = { NICVF_DRV_STAT(rx_frames_1518), NICVF_DRV_STAT(rx_frames_jumbo), NICVF_DRV_STAT(rx_drops), + NICVF_DRV_STAT(rcv_buffer_alloc_failures), NICVF_DRV_STAT(tx_frames_ok), NICVF_DRV_STAT(tx_tso), NICVF_DRV_STAT(tx_drops), + NICVF_DRV_STAT(tx_timeout), NICVF_DRV_STAT(txq_stop), NICVF_DRV_STAT(txq_wake), }; diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index c24cb2a..95db6b7 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -1394,6 +1394,7 @@ static void nicvf_tx_timeout(struct net_device *dev) netdev_warn(dev, "%s: Transmit timed out, resetting\n", dev->name); + nic->drv_stats.tx_timeout++; schedule_work(&nic->reset_task); } diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c index d0d1b54..50ab6f4 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c @@ -96,8 +96,7 @@ static inline int nicvf_alloc_rcv_buffer(struct nicvf *nic, gfp_t gfp, nic->rb_page = alloc_pages(gfp | __GFP_COMP | __GFP_NOWARN, order); if (!nic->rb_page) { - netdev_err(nic->netdev, - "Failed to allocate new rcv buffer\n"); + nic->drv_stats.rcv_buffer_alloc_failures++; return -ENOMEM; } nic->rb_page_offset = 0;