Re: [PATCH net-next-2.6] net_sched: sch_sfq: add backlog info in sfq_dump_class_stats()

Jarek Poplawski
2010-12-16T13:09:38Z

On Thu, Dec 16, 2010 at 12:03:04PM +0100, Eric Dumazet wrote:
> Le jeudi 16 décembre 2010 ?? 08:16 +0000, Jarek Poplawski a écrit :
> > On 2010-12-15 19:18, Eric Dumazet wrote:
> > > 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.
...
> > > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> > > ---
> > > net/sched/sch_sfq.c | 7 ++++++-
> > > 1 file changed, 6 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
> > > index 3cf478d..cb331de 100644
> > > --- 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);
> >
> > I don't think you can walk this list without the qdisc lock.
>
> So after checks, I confirm qdisc lock is held at this point, patch is
> valid.
>
> tc_fill_tclass() calls gnet_stats_start_copy_compat() (and locks
> qdisc_root_sleeping_lock()), before calling
> cl_ops->dump_stats(q, cl, &d)
>
> Thanks !

You are right. Sorry for misleading.

Jarek P.