From: Eric Dumazet <eric.dumazet@gmail.com>
To: Jiri Pirko <jiri@resnulli.us>
Cc: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com,
jhs@mojatatu.com, kuznet@ms2.inr.ac.ru, j.vimal@gmail.com
Subject: Re: [patch net-next v3 08/11] tbf: fix value set for q->ptokens
Date: Sat, 09 Feb 2013 17:30:46 -0800 [thread overview]
Message-ID: <1360459846.20362.2.camel@edumazet-glaptop> (raw)
In-Reply-To: <1360428312-1277-9-git-send-email-jiri@resnulli.us>
On Sat, 2013-02-09 at 17:45 +0100, Jiri Pirko wrote:
> q->ptokens is in ns and we are assigning q->mtu directly to it. That is
> wrong. psched_l2t_ns() should be used to compute correct value.
>
Not clear why its a separate patch, and not folded in the 6th
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
> net/sched/sch_tbf.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
> index dc562a8..6e8b670 100644
> --- a/net/sched/sch_tbf.c
> +++ b/net/sched/sch_tbf.c
> @@ -165,8 +165,8 @@ static struct sk_buff *tbf_dequeue(struct Qdisc *sch)
>
> if (q->peak_present) {
> ptoks = toks + q->ptokens;
> - if (ptoks > (long)q->mtu)
> - ptoks = q->mtu;
> + if (ptoks > (s64) psched_l2t_ns(&q->peak, q->mtu))
> + ptoks = (s64) psched_l2t_ns(&q->peak, q->mtu);
It seems a bit expensive to perform this in fast path.
Please add a variable to cache psched_l2t_ns(&q->peak, q->mtu)
> ptoks -= (s64) psched_l2t_ns(&q->peak, len);
> }
> toks += q->tokens;
> @@ -215,7 +215,8 @@ static void tbf_reset(struct Qdisc *sch)
> sch->q.qlen = 0;
> q->t_c = ktime_to_ns(ktime_get());
> q->tokens = q->buffer;
> - q->ptokens = q->mtu;
> + if (q->peak_present)
> + q->ptokens = (s64) psched_l2t_ns(&q->peak, q->mtu);
> qdisc_watchdog_cancel(&q->watchdog);
> }
>
> @@ -296,11 +297,11 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt)
> q->max_size = max_size;
> q->buffer = PSCHED_TICKS2NS(qopt->buffer);
> q->tokens = q->buffer;
> - q->ptokens = q->mtu;
>
> psched_ratecfg_precompute(&q->rate, rtab->rate.rate);
> if (ptab) {
> psched_ratecfg_precompute(&q->peak, ptab->rate.rate);
> + q->ptokens = (s64) psched_l2t_ns(&q->peak, q->mtu);
Here probably.
next prev parent reply other threads:[~2013-02-10 1:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-09 16:45 [patch net-next v3 00/11] couple of net/sched fixes+improvements Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 01/11] htb: use PSCHED_TICKS2NS() Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 02/11] htb: fix values in opt dump Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 03/11] htb: remove pointless first initialization of buffer and cbuffer Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 04/11] htb: initialize cl->tokens and cl->ctokens correctly Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 05/11] sch: make htb_rate_cfg and functions around that generic Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 06/11] tbf: improved accuracy at high rates Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 07/11] tbf: ignore max_size check for gso skbs Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 08/11] tbf: fix value set for q->ptokens Jiri Pirko
2013-02-10 1:30 ` Eric Dumazet [this message]
2013-02-10 8:18 ` Jiri Pirko
2013-02-10 8:21 ` Eric Dumazet
2013-02-10 8:51 ` Jiri Pirko
2013-02-10 18:00 ` Eric Dumazet
2013-02-10 18:37 ` Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 09/11] act_police: move struct tcf_police to act_police.c Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 10/11] act_police: improved accuracy at high rates Jiri Pirko
2013-02-10 1:33 ` Eric Dumazet
2013-02-09 16:45 ` [patch net-next v3 11/11] act_police: remove <=mtu check for gso skbs Jiri Pirko
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=1360459846.20362.2.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=j.vimal@gmail.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=kuznet@ms2.inr.ac.ru \
--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