This is a note to let you know that I've just added the patch titled
sch_drr: 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_drr-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 6a73b571b63075ef408c83f07c2565b5652f93cc Mon Sep 17 00:00:00 2001
From: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Date: Wed, 1 Jun 2016 16:15:17 -0700
Subject: sch_drr: update backlog as well
From: WANG Cong <xiyou.wangcong@xxxxxxxxx>
commit 6a73b571b63075ef408c83f07c2565b5652f93cc upstream.
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_drr.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -375,6 +375,7 @@ static int drr_enqueue(struct sk_buff *s
cl->deficit = cl->quantum;
}
+ qdisc_qstats_backlog_inc(sch, skb);
sch->q.qlen++;
return err;
}
@@ -405,6 +406,7 @@ static struct sk_buff *drr_dequeue(struc
bstats_update(&cl->bstats, skb);
qdisc_bstats_update(sch, skb);
+ qdisc_qstats_backlog_dec(sch, skb);
sch->q.qlen--;
return skb;
}
@@ -426,6 +428,7 @@ static unsigned int drr_drop(struct Qdis
if (cl->qdisc->ops->drop) {
len = cl->qdisc->ops->drop(cl->qdisc);
if (len > 0) {
+ sch->qstats.backlog -= len;
sch->q.qlen--;
if (cl->qdisc->q.qlen == 0)
list_del(&cl->alist);
@@ -461,6 +464,7 @@ static void drr_reset_qdisc(struct Qdisc
qdisc_reset(cl->qdisc);
}
}
+ 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
