From patchwork Mon Aug 9 19:16:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 61308 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 15837B70D0 for ; Tue, 10 Aug 2010 05:16:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754643Ab0HITQo (ORCPT ); Mon, 9 Aug 2010 15:16:44 -0400 Received: from mail.candelatech.com ([208.74.158.172]:33188 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754386Ab0HITQo (ORCPT ); Mon, 9 Aug 2010 15:16:44 -0400 Received: from localhost.localdomain (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id o79JGfiI007177 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 9 Aug 2010 12:16:41 -0700 From: Ben Greear To: netdev@vger.kernel.org Cc: Ben Greear Subject: [net-next] net: Provide details on watchdog timeout. Date: Mon, 9 Aug 2010 12:16:41 -0700 Message-Id: <1281381401-5554-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.6.2.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This also makes it printed under net_ratelimit instead of WARN_ON_ONCE. The backtrace never helped me much. Signed-off-by: Ben Greear --- :100644 100644 2aeb3a4... b52c450... M net/sched/sch_generic.c net/sched/sch_generic.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 2aeb3a4..b52c450 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -253,9 +253,15 @@ static void dev_watchdog(unsigned long arg) } if (some_queue_timedout) { - char drivername[64]; - WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", - dev->name, netdev_drivername(dev, drivername, 64), i); + if (net_ratelimit()) { + char drivername[64]; + printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): " + "transmit queue %u timed out" + " trans-start: %lu jiffies: %lu\n", + dev->name, + netdev_drivername(dev, drivername, 64), + i, trans_start, jiffies); + } dev->netdev_ops->ndo_tx_timeout(dev); } if (!mod_timer(&dev->watchdog_timer,