From patchwork Wed Jan 28 12:52:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 20602 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 3FCAFDDFEB for ; Wed, 28 Jan 2009 23:52:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751354AbZA1Mwj (ORCPT ); Wed, 28 Jan 2009 07:52:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751334AbZA1Mwj (ORCPT ); Wed, 28 Jan 2009 07:52:39 -0500 Received: from fg-out-1718.google.com ([72.14.220.158]:54954 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751123AbZA1Mwi (ORCPT ); Wed, 28 Jan 2009 07:52:38 -0500 Received: by fg-out-1718.google.com with SMTP id 13so546837fge.17 for ; Wed, 28 Jan 2009 04:52:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=MExHFbi18BEIEPfhKyskZ8Nu0qflrxTnOZfm/yOulAs=; b=QAn4c2MjRaOBixSabNcEb3cBsqW/WxNdhENXSlfmRDttptzaZ42qm7JgUfyVmfqR89 kYYcO5pD0tQozORizuYFxsjZ+4HPlD3RDh6bVerwa0zEVnT8/hqWz57mIt8av9Zj9F9S UAX1msBgbO0RbOjFTcU+QThYFUWQFFbOooRig= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:in-reply-to:user-agent; b=U6ehlmnz4K2CsHeJs/DizQ2e3a81IIgYqPK/CYU8LrsVKugYJPe+ZPbyCnWSQNoK1x ZR93acAc1wirrKZ1D/C5L2kLpzgVHZ9tqbW5c7PYxacAJYYLQLBG+rj8PVSHI6HK9FDP fLW2Xp0cmrTxCiPByUxKJQbo5Pysn3J2ioBvw= Received: by 10.223.110.144 with SMTP id n16mr1351928fap.55.1233147155822; Wed, 28 Jan 2009 04:52:35 -0800 (PST) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id 7sm7705767eyg.32.2009.01.28.04.52.34 (version=SSLv3 cipher=RC4-MD5); Wed, 28 Jan 2009 04:52:35 -0800 (PST) Date: Wed, 28 Jan 2009 12:52:30 +0000 From: Jarek Poplawski To: Patrick McHardy Cc: David Miller , devik@cdi.cz, netdev@vger.kernel.org Subject: [PATCH net-next] pkt_sched: sch_htb: Warn on too many events. Message-ID: <20090128125230.GA6282@ff.dom.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <496B19F7.4060909@trash.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 12-01-2009 11:22, Patrick McHardy wrote: > Jarek Poplawski wrote: ... >> BTW, I wonder if adding the old "too many >> events" warning back wouldn't be more useful here. > > It would be good to notify the user and also have some indication > for this case when looking into bug reports. A counter or a (single) > printk would both be fine. Here is my proposal. (I assume single "work conserving" warn should be enough too - if somebody doesn't fix it for one class, they probably know what they are doing, and don't need more.) Jarek P. --------------> pkt_sched: sch_htb: Warn on too many events. Let's get some info on possible config problems. This patch brings back an old warning, but it's printed only once now. BTW a "class isn't work conserving" warning is also limited to once per qdisc instead of per class. With feedback from Patrick McHardy Signed-off-by: Jarek Poplawski --- net/sched/sch_htb.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 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/net/sched/sch_htb.c b/net/sched/sch_htb.c index 2f0f0b0..6fbb3e3 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -114,8 +114,6 @@ struct htb_class { struct tcf_proto *filter_list; int filter_cnt; - int warned; /* only one warning about non work conserving .. */ - /* token bucket parameters */ struct qdisc_rate_table *rate; /* rate table of the class itself */ struct qdisc_rate_table *ceil; /* ceiling rate (limits borrows too) */ @@ -155,6 +153,10 @@ struct htb_sched { int direct_qlen; /* max qlen of above */ long direct_pkts; + +#define HTB_WARN_NONCONSERVING 0x1 +#define HTB_WARN_TOOMANYEVENTS 0x2 + int warned; /* only one warning about non work conserving etc. */ }; /* find class in global hash table using given handle */ @@ -687,6 +689,10 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level, htb_add_to_wait_tree(q, cl, diff); } /* too much load - let's continue on next jiffie (including above) */ + if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) { + printk(KERN_WARNING "htb: too many events!\n"); + q->warned |= HTB_WARN_TOOMANYEVENTS; + } return q->now + 2 * PSCHED_TICKS_PER_SEC / HZ; } @@ -809,11 +815,11 @@ next: skb = cl->un.leaf.q->dequeue(cl->un.leaf.q); if (likely(skb != NULL)) break; - if (!cl->warned) { + if (!(q->warned & HTB_WARN_NONCONSERVING)) { printk(KERN_WARNING "htb: class %X isn't work conserving ?!\n", cl->common.classid); - cl->warned = 1; + q->warned |= HTB_WARN_NONCONSERVING; } htb_next_rb_node((level ? cl->parent->un.inner.ptr : q->