netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Fastabend <john.fastabend@gmail.com>
To: Eric Dumazet <eric.dumazet@gmail.com>,
	David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
	John Fastabend <john.r.fastabend@intel.com>
Subject: Re: [PATCH net] fq_codel: return non zero qlen in class dumps
Date: Tue, 7 Jun 2016 09:03:00 -0700	[thread overview]
Message-ID: <5756F034.4080604@gmail.com> (raw)
In-Reply-To: <1465229559.2968.75.camel@edumazet-glaptop3.roam.corp.google.com>

On 16-06-06 09:12 AM, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> We properly scan the flow list to count number of packets,
> but John passed 0 to gnet_stats_copy_queue() so we report
> a zero value to user space instead of the result.
> 
> Fixes: 640158536632 ("net: sched: restrict use of qstats qlen")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: John Fastabend <john.r.fastabend@intel.com>
> ---
>  net/sched/sch_fq_codel.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
> index 6883a8971562..7a280360aeed 100644
> --- a/net/sched/sch_fq_codel.c
> +++ b/net/sched/sch_fq_codel.c
> @@ -649,7 +649,7 @@ static int fq_codel_dump_class_stats(struct Qdisc *sch, unsigned long cl,
>  		qs.backlog = q->backlogs[idx];
>  		qs.drops = flow->dropped;
>  	}
> -	if (gnet_stats_copy_queue(d, NULL, &qs, 0) < 0)
> +	if (gnet_stats_copy_queue(d, NULL, &qs, qs.qlen) < 0)
>  		return -1;
>  	if (idx < q->flows_cnt)
>  		return gnet_stats_copy_app(d, &xstats, sizeof(xstats));
> 
> 

Apparently I only passed zero in the sch_fq_codel case, strange. At
the moment I can't think of any reason other than it being a typo.

Thanks for fixing it!

Acked-by: John Fastabend <john.r.fastabend@intel.com>

  reply	other threads:[~2016-06-07 16:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-06 16:12 [PATCH net] fq_codel: return non zero qlen in class dumps Eric Dumazet
2016-06-07 16:03 ` John Fastabend [this message]
2016-06-07 23:28 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5756F034.4080604@gmail.com \
    --to=john.fastabend@gmail.com \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=john.r.fastabend@intel.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).