Skip to content

: Fix endless dequeue loops

Patrick McHardy netdev 1 version Applied

Status from this message: Applied to net-2.6.20

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 24 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/6: sch_htb: perform qlen adjustment immediately in ->deletenet/sched/sch_htb.c+6 -11 reply
2/6: Set parent classid in default qdiscsinclude/net/sch_generic.h net/sched/sch_atm.c net/sched/sch_cbq.c +8 more+40 -241 reply
3/6: Fix endless loops caused by inaccurate qlen counters (part 1)include/net/sch_generic.h net/sched/sch_api.c+34 -67 replies
4/6: Fix endless loops (part 2): "simple" qdiscsnet/sched/sch_cbq.c net/sched/sch_dsmark.c net/sched/sch_netem.c +4 more+22 -105 replies
5/6: Fix endless loops (part 3): HFSCnet/sched/sch_hfsc.c+13 -51 reply
6/6: Fix endless loops (part 4): HTBnet/sched/sch_htb.c+17 -79 replies

Reviews trailers per patch

1 of 6 patches has a Reviewed-by or Acked-by.

PatchMartin Devera
1/6
2/6
3/6
4/6
5/6
6/6A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [NET_SCHED 00/06]: Fix endless dequeue loops

These patches fix endless qdisc dequeue loops caused by inaccurate qlen counters that can be triggered quite easily when changing things while packets are queued. Please read the individual changelog entries for details.

I've split them into very small pieces for easier review in case we want to put them in 2.6.19. The problem has always been present, so it doesn't seem to affect many people.

Martin, can you please review the HTB parts? Thanks.

PS: If anyone wants to suggest a nicer name for qdisc_tree_decrease_qlen I'll gladly send new patches :)

 include/net/sch_generic.h |    4 +++-
 net/sched/sch_api.c       |   38 ++++++++++++++++++++++++++++++++------
 net/sched/sch_atm.c       |    5 +++--
 net/sched/sch_cbq.c       |   10 ++++++----
 net/sched/sch_dsmark.c    |    7 ++++---
 net/sched/sch_generic.c   |    7 +++++--
 net/sched/sch_hfsc.c      |   26 ++++++++++++++++++--------
 net/sched/sch_htb.c       |   38 +++++++++++++++++++++++++++-----------
 net/sched/sch_netem.c     |    5 +++--
 net/sched/sch_prio.c      |   14 ++++++++++----
 net/sched/sch_red.c       |   14 +++++++++-----
 net/sched/sch_sfq.c       |    3 +++
 net/sched/sch_tbf.c       |   14 +++++++++-----
 13 files changed, 132 insertions(+), 53 deletions(-)

Patrick McHardy:
[NET_SCHED]: sch_htb: perform qlen adjustment immediately in ->delete [NET_SCHED]: Set parent classid in default qdiscs [NET_SCHED]: Fix endless loops caused by inaccurate qlen counters (part 1) [NET_SCHED]: Fix endless loops (part 2): "simple" qdiscs [NET_SCHED]: Fix endless loops (part 3): HFSC
[NET_SCHED]: Fix endless loops (part 4): HTB