From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH] TBF: stop qdisc infanticide Date: Thu, 13 May 2010 09:27:28 -0700 Message-ID: <20100513092728.766ee059@nehalam> References: <20100513091717.78bd7f1f@nehalam> <4BEC2760.7080704@trash.net> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: David Miller , netdev@vger.kernel.org To: Patrick McHardy Return-path: Received: from mail.vyatta.com ([76.74.103.46]:40761 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759223Ab0EMQ1a (ORCPT ); Thu, 13 May 2010 12:27:30 -0400 In-Reply-To: <4BEC2760.7080704@trash.net> Sender: netdev-owner@vger.kernel.org List-ID: On Thu, 13 May 2010 18:22:56 +0200 Patrick McHardy wrote: > Stephen Hemminger wrote: > > Several netem users have complained that when using TBF for rate control > > that any change to TBF parameters destroys the child qdisc. A typical > > use is to have a test that sets up netem + TBF then changes bandwidth > > setting. But every time the parameters of TBF are changed it destroys > > the child qdisc, requiring reconfiguration. Other qdisc's like HTB > > don't do this. > > > > Signed-off-by: Stephen Hemminger > > > > > > --- a/net/sched/sch_tbf.c 2010-05-12 20:41:06.257006386 -0700 > > +++ b/net/sched/sch_tbf.c 2010-05-12 20:52:35.671216316 -0700 > > @@ -273,7 +273,11 @@ static int tbf_change(struct Qdisc* sch, > > if (max_size < 0) > > goto done; > > > > - if (qopt->limit > 0) { > > + if (q->qdisc) { > > + err = fifo_set_limit(q->qdisc, qopt->limit); > > + if (err) > > + goto done; > > q->qdisc is never NULL since a noop_qdisc is assigned by default. Also > this should check that the child is in fact one of the *fifos. But the child will be netem and fifo_set_limit ignores non-fifo.