diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-08-19 15:37:07 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-30 10:16:54 +0200 |
| commit | 4eebc905b64836baac8c8ac898f8e8e6addd905a (patch) | |
| tree | bcd96d30b92aa229ea37f97f267e7c5ec78b2f0a /include | |
| parent | 28ae858736a42b37ff4352e3cb46e4a9e9299d2f (diff) | |
| download | linux-stable-4eebc905b64836baac8c8ac898f8e8e6addd905a.tar.gz linux-stable-4eebc905b64836baac8c8ac898f8e8e6addd905a.tar.bz2 linux-stable-4eebc905b64836baac8c8ac898f8e8e6addd905a.zip | |
net_sched: fix order of queue length updates in qdisc_replace()
[ Upstream commit 68a66d149a8c78ec6720f268597302883e48e9fa ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -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 f10b01467f07..22cd7300d13b 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -699,8 +699,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); |