diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-08-19 15:37:07 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-20 20:02:00 -0700 |
| commit | 68a66d149a8c78ec6720f268597302883e48e9fa (patch) | |
| tree | f387dd6f84d75bb14d89584ba7246cc8be245aed /include/net | |
| parent | 49bf4b36fdee4db3c8bc0507a8413a93a8c711cf (diff) | |
| download | linux-68a66d149a8c78ec6720f268597302883e48e9fa.tar.gz linux-68a66d149a8c78ec6720f268597302883e48e9fa.tar.bz2 linux-68a66d149a8c78ec6720f268597302883e48e9fa.zip | |
net_sched: fix order of queue length updates in qdisc_replace()
This important to call qdisc_tree_reduce_backlog() after changing queue
length. Parent qdisc should deactivate class in ->qlen_notify() called from
qdisc_tree_reduce_backlog() but this happens only if qdisc->q.qlen in zero.
Missed class deactivations leads to crashes/warnings at picking packets
from empty qdisc and corrupting state at reactivating this class in future.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Fixes: 86a7996cc8a0 ("net_sched: introduce qdisc_replace() helper")
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sch_generic.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 1c123e2b2415..67f815e5d525 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -806,8 +806,11 @@ static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new, old = *pold; *pold = new; if (old != NULL) { - qdisc_tree_reduce_backlog(old, old->q.qlen, old->qstats.backlog); + unsigned int qlen = old->q.qlen; + unsigned int backlog = old->qstats.backlog; + qdisc_reset(old); + qdisc_tree_reduce_backlog(old, qlen, backlog); } sch_tree_unlock(sch); |