kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkt_sched: sch_htb: Consider used jiffies in htb_do_events()

Browse source 
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 <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jarek Poplawski 2009-01-12 21:54:16 -08:00 committed by David S. Miller
parent daaf83d2b9
commit c085134719
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/sched/sch_htb.c
View file

@ -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];