This is a note to let you know that I've just added the patch titled
net_sched: always reset qdisc backlog in qdisc_reset()
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net_sched-always-reset-qdisc-backlog-in-qdisc_reset.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Tue Oct 10 16:09:22 CEST 2017
From: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
Date: Wed, 20 Sep 2017 15:45:36 +0300
Subject: net_sched: always reset qdisc backlog in qdisc_reset()
From: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
[ Upstream commit c8e1812960eeae42e2183154927028511c4bc566 ]
SKB stored in qdisc->gso_skb also counted into backlog.
Some qdiscs don't reset backlog to zero in ->reset(),
for example sfq just dequeue and free all queued skb.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/sched/sch_generic.c | 1 +
1 file changed, 1 insertion(+)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -681,6 +681,7 @@ void qdisc_reset(struct Qdisc *qdisc)
qdisc->gso_skb = NULL;
}
qdisc->q.qlen = 0;
+ qdisc->qstats.backlog = 0;
}
EXPORT_SYMBOL(qdisc_reset);
Patches currently in stable-queue which might be from khlebnikov@xxxxxxxxxxxxxx are
queue-4.9/lsm-fix-smack_inode_removexattr-and-xattr_getsecurity-memleak.patch
queue-4.9/net_sched-always-reset-qdisc-backlog-in-qdisc_reset.patch