Merge branch 'net-sched-fix-stats-accounting-for-child-NOLOCK-qdiscs'

Paolo Abeni says: ==================== net: sched: fix stats accounting for child NOLOCK qdiscs Currently, stats accounting for NOLOCK qdisc enslaved to classful (lock) qdiscs is buggy. Per CPU values are ignored in most places, as a result, stats dump in the above scenario always report 0 length backlog and parent backlog len is not updated correctly on NOLOCK qdisc removal. The first patch address stats dumping, and the second one child qdisc removal. I'm targeting the net tree as this is a bugfix, but it could be moved to net-next due to the relatively large diffstat. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2026-10-14 05:55:17 +00:00 · 2019-04-01 14:50:14 -07:00 · 2019-04-01 14:50:14 -07:00 · c4df1bddc4
commit c4df1bddc4
parent 0db6f8befc e5f0e8f8e4
14 changed files with 71 additions and 90 deletions
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
--- a/net/sched/sch_mq.c
+++ b/net/sched/sch_mq.c
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c