net_sched: sch_sfq: add backlog info in sfq_dump_class_stats()

We currently return for each active SFQ slot the number of packets in
queue. We can also give number of bytes accounted for these packets.

tc -s class show dev ifb0

Before patch :

class sfq 11:3d9 parent 11:
 (dropped 0, overlimits 0 requeues 0)
 backlog 0b 3p requeues 0
 allot 1266

After patch :

class sfq 11:3e4 parent 11:
 (dropped 0, overlimits 0 requeues 0)
 backlog 4380b 3p requeues 0
 allot 1212

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 3cf478d012dd4f29b7a67f951c2cfa901b64248f..cb331dea7fe0de12d0584e4e0e9f3a2e31911569 100644 (file)
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -548,8 +548,13 @@ static int sfq_dump_class_stats(struct Qdisc *sch, unsigned long cl,
 {
        struct sfq_sched_data *q = qdisc_priv(sch);
        sfq_index idx = q->ht[cl-1];
-       struct gnet_stats_queue qs = { .qlen = q->qs[idx].qlen };
+       struct sk_buff_head *list = &q->qs[idx];
+       struct gnet_stats_queue qs = { .qlen = list->qlen };
        struct tc_sfq_xstats xstats = { .allot = q->allot[idx] };
+       struct sk_buff *skb;
+
+       skb_queue_walk(list, skb)
+               qs.backlog += qdisc_pkt_len(skb);
 
        if (gnet_stats_copy_queue(d, &qs) < 0)
                return -1;