Skip to content

Commit 58079f5

Browse files
koct9igregkh
authored andcommitted
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>
1 parent 248af6a commit 58079f5

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

include/net/sch_generic.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,11 @@ static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new,
717717
old = *pold;
718718
*pold = new;
719719
if (old != NULL) {
720-
qdisc_tree_reduce_backlog(old, old->q.qlen, old->qstats.backlog);
720+
unsigned int qlen = old->q.qlen;
721+
unsigned int backlog = old->qstats.backlog;
722+
721723
qdisc_reset(old);
724+
qdisc_tree_reduce_backlog(old, qlen, backlog);
722725
}
723726
sch_tree_unlock(sch);
724727

0 commit comments

Comments
 (0)