Skip to content

Commit 6529d75

Browse files
congwangdavem330
authored andcommitted
sch_prio: update backlog as well
We need to update backlog too when we update qlen. Joint work with Stas. Reported-by: Stas Nichiporovich <[email protected]> Tested-by: Stas Nichiporovich <[email protected]> Fixes: 2ccccf5 ("net_sched: update hierarchical backlog too") Cc: Jamal Hadi Salim <[email protected]> Signed-off-by: Cong Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 357cc9b commit 6529d75

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/sched/sch_prio.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc *sch)
8585

8686
ret = qdisc_enqueue(skb, qdisc);
8787
if (ret == NET_XMIT_SUCCESS) {
88+
qdisc_qstats_backlog_inc(sch, skb);
8889
sch->q.qlen++;
8990
return NET_XMIT_SUCCESS;
9091
}
@@ -117,6 +118,7 @@ static struct sk_buff *prio_dequeue(struct Qdisc *sch)
117118
struct sk_buff *skb = qdisc_dequeue_peeked(qdisc);
118119
if (skb) {
119120
qdisc_bstats_update(sch, skb);
121+
qdisc_qstats_backlog_dec(sch, skb);
120122
sch->q.qlen--;
121123
return skb;
122124
}
@@ -135,6 +137,7 @@ static unsigned int prio_drop(struct Qdisc *sch)
135137
for (prio = q->bands-1; prio >= 0; prio--) {
136138
qdisc = q->queues[prio];
137139
if (qdisc->ops->drop && (len = qdisc->ops->drop(qdisc)) != 0) {
140+
sch->qstats.backlog -= len;
138141
sch->q.qlen--;
139142
return len;
140143
}
@@ -151,6 +154,7 @@ prio_reset(struct Qdisc *sch)
151154

152155
for (prio = 0; prio < q->bands; prio++)
153156
qdisc_reset(q->queues[prio]);
157+
sch->qstats.backlog = 0;
154158
sch->q.qlen = 0;
155159
}
156160

0 commit comments

Comments
 (0)