This is a note to let you know that I've just added the patch titled
sch_prio: update backlog as well
to the 4.4-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:
sch_prio-update-backlog-as-well.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6529d75ad9228f4d8a8f6c5c5244ceb945ac9bc2 Mon Sep 17 00:00:00 2001
From: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Date: Wed, 1 Jun 2016 16:15:16 -0700
Subject: sch_prio: update backlog as well
From: WANG Cong <xiyou.wangcong@xxxxxxxxx>
commit 6529d75ad9228f4d8a8f6c5c5244ceb945ac9bc2 upstream.
We need to update backlog too when we update qlen.
Joint work with Stas.
Reported-by: Stas Nichiporovich <stasn77@xxxxxxxxx>
Tested-by: Stas Nichiporovich <stasn77@xxxxxxxxx>
Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Cc: Jamal Hadi Salim <jhs@xxxxxxxxxxxx>
Signed-off-by: Cong Wang <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/sched/sch_prio.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -85,6 +85,7 @@ prio_enqueue(struct sk_buff *skb, struct
ret = qdisc_enqueue(skb, qdisc);
if (ret == NET_XMIT_SUCCESS) {
+ qdisc_qstats_backlog_inc(sch, skb);
sch->q.qlen++;
return NET_XMIT_SUCCESS;
}
@@ -117,6 +118,7 @@ static struct sk_buff *prio_dequeue(stru
struct sk_buff *skb = qdisc_dequeue_peeked(qdisc);
if (skb) {
qdisc_bstats_update(sch, skb);
+ qdisc_qstats_backlog_dec(sch, skb);
sch->q.qlen--;
return skb;
}
@@ -135,6 +137,7 @@ static unsigned int prio_drop(struct Qdi
for (prio = q->bands-1; prio >= 0; prio--) {
qdisc = q->queues[prio];
if (qdisc->ops->drop && (len = qdisc->ops->drop(qdisc)) != 0) {
+ sch->qstats.backlog -= len;
sch->q.qlen--;
return len;
}
@@ -151,6 +154,7 @@ prio_reset(struct Qdisc *sch)
for (prio = 0; prio < q->bands; prio++)
qdisc_reset(q->queues[prio]);
+ sch->qstats.backlog = 0;
sch->q.qlen = 0;
}
Patches currently in stable-queue which might be from xiyou.wangcong@xxxxxxxxx are
queue-4.4/sch_sfb-keep-backlog-updated-with-qlen.patch
queue-4.4/sch_hfsc-always-keep-backlog-updated.patch
queue-4.4/sch_drr-update-backlog-as-well.patch
queue-4.4/sch_tbf-update-backlog-as-well.patch
queue-4.4/sch_prio-update-backlog-as-well.patch
queue-4.4/net_sched-keep-backlog-updated-with-qlen.patch
queue-4.4/sch_qfq-keep-backlog-updated-with-qlen.patch
