BPF Archive on lore.kernel.org
 help / color / Atom feed
From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Andrii Nakryiko <andriin@fb.com>,
	Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
	Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
	Martin KaFai Lau <kafai@fb.com>, David Miller <davem@redhat.com>,
	John Fastabend <john.fastabend@gmail.com>,
	Wenbo Zhang <ethercflow@gmail.com>,
	KP Singh <kpsingh@chromium.org>,
	Brendan Gregg <bgregg@netflix.com>,
	Florent Revest <revest@chromium.org>,
	Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: [PATCH v8 bpf-next 07/13] bpf: Add btf_struct_ids_match function
Date: Tue, 28 Jul 2020 16:35:16 -0700
Message-ID: <CAEf4BzacqauEc8=o29EBUsmvTMs3FZ+-Kcc4cSJ9Te4yh5-7qg@mail.gmail.com> (raw)
In-Reply-To: <20200722211223.1055107-8-jolsa@kernel.org>

On Wed, Jul 22, 2020 at 2:13 PM Jiri Olsa <jolsa@kernel.org> wrote:
>
> Adding btf_struct_ids_match function to check if given address provided
> by BTF object + offset is also address of another nested BTF object.
>
> This allows to pass an argument to helper, which is defined via parent
> BTF object + offset, like for bpf_d_path (added in following changes):
>
>   SEC("fentry/filp_close")
>   int BPF_PROG(prog_close, struct file *file, void *id)
>   {
>     ...
>     ret = bpf_d_path(&file->f_path, ...
>
> The first bpf_d_path argument is hold by verifier as BTF file object
> plus offset of f_path member.
>
> The btf_struct_ids_match function will walk the struct file object and
> check if there's nested struct path object on the given offset.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  include/linux/bpf.h   |  2 ++
>  kernel/bpf/btf.c      | 29 +++++++++++++++++++++++++++++
>  kernel/bpf/verifier.c | 18 ++++++++++++------
>  3 files changed, 43 insertions(+), 6 deletions(-)
>
> diff --git a/include/linux/bpf.h b/include/linux/bpf.h
> index bae557ff2da8..c981e258fed3 100644
> --- a/include/linux/bpf.h
> +++ b/include/linux/bpf.h
> @@ -1306,6 +1306,8 @@ int btf_struct_access(struct bpf_verifier_log *log,
>                       const struct btf_type *t, int off, int size,
>                       enum bpf_access_type atype,
>                       u32 *next_btf_id);
> +bool btf_struct_ids_match(struct bpf_verifier_log *log,
> +                         int off, u32 id, u32 mid);
>  int btf_resolve_helper_id(struct bpf_verifier_log *log,
>                           const struct bpf_func_proto *fn, int);
>
> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> index 1ab5fd5bf992..562d4453fad3 100644
> --- a/kernel/bpf/btf.c
> +++ b/kernel/bpf/btf.c
> @@ -4140,6 +4140,35 @@ int btf_struct_access(struct bpf_verifier_log *log,
>         return -EINVAL;
>  }
>
> +bool btf_struct_ids_match(struct bpf_verifier_log *log,
> +                         int off, u32 id, u32 mid)
> +{
> +       const struct btf_type *type;
> +       u32 nid;
> +       int err;
> +

mid and nid are terrible names, especially as an input argument name.
mid == need_type_id? nid == cur_type_id or something along those
lines?

> +       do {
> +               type = btf_type_by_id(btf_vmlinux, id);
> +               if (!type)
> +                       return false;
> +               err = btf_struct_walk(log, type, off, 1, &nid);
> +               if (err < 0)
> +                       return false;
> +
> +               /* We found nested struct object. If it matches
> +                * the requested ID, we're done. Otherwise let's
> +                * continue the search with offset 0 in the new
> +                * type.
> +                */
> +               if (err == walk_struct && mid == nid)
> +                       return true;
> +               off = 0;
> +               id = nid;
> +       } while (err == walk_struct);

This seems like a slightly more obvious control flow:

again:

   ...

   if (err != walk_struct)
      return false;

   if (mid != nid) {
      off = 0;
      id = nid;
      goto again;
   }

   return true;

> +
> +       return false;
> +}
> +
>  int btf_resolve_helper_id(struct bpf_verifier_log *log,
>                           const struct bpf_func_proto *fn, int arg)
>  {

[...]

  reply index

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22 21:12 [PATCH v8 bpf-next 00/13] bpf: Add d_path helper Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 01/13] selftests/bpf: Fix resolve_btfids test Jiri Olsa
2020-07-28 20:27   ` Andrii Nakryiko
2020-07-29 20:06     ` Jiri Olsa
2020-07-29 21:38       ` Andrii Nakryiko
2020-07-22 21:12 ` [PATCH v8 bpf-next 02/13] tools resolve_btfids: Add support for set symbols Jiri Olsa
2020-07-28  0:53   ` Andrii Nakryiko
2020-07-28  9:35     ` Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 03/13] bpf: Move btf_resolve_size into __btf_resolve_size Jiri Olsa
2020-07-28 20:29   ` Andrii Nakryiko
2020-07-22 21:12 ` [PATCH v8 bpf-next 04/13] bpf: Add elem_id pointer as argument to __btf_resolve_size Jiri Olsa
2020-07-28 20:30   ` Andrii Nakryiko
2020-07-22 21:12 ` [PATCH v8 bpf-next 05/13] bpf: Add type_id " Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 06/13] bpf: Factor btf_struct_access function Jiri Olsa
2020-07-28 23:27   ` Andrii Nakryiko
2020-07-29 15:59     ` Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 07/13] bpf: Add btf_struct_ids_match function Jiri Olsa
2020-07-28 23:35   ` Andrii Nakryiko [this message]
2020-07-29 16:04     ` Jiri Olsa
2020-07-29 17:51       ` Andrii Nakryiko
2020-07-29 18:55         ` Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 08/13] bpf: Add BTF_SET_START/END macros Jiri Olsa
2020-07-28 19:39   ` Andrii Nakryiko
2020-07-29 11:54     ` Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 09/13] bpf: Add d_path helper Jiri Olsa
2020-07-28 19:47   ` Andrii Nakryiko
2020-07-29 15:54     ` Jiri Olsa
2020-07-29 20:11   ` Al Viro
2020-07-30 10:22     ` Jiri Olsa
2020-07-29 20:17   ` Al Viro
2020-07-30 10:09     ` Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 10/13] bpf: Update .BTF_ids section in btf.rst with sets info Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 11/13] selftests/bpf: Add verifier test for d_path helper Jiri Olsa
2020-07-28 19:49   ` Andrii Nakryiko
2020-07-22 21:12 ` [PATCH v8 bpf-next 12/13] selftests/bpf: Add " Jiri Olsa
2020-07-28 19:53   ` Andrii Nakryiko
2020-07-29 11:25     ` Jiri Olsa
2020-07-22 21:12 ` [PATCH v8 bpf-next 13/13] selftests/bpf: Add set test to resolve_btfids Jiri Olsa
2020-07-28 19:56   ` Andrii Nakryiko
2020-07-29 15:34     ` Jiri Olsa

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='CAEf4BzacqauEc8=o29EBUsmvTMs3FZ+-Kcc4cSJ9Te4yh5-7qg@mail.gmail.com' \
    --to=andrii.nakryiko@gmail.com \
    --cc=andriin@fb.com \
    --cc=ast@kernel.org \
    --cc=bgregg@netflix.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@redhat.com \
    --cc=ethercflow@gmail.com \
    --cc=john.fastabend@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=kafai@fb.com \
    --cc=kpsingh@chromium.org \
    --cc=netdev@vger.kernel.org \
    --cc=revest@chromium.org \
    --cc=songliubraving@fb.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=yhs@fb.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

BPF Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/bpf/0 bpf/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 bpf bpf/ https://lore.kernel.org/bpf \
		bpf@vger.kernel.org
	public-inbox-index bpf

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.bpf


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git