netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] sch_htb.c consume the classes's tokens bellow the HTB_CAN_SEND level
@ 2009-11-03  2:41 Changli Gao
  2009-11-03  8:00 ` Jarek Poplawski
  0 siblings, 1 reply; 21+ messages in thread
From: Changli Gao @ 2009-11-03  2:41 UTC (permalink / raw)
  To: Jamal Hadi Salim; +Cc: devik, netdev, xiaosuo

sch_htb.c consume the classes's tokens bellow the HTB_CAN_SEND level.

When a class enters HTB_MAY_BORROW state, it relies on its parents to
sent packets. The parent class in HTB_CAN_SEND state only consumes
itself and its parents's tokens, but ADD tokens to the classes under its
level. It is totally wrong. It means that a class, which sends packets
in ceil rate, can also enter HTB_CAN_SEND state now and then.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>

----
net/sched/sch_htb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 85acab9..2705702 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -629,11 +629,10 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,
 		if (cl->level >= level) {
 			if (cl->level == level)
 				cl->xstats.lends++;
-			htb_accnt_tokens(cl, bytes, diff);
 		} else {
 			cl->xstats.borrows++;
-			cl->tokens += diff;	/* we moved t_c; update tokens */
 		}
+		htb_accnt_tokens(cl, bytes, diff);
 		htb_accnt_ctokens(cl, bytes, diff);
 		cl->t_c = q->now;
 



^ permalink raw reply related	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2009-11-05  5:44 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-03  2:41 [PATCH] sch_htb.c consume the classes's tokens bellow the HTB_CAN_SEND level Changli Gao
2009-11-03  8:00 ` Jarek Poplawski
2009-11-03  9:47   ` Changli Gao
2009-11-03 10:05     ` Jarek Poplawski
2009-11-03 13:18       ` Changli Gao
2009-11-03 23:00         ` Jarek Poplawski
2009-11-04  1:53           ` Changli Gao
2009-11-04  8:28             ` Jarek Poplawski
2009-11-04  9:16               ` Changli Gao
2009-11-04 10:42                 ` Jarek Poplawski
2009-11-04 10:58                   ` Martin Devera
2009-11-04 11:30                     ` Changli Gao
2009-11-04 11:51                       ` Martin Devera
2009-11-04 11:58                       ` Martin Devera
2009-11-04 12:08                         ` Changli Gao
2009-11-04 12:15                           ` Martin Devera
2009-11-05  5:44                             ` Changli Gao
2009-11-04 11:21                   ` Changli Gao
2009-11-04 11:49                     ` Jarek Poplawski
2009-11-04 12:01                       ` Changli Gao
2009-11-04 12:11                         ` Jarek Poplawski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).