Commit dc66185c authored by WANG Cong's avatar WANG Cong Committed by Kleber Sacilotto de Souza

sch_drr: update backlog as well

BugLink: https://bugs.launchpad.net/bugs/1878232

commit 6a73b571 upstream.

Fixes: 2ccccf5f ("net_sched: update hierarchical backlog too")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent ab37a36c
...@@ -375,6 +375,7 @@ static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch) ...@@ -375,6 +375,7 @@ static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch)
cl->deficit = cl->quantum; cl->deficit = cl->quantum;
} }
qdisc_qstats_backlog_inc(sch, skb);
sch->q.qlen++; sch->q.qlen++;
return err; return err;
} }
...@@ -405,6 +406,7 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch) ...@@ -405,6 +406,7 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)
bstats_update(&cl->bstats, skb); bstats_update(&cl->bstats, skb);
qdisc_bstats_update(sch, skb); qdisc_bstats_update(sch, skb);
qdisc_qstats_backlog_dec(sch, skb);
sch->q.qlen--; sch->q.qlen--;
return skb; return skb;
} }
...@@ -426,6 +428,7 @@ static unsigned int drr_drop(struct Qdisc *sch) ...@@ -426,6 +428,7 @@ static unsigned int drr_drop(struct Qdisc *sch)
if (cl->qdisc->ops->drop) { if (cl->qdisc->ops->drop) {
len = cl->qdisc->ops->drop(cl->qdisc); len = cl->qdisc->ops->drop(cl->qdisc);
if (len > 0) { if (len > 0) {
sch->qstats.backlog -= len;
sch->q.qlen--; sch->q.qlen--;
if (cl->qdisc->q.qlen == 0) if (cl->qdisc->q.qlen == 0)
list_del(&cl->alist); list_del(&cl->alist);
...@@ -461,6 +464,7 @@ static void drr_reset_qdisc(struct Qdisc *sch) ...@@ -461,6 +464,7 @@ static void drr_reset_qdisc(struct Qdisc *sch)
qdisc_reset(cl->qdisc); qdisc_reset(cl->qdisc);
} }
} }
sch->qstats.backlog = 0;
sch->q.qlen = 0; sch->q.qlen = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment