From: Kumar Kartikeya Dwivedi <memxor@gmail.com>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: bpf@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Dave Marchevsky <davemarchevsky@meta.com>,
Delyan Kratunov <delyank@meta.com>
Subject: Re: [PATCH bpf-next v2 07/25] bpf: Consolidate spin_lock, timer management into fields_tab
Date: Wed, 19 Oct 2022 11:13:59 +0530 [thread overview]
Message-ID: <20221019054359.ffsw5psanndy25ow@apollo> (raw)
In-Reply-To: <20221019014050.5w5s3ocr6sptmylu@macbook-pro-4.dhcp.thefacebook.com>
On Wed, Oct 19, 2022 at 07:10:50AM IST, Alexei Starovoitov wrote:
> On Thu, Oct 13, 2022 at 11:52:45AM +0530, Kumar Kartikeya Dwivedi wrote:
> > if (unlikely((map_flags & BPF_F_LOCK) &&
> > - !map_value_has_spin_lock(map)))
> > + !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)))
> > return -EINVAL;
>
> ...
>
> > /* We don't reset or free fields other than timer on uref dropping to zero. */
> > - if (!map_value_has_timer(map))
> > + if (!btf_type_fields_has_field(map->fields_tab, BPF_TIMER))
>
> ...
>
> > - !map_value_has_spin_lock(&smap->map)))
> > + !btf_type_fields_has_field(smap->map.fields_tab, BPF_SPIN_LOCK)))
> > return ERR_PTR(-EINVAL);
>
> ...
>
> > - if (!map_value_has_timer(&htab->map))
> > + if (!btf_type_fields_has_field(htab->map.fields_tab, BPF_TIMER))
> > return;
>
> ...
>
> > if (unlikely(map_flags & BPF_F_LOCK)) {
> > - if (unlikely(!map_value_has_spin_lock(map)))
> > + if (unlikely(!btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)))
> > return -EINVAL;
>
> ...
>
> > - /* We don't reset or free kptr on uref dropping to zero. */
> > - if (!map_value_has_timer(&htab->map))
> > + /* We only free timer on uref dropping to zero */
> > + if (!btf_type_fields_has_field(htab->map.fields_tab, BPF_TIMER))
> > return;
>
> ...
> > if ((elem_map_flags & ~BPF_F_LOCK) ||
> > - ((elem_map_flags & BPF_F_LOCK) && !map_value_has_spin_lock(map)))
> > + ((elem_map_flags & BPF_F_LOCK) && !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)))
> > return -EINVAL;
>
> ...
>
> > if (unlikely((flags & BPF_F_LOCK) &&
> > - !map_value_has_spin_lock(map)))
> > + !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)))
> > return -EINVAL;
>
> ...
>
> > - if (map_value_has_spin_lock(inner_map)) {
> > + if (btf_type_fields_has_field(inner_map->fields_tab, BPF_SPIN_LOCK)) {
> > fdput(f);
> > return ERR_PTR(-ENOTSUPP);
>
> ...
>
> > if ((attr->flags & BPF_F_LOCK) &&
> > - !map_value_has_spin_lock(map)) {
> > + !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)) {
> > err = -EINVAL;
> > goto err_put;
> > }
> > @@ -1440,7 +1428,7 @@ static int map_update_elem(union bpf_attr *attr, bpfptr_t uattr)
> > }
> >
> > if ((attr->flags & BPF_F_LOCK) &&
> > - !map_value_has_spin_lock(map)) {
> > + !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)) {
> > err = -EINVAL;
> > goto err_put;
> > }
> > @@ -1603,7 +1591,7 @@ int generic_map_delete_batch(struct bpf_map *map,
> > return -EINVAL;
> >
> > if ((attr->batch.elem_flags & BPF_F_LOCK) &&
> > - !map_value_has_spin_lock(map)) {
> > + !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)) {
> > return -EINVAL;
> > }
> >
> > @@ -1660,7 +1648,7 @@ int generic_map_update_batch(struct bpf_map *map,
> > return -EINVAL;
> >
> > if ((attr->batch.elem_flags & BPF_F_LOCK) &&
> > - !map_value_has_spin_lock(map)) {
> > + !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)) {
> > return -EINVAL;
> > }
> >
> > @@ -1723,7 +1711,7 @@ int generic_map_lookup_batch(struct bpf_map *map,
> > return -EINVAL;
> >
> > if ((attr->batch.elem_flags & BPF_F_LOCK) &&
> > - !map_value_has_spin_lock(map))
> > + !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK))
> > return -EINVAL;
> >
> > value_size = bpf_map_value_size(map);
> > @@ -1845,7 +1833,7 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr)
> > }
> >
> > if ((attr->flags & BPF_F_LOCK) &&
> > - !map_value_has_spin_lock(map)) {
> > + !btf_type_fields_has_field(map->fields_tab, BPF_SPIN_LOCK)) {
>
> All of these btf_type_fields_has_field() is quite an eyesore.
> That was the reason to suggest btf_record_has_field() in the previous email.
I agree, what do you think of calling it btf_type_has_field? You pass in the
btf_type_record and the field type.
next prev parent reply other threads:[~2022-10-19 5:44 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-13 6:22 [PATCH bpf-next v2 00/25] Local kptrs, BPF linked lists Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 01/25] bpf: Document UAPI details for special BPF types Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 02/25] bpf: Allow specifying volatile type modifier for kptrs Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 03/25] bpf: Clobber stack slot when writing over spilled PTR_TO_BTF_ID Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 04/25] bpf: Fix slot type check in check_stack_write_var_off Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 05/25] bpf: Drop reg_type_may_be_refcounted_or_null Kumar Kartikeya Dwivedi
2022-10-19 16:04 ` Dave Marchevsky
2022-10-13 6:22 ` [PATCH bpf-next v2 06/25] bpf: Refactor kptr_off_tab into fields_tab Kumar Kartikeya Dwivedi
2022-10-19 1:35 ` Alexei Starovoitov
2022-10-19 5:42 ` Kumar Kartikeya Dwivedi
2022-10-19 15:54 ` Alexei Starovoitov
2022-10-19 23:57 ` Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 07/25] bpf: Consolidate spin_lock, timer management " Kumar Kartikeya Dwivedi
2022-10-19 1:40 ` Alexei Starovoitov
2022-10-19 5:43 ` Kumar Kartikeya Dwivedi [this message]
2022-10-13 6:22 ` [PATCH bpf-next v2 08/25] bpf: Refactor map->off_arr handling Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 09/25] bpf: Support bpf_list_head in map values Kumar Kartikeya Dwivedi
2022-10-19 1:59 ` Alexei Starovoitov
2022-10-19 5:48 ` Kumar Kartikeya Dwivedi
2022-10-19 15:57 ` Alexei Starovoitov
2022-10-19 23:59 ` Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 10/25] bpf: Introduce local kptrs Kumar Kartikeya Dwivedi
2022-10-19 17:15 ` Dave Marchevsky
2022-10-20 0:48 ` Kumar Kartikeya Dwivedi
2022-10-25 16:27 ` Dave Marchevsky
2022-10-25 18:11 ` Kumar Kartikeya Dwivedi
2022-10-25 16:32 ` Dave Marchevsky
2022-10-25 18:11 ` Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 11/25] bpf: Recognize bpf_{spin_lock,list_head,list_node} in " Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 12/25] bpf: Verify ownership relationships for owning types Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 13/25] bpf: Support locking bpf_spin_lock in local kptr Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 14/25] bpf: Allow locking bpf_spin_lock global variables Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 15/25] bpf: Rewrite kfunc argument handling Kumar Kartikeya Dwivedi
2022-10-13 13:48 ` kernel test robot
2022-10-13 6:22 ` [PATCH bpf-next v2 16/25] bpf: Drop kfunc bits from btf_check_func_arg_match Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 17/25] bpf: Support constant scalar arguments for kfuncs Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 18/25] bpf: Teach verifier about non-size constant arguments Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 19/25] bpf: Introduce bpf_kptr_new Kumar Kartikeya Dwivedi
2022-10-19 2:31 ` Alexei Starovoitov
2022-10-19 5:58 ` Kumar Kartikeya Dwivedi
2022-10-19 16:31 ` Alexei Starovoitov
2022-10-20 0:44 ` Kumar Kartikeya Dwivedi
2022-10-20 1:11 ` Alexei Starovoitov
2022-10-13 6:22 ` [PATCH bpf-next v2 20/25] bpf: Introduce bpf_kptr_drop Kumar Kartikeya Dwivedi
2022-10-13 6:22 ` [PATCH bpf-next v2 21/25] bpf: Permit NULL checking pointer with non-zero fixed offset Kumar Kartikeya Dwivedi
2022-10-13 6:23 ` [PATCH bpf-next v2 22/25] bpf: Introduce single ownership BPF linked list API Kumar Kartikeya Dwivedi
2022-10-25 17:45 ` Dave Marchevsky
2022-10-25 19:00 ` Kumar Kartikeya Dwivedi
2022-10-13 6:23 ` [PATCH bpf-next v2 23/25] libbpf: Add support for private BSS map section Kumar Kartikeya Dwivedi
2022-10-18 4:03 ` Andrii Nakryiko
2022-10-13 6:23 ` [PATCH bpf-next v2 24/25] selftests/bpf: Add __contains macro to bpf_experimental.h Kumar Kartikeya Dwivedi
2022-10-13 6:23 ` [PATCH bpf-next v2 25/25] selftests/bpf: Add BPF linked list API tests Kumar Kartikeya Dwivedi
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=20221019054359.ffsw5psanndy25ow@apollo \
--to=memxor@gmail.com \
--cc=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davemarchevsky@meta.com \
--cc=delyank@meta.com \
/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