From mboxrd@z Thu Jan  1 00:00:00 1970
From: Terry Lam <vtlam@google.com>
Subject: Re: [net PATCH v2] net: sched: lock imbalance in hhf qdisc
Date: Fri, 2 May 2014 01:26:20 -0700
Message-ID: <CAHy_qTx8FegdTDcf-g5xmmt8M6+s3hPPWx4PCezeuM5AkOLBsA@mail.gmail.com>
References: <20140501162300.17183.83124.stgit@nitbit.x32>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Cc: Eric Dumazet <eric.dumazet@gmail.com>,
	Linux Netdev List <netdev@vger.kernel.org>,
	Eric Dumazet <edumazet@google.com>
To: John Fastabend <john.fastabend@gmail.com>
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail-ob0-f171.google.com ([209.85.214.171]:33291 "EHLO
	mail-ob0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750978AbaEBI0V (ORCPT
	<rfc822;netdev@vger.kernel.org>); Fri, 2 May 2014 04:26:21 -0400
Received: by mail-ob0-f171.google.com with SMTP id wn1so21250obc.16
        for <netdev@vger.kernel.org>; Fri, 02 May 2014 01:26:20 -0700 (PDT)
In-Reply-To: <20140501162300.17183.83124.stgit@nitbit.x32>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

Thanks a lot for the fix, John and Eric!

Regards,
Terry

On Thu, May 1, 2014 at 9:23 AM, John Fastabend <john.fastabend@gmail.com> wrote:
> hhf_change() takes the sch_tree_lock and releases it but misses the
> error cases. Fix the missed case here.
>
> To reproduce try a command like this,
>
> # tc qdisc change dev p3p2 root hhf quantum 40960 non_hh_weight 300000
>
> Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
> ---
>  net/sched/sch_hhf.c |   11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c
> index edee03d..6e957c3 100644
> --- a/net/sched/sch_hhf.c
> +++ b/net/sched/sch_hhf.c
> @@ -553,11 +553,6 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt)
>         if (err < 0)
>                 return err;
>
> -       sch_tree_lock(sch);
> -
> -       if (tb[TCA_HHF_BACKLOG_LIMIT])
> -               sch->limit = nla_get_u32(tb[TCA_HHF_BACKLOG_LIMIT]);
> -
>         if (tb[TCA_HHF_QUANTUM])
>                 new_quantum = nla_get_u32(tb[TCA_HHF_QUANTUM]);
>
> @@ -567,6 +562,12 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt)
>         non_hh_quantum = (u64)new_quantum * new_hhf_non_hh_weight;
>         if (non_hh_quantum > INT_MAX)
>                 return -EINVAL;
> +
> +       sch_tree_lock(sch);
> +
> +       if (tb[TCA_HHF_BACKLOG_LIMIT])
> +               sch->limit = nla_get_u32(tb[TCA_HHF_BACKLOG_LIMIT]);
> +
>         q->quantum = new_quantum;
>         q->hhf_non_hh_weight = new_hhf_non_hh_weight;
>
>