From: Paolo Valente Date: Sat, 15 Sep 2012 00:41:35 +0000 (+0000) Subject: pkt_sched: fix virtual-start-time update in QFQ X-Git-Tag: v3.2.31~21 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1876912a61291c434ab89996200297af5cdcd4ac;p=karo-tx-linux.git pkt_sched: fix virtual-start-time update in QFQ [ Upstream commit 71261956973ba9e0637848a5adb4a5819b4bae83 ] If the old timestamps of a class, say cl, are stale when the class becomes active, then QFQ may assign to cl a much higher start time than the maximum value allowed. This may happen when QFQ assigns to the start time of cl the finish time of a group whose classes are characterized by a higher value of the ratio max_class_pkt/weight_of_the_class with respect to that of cl. Inserting a class with a too high start time into the bucket list corrupts the data structure and may eventually lead to crashes. This patch limits the maximum start time assigned to a class. Signed-off-by: Paolo Valente Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c index 7b0325459e71..ca0fb48d3e55 100644 --- a/net/sched/sch_qfq.c +++ b/net/sched/sch_qfq.c @@ -829,7 +829,10 @@ static void qfq_update_start(struct qfq_sched *q, struct qfq_class *cl) if (mask) { struct qfq_group *next = qfq_ffs(q, mask); if (qfq_gt(roundedF, next->F)) { - cl->S = next->F; + if (qfq_gt(limit, next->F)) + cl->S = next->F; + else /* preserve timestamp correctness */ + cl->S = limit; return; } }