Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761524AbXEWL1a (ORCPT ); Wed, 23 May 2007 07:27:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756441AbXEWL1U (ORCPT ); Wed, 23 May 2007 07:27:20 -0400 Received: from rhun.apana.org.au ([64.62.148.172]:3464 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755885AbXEWL1U (ORCPT ); Wed, 23 May 2007 07:27:20 -0400 Date: Wed, 23 May 2007 21:25:59 +1000 From: Herbert Xu To: Patrick McHardy Cc: Ingo Molnar , Anant Nitya , linux-kernel@vger.kernel.org, Linus Torvalds , Andrew Morton , Thomas Gleixner , "David S. Miller" , Linux Netdev List Subject: Re: bad networking related lag in v2.6.22-rc2 Message-ID: <20070523112559.GA24604@gondor.apana.org.au> References: <20070517174533.GA538@elte.hu> <200705221147.56571.kernel@prachanda.hub> <20070522062233.GA20002@elte.hu> <200705231110.44526.kernel@prachanda.hub> <20070523063052.GB26814@elte.hu> <46541DC4.4090501@trash.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <46541DC4.4090501@trash.net> User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1518 Lines: 47 On Wed, May 23, 2007 at 12:56:04PM +0200, Patrick McHardy wrote: > > Looking at the recent changes to __qdisc_run, this indeed seems > to be the case, when the qdisc is throttled and has packets queued > we return a value != 0, causing __qdisc_run to loop until all > packets have been sent, which may be a long time. Good catch! I was obviously half awake at the time :) We could also fix it this way: [NET_SCHED]: Fix qdisc_restart return value when dequeue is empty My previous patch that changed the return value of qdisc_restart incorrectly made the case where dequeue returns empty continue processing packets. This patch is based on diagnosis and fix by Patrick McHardy. Signed-off-by: Herbert Xu Thanks, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index f28bb2d..cbefe22 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -169,8 +169,8 @@ requeue: else q->ops->requeue(skb, q); netif_schedule(dev); - return 0; } + return 0; out: BUG_ON((int) q->q.qlen < 0); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/