Skip to contentSkip to conversation

Patch "net_sched: always reset qdisc backlog in qdisc_reset()" has been added to the 4.13-stable tree

PATCH [email protected] 1 participant 1 message Oct 9, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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.13-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.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Mon Oct 9 09:32:35 CEST 2017

From: Konstantin Khlebnikov <[email protected]>
Date: Wed, 20 Sep 2017 15:45:36 +0300
Subject: net_sched: always reset qdisc backlog in qdisc_reset()

From: Konstantin Khlebnikov <[email protected]>

[ 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.

Fixes 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
---
 net/sched/sch_generic.c |    1 +
 1 file changed, 1 insertion(+)
net/sched/sch_generic.c +1 -0
@@ -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 [email protected] are

queue-4.13/net_sched-always-reset-qdisc-backlog-in-qdisc_reset.patch