From: Vlad Buslov <vladbu@mellanox•com>
To: Stefano Brivio <sbrivio@redhat•com>
Cc: "netdev@vger•kernel.org" <netdev@vger•kernel.org>,
"jhs@mojatatu•com" <jhs@mojatatu•com>,
"xiyou.wangcong@gmail•com" <xiyou.wangcong@gmail•com>,
"jiri@resnulli•us" <jiri@resnulli•us>,
"davem@davemloft•net" <davem@davemloft•net>
Subject: Re: [PATCH net-next 04/12] net: sched: flower: track filter deletion with flag
Date: Fri, 15 Feb 2019 15:54:54 +0000 [thread overview]
Message-ID: <vbfa7ixjbcl.fsf@mellanox.com> (raw)
In-Reply-To: <20190214214926.0cb839a7@redhat.com>
On Thu 14 Feb 2019 at 20:49, Stefano Brivio <sbrivio@redhat•com> wrote:
> On Thu, 14 Feb 2019 09:47:04 +0200
> Vlad Buslov <vladbu@mellanox•com> wrote:
>
>> +static int __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f,
>> + bool *last, struct netlink_ext_ack *extack)
>
> This would be easier to follow (at least for me):
>
>> {
>> struct cls_fl_head *head = fl_head_dereference(tp);
>> bool async = tcf_exts_get_net(&f->exts);
>> - bool last;
>> -
>> - idr_remove(&head->handle_idr, f->handle);
>> - list_del_rcu(&f->list);
>> - last = fl_mask_put(head, f->mask, async);
>> - if (!tc_skip_hw(f->flags))
>> - fl_hw_destroy_filter(tp, f, extack);
>> - tcf_unbind_filter(tp, &f->res);
>> - __fl_put(f);
>> + int err = 0;
>
> without this
>
>> +
>> + (*last) = false;
>
> with *last = false;
>
>> +
>> + if (!f->deleted) {
>
> with:
> if (f->deleted)
> return -ENOENT;
>
>> + f->deleted = true;
>> + rhashtable_remove_fast(&f->mask->ht, &f->ht_node,
>> + f->mask->filter_ht_params);
>> + idr_remove(&head->handle_idr, f->handle);
>> + list_del_rcu(&f->list);
>> + (*last) = fl_mask_put(head, f->mask, async);
>
> with:
> *last = fl_mask_put(head, f->mask, async);
>
>> + if (!tc_skip_hw(f->flags))
>> + fl_hw_destroy_filter(tp, f, extack);
>> + tcf_unbind_filter(tp, &f->res);
>> + __fl_put(f);
>
> and a return 0; here
Agree, this function looks better when structured in the way you
suggest. Will change it in V2.
>
>> + } else {
>> + err = -ENOENT;
>> + }
>>
>> - return last;
>> + return err;
>> }
>>
>> [...]
>>
>> @@ -1520,14 +1541,14 @@ static int fl_delete(struct tcf_proto *tp, void *arg, bool *last,
>> {
>> struct cls_fl_head *head = fl_head_dereference(tp);
>> struct cls_fl_filter *f = arg;
>> + bool last_on_mask;
>
> This is unused in this series, maybe change __fl_delete() to optionally
> take NULL as 'bool *last' argument?
It was implemented like that originally, but on internal review with
Jiri we decided that having unused variable here is better than
complicating __fl_delete() with support for "last" being NULL without
good reason.
>
>> + int err = 0;
>
> Nit: no need to initialise this.
Yes, but I always regret having uninitialized variables in my functions
later on :(
>
>> - rhashtable_remove_fast(&f->mask->ht, &f->ht_node,
>> - f->mask->filter_ht_params);
>> - __fl_delete(tp, f, extack);
>> + err = __fl_delete(tp, f, &last_on_mask, extack);
>> *last = list_empty(&head->masks);
>> __fl_put(f);
>>
>> - return 0;
>> + return err;
>> }
>>
>> static void fl_walk(struct tcf_proto *tp, struct tcf_walker *arg,
next prev parent reply other threads:[~2019-02-15 15:55 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 7:47 [PATCH net-next 00/12] Refactor flower classifier to remove dependency on rtnl lock Vlad Buslov
2019-02-14 7:47 ` [PATCH net-next 01/12] net: sched: flower: don't check for rtnl on head dereference Vlad Buslov
2019-02-18 19:08 ` Cong Wang
2019-02-19 9:45 ` Vlad Buslov
2019-02-20 22:33 ` Cong Wang
2019-02-21 17:45 ` Vlad Buslov
2019-02-22 19:32 ` Cong Wang
2019-02-25 16:11 ` Vlad Buslov
2019-02-25 22:39 ` Cong Wang
2019-02-26 14:57 ` Vlad Buslov
2019-02-28 0:49 ` Cong Wang
2019-02-28 18:35 ` Vlad Buslov
2019-03-02 0:51 ` Cong Wang
2019-02-14 7:47 ` [PATCH net-next 02/12] net: sched: flower: refactor fl_change Vlad Buslov
2019-02-14 20:34 ` Stefano Brivio
2019-02-15 10:38 ` Vlad Buslov
2019-02-15 10:47 ` Stefano Brivio
2019-02-15 16:25 ` Vlad Buslov
2019-02-18 18:20 ` Stefano Brivio
2019-02-14 7:47 ` [PATCH net-next 03/12] net: sched: flower: introduce reference counting for filters Vlad Buslov
2019-02-14 20:34 ` Stefano Brivio
2019-02-15 11:22 ` Vlad Buslov
2019-02-15 12:32 ` Stefano Brivio
2019-02-14 7:47 ` [PATCH net-next 04/12] net: sched: flower: track filter deletion with flag Vlad Buslov
2019-02-14 20:49 ` Stefano Brivio
2019-02-15 15:54 ` Vlad Buslov [this message]
2019-02-14 7:47 ` [PATCH net-next 05/12] net: sched: flower: add reference counter to flower mask Vlad Buslov
2019-02-14 7:47 ` [PATCH net-next 06/12] net: sched: flower: handle concurrent mask insertion Vlad Buslov
2019-02-15 22:46 ` Stefano Brivio
2019-02-14 7:47 ` [PATCH net-next 07/12] net: sched: flower: protect masks list with spinlock Vlad Buslov
2019-02-14 7:47 ` [PATCH net-next 08/12] net: sched: flower: handle concurrent filter insertion in fl_change Vlad Buslov
2019-02-14 7:47 ` [PATCH net-next 09/12] net: sched: flower: handle concurrent tcf proto deletion Vlad Buslov
2019-02-18 20:47 ` Cong Wang
2019-02-19 14:08 ` Vlad Buslov
2019-02-14 7:47 ` [PATCH net-next 10/12] net: sched: flower: protect flower classifier state with spinlock Vlad Buslov
2019-02-14 7:47 ` [PATCH net-next 11/12] net: sched: flower: track rtnl lock state Vlad Buslov
2019-02-15 22:46 ` Stefano Brivio
2019-02-18 9:35 ` Vlad Buslov
2019-02-14 7:47 ` [PATCH net-next 12/12] net: sched: flower: set unlocked flag for flower proto ops Vlad Buslov
2019-02-18 19:27 ` Cong Wang
2019-02-19 10:15 ` Vlad Buslov
2019-02-20 22:36 ` Cong Wang
2019-02-18 19:15 ` [PATCH net-next 00/12] Refactor flower classifier to remove dependency on rtnl lock Cong Wang
2019-02-19 10:00 ` Vlad Buslov
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=vbfa7ixjbcl.fsf@mellanox.com \
--to=vladbu@mellanox$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=jhs@mojatatu$(echo .)com \
--cc=jiri@resnulli$(echo .)us \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sbrivio@redhat$(echo .)com \
--cc=xiyou.wangcong@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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