From patchwork Mon Jan 12 10:16:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 17907 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 0C0DFDE03E for ; Mon, 12 Jan 2009 21:16:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751366AbZALKQV (ORCPT ); Mon, 12 Jan 2009 05:16:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751150AbZALKQU (ORCPT ); Mon, 12 Jan 2009 05:16:20 -0500 Received: from mail-ew0-f17.google.com ([209.85.219.17]:65367 "EHLO mail-ew0-f17.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750720AbZALKQT (ORCPT ); Mon, 12 Jan 2009 05:16:19 -0500 Received: by ewy10 with SMTP id 10so11410357ewy.13 for ; Mon, 12 Jan 2009 02:16:18 -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:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=32J/1Q2NWnvOVM/pNHpP1NLuhb7Tc+OQr/beC1uYx28=; b=tYqO6cwkUxOEcvpcDazfFXQ8ax81KuJjKCsypPBpwYoJ8aPH/Q0ZDwYUkT6NV/R97G nWFaTkGm7clIwa1e4Tv4uzZFZuFfo60pd1nBSBVs/o7RTyzEart4a2fPYW6aN1CgOANA 3ad1rqxKdDwCvOCGnK5wMMq3XrN+iMFhxCn1k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=JTFS9By2b9GQHkccvue3CC0EPgMeFUaUtYu2EgHenUpJIclnMvuerst9kq6hDLf4A5 KyhhBDaUZPWZ1krMmaMDrjb6Tdaw9WRIoch05TEBMhXsH3DggmWwk9/ToiZ4BuMNKCyv f7vVqDSf9gqtGb+U9gUj12BdwHFXgs/i8OVwQ= Received: by 10.210.86.10 with SMTP id j10mr12417159ebb.153.1231755377997; Mon, 12 Jan 2009 02:16:17 -0800 (PST) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id 5sm5319647eyf.47.2009.01.12.02.16.17 (version=SSLv3 cipher=RC4-MD5); Mon, 12 Jan 2009 02:16:17 -0800 (PST) Date: Mon, 12 Jan 2009 10:16:13 +0000 From: Jarek Poplawski To: David Miller Cc: kaber@trash.net, devik@cdi.cz, netdev@vger.kernel.org Subject: [PATCH 7/6 resend] pkt_sched: sch_htb: Consider used jiffies in htb_do_events() Message-ID: <20090112101613.GA5781@ff.dom.local> References: <20081209144534.GC15353@ff.dom.local> <20081209.223545.196224587.davem@davemloft.net> <20081210091126.GA4707@ff.dom.local> <20081210.011431.203551043.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20081210.011431.203551043.davem@davemloft.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 (resend) pkt_sched: sch_htb: Consider used jiffies in htb_do_events() Next event time should consider jiffies used for recounting. Otherwise qdisc_watchdog_schedule() triggers hrtimer immediately with the event in the past, and may cause very high ksoftirqd cpu usage (if highres is on). There is also removed checking "event" for zero in htb_dequeue(): it's always true in this place. Signed-off-by: Jarek Poplawski --- net/sched/sch_htb.c | 6 +++--- 1 files changed, 3 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/net/sched/sch_htb.c b/net/sched/sch_htb.c index 5070643..9ca8a26 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -685,8 +685,8 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level) if (cl->cmode != HTB_CAN_SEND) htb_add_to_wait_tree(q, cl, diff); } - /* too much load - let's continue on next jiffie */ - return q->now + PSCHED_TICKS_PER_SEC / HZ; + /* too much load - let's continue on next jiffie (including above) */ + return q->now + 2 * PSCHED_TICKS_PER_SEC / HZ; } /* Returns class->node+prio from id-tree where classe's id is >= id. NULL @@ -873,7 +873,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) } else event = q->near_ev_cache[level]; - if (event && next_event > event) + if (next_event > event) next_event = event; m = ~q->row_mask[level];