From: Yonghong Song <yhs@fb.com>
To: Jiri Olsa <jolsa@kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>
Cc: <netdev@vger.kernel.org>, <bpf@vger.kernel.org>,
Song Liu <songliubraving@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>, Andrii Nakryiko <andriin@fb.com>,
Brendan Gregg <bgregg@netflix.com>,
Florent Revest <revest@chromium.org>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: [PATCH v4 bpf-next 06/14] bpf: Use BTF_ID to resolve bpf_ctx_convert struct
Date: Fri, 26 Jun 2020 14:44:39 -0700 [thread overview]
Message-ID: <2de85be7-0910-3129-b881-edbc2854d38e@fb.com> (raw)
In-Reply-To: <20200625221304.2817194-7-jolsa@kernel.org>
On 6/25/20 3:12 PM, Jiri Olsa wrote:
> This way the ID is resolved during compile time,
> and we can remove the runtime name search.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> kernel/bpf/btf.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> index 4da6b0770ff9..701a2cb5dfb2 100644
> --- a/kernel/bpf/btf.c
> +++ b/kernel/bpf/btf.c
> @@ -18,6 +18,7 @@
> #include <linux/sort.h>
> #include <linux/bpf_verifier.h>
> #include <linux/btf.h>
> +#include <linux/btf_ids.h>
> #include <linux/skmsg.h>
> #include <linux/perf_event.h>
> #include <net/sock.h>
> @@ -3621,6 +3622,9 @@ static int btf_translate_to_vmlinux(struct bpf_verifier_log *log,
> return kern_ctx_type->type;
> }
>
> +BTF_ID_LIST(bpf_ctx_convert_btf_id)
> +BTF_ID(struct, bpf_ctx_convert)
> +
> struct btf *btf_parse_vmlinux(void)
> {
> struct btf_verifier_env *env = NULL;
> @@ -3659,10 +3663,10 @@ struct btf *btf_parse_vmlinux(void)
> if (err)
> goto errout;
>
> - /* find struct bpf_ctx_convert for type checking later */
> - btf_id = btf_find_by_name_kind(btf, "bpf_ctx_convert", BTF_KIND_STRUCT);
> - if (btf_id < 0) {
> - err = btf_id;
> + /* struct bpf_ctx_convert for type checking later */
> + btf_id = bpf_ctx_convert_btf_id[0];
> + if (btf_id <= 0) {
Just want to double check. Is it possible btf_id < 0 since previous
patch did not check < 0?
> + err = -EINVAL;
> goto errout;
> }
> /* btf_parse_vmlinux() runs under bpf_verifier_lock */
>
next prev parent reply other threads:[~2020-06-26 21:45 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 22:12 [PATCH v4 bpf-next 00/14] bpf: Add d_path helper Jiri Olsa
2020-06-25 22:12 ` [PATCH v4 bpf-next 01/14] bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object Jiri Olsa
2020-06-26 20:53 ` Andrii Nakryiko
2020-06-26 21:09 ` Yonghong Song
2020-06-28 19:09 ` Alexei Starovoitov
2020-06-28 19:35 ` Jiri Olsa
2020-06-28 20:53 ` Yonghong Song
2020-06-25 22:12 ` [PATCH v4 bpf-next 02/14] bpf: Compile resolve_btfids tool at kernel compilation start Jiri Olsa
2020-06-26 21:28 ` Andrii Nakryiko
2020-06-28 19:48 ` Jiri Olsa
2020-06-25 22:12 ` [PATCH v4 bpf-next 03/14] bpf: Add BTF_ID_LIST/BTF_ID macros Jiri Olsa
2020-06-26 21:32 ` Andrii Nakryiko
2020-06-28 19:50 ` Jiri Olsa
2020-06-25 22:12 ` [PATCH v4 bpf-next 04/14] bpf: Resolve BTF IDs in vmlinux image Jiri Olsa
2020-06-26 21:34 ` Andrii Nakryiko
2020-06-25 22:12 ` [PATCH v4 bpf-next 05/14] bpf: Remove btf_id helpers resolving Jiri Olsa
2020-06-26 21:36 ` Yonghong Song
2020-06-26 21:40 ` Andrii Nakryiko
2020-06-26 23:29 ` Yonghong Song
2020-06-28 18:50 ` Alexei Starovoitov
2020-06-28 20:00 ` Andrii Nakryiko
2020-06-28 20:16 ` Jiri Olsa
2020-06-28 20:59 ` Yonghong Song
2020-06-28 21:20 ` Jiri Olsa
2020-06-25 22:12 ` [PATCH v4 bpf-next 06/14] bpf: Use BTF_ID to resolve bpf_ctx_convert struct Jiri Olsa
2020-06-26 21:44 ` Andrii Nakryiko
2020-06-26 21:44 ` Yonghong Song [this message]
2020-06-28 19:52 ` Jiri Olsa
2020-06-25 22:12 ` [PATCH v4 bpf-next 07/14] bpf: Allow nested BTF object to be refferenced by BTF object + offset Jiri Olsa
2020-06-30 1:52 ` Andrii Nakryiko
2020-06-30 13:54 ` Jiri Olsa
2020-06-30 20:05 ` Andrii Nakryiko
2020-06-30 20:07 ` Andrii Nakryiko
2020-07-02 10:08 ` Jiri Olsa
2020-07-06 23:15 ` Andrii Nakryiko
2020-06-25 22:12 ` [PATCH v4 bpf-next 08/14] bpf: Add BTF_SET_START/END macros Jiri Olsa
2020-06-26 21:49 ` Andrii Nakryiko
2020-06-25 22:12 ` [PATCH v4 bpf-next 09/14] bpf: Add info about .BTF.ids section to btf.rst Jiri Olsa
2020-06-25 22:13 ` [PATCH v4 bpf-next 10/14] bpf: Add d_path helper Jiri Olsa
2020-06-26 20:38 ` Andrii Nakryiko
2020-06-28 19:42 ` Jiri Olsa
2020-07-16 23:13 ` KP Singh
2020-07-17 8:28 ` Jiri Olsa
2020-06-25 22:13 ` [PATCH v4 bpf-next 11/14] tools headers: Adopt verbatim copy of btf_ids.h from kernel sources Jiri Olsa
2020-06-26 21:51 ` Andrii Nakryiko
2020-06-25 22:13 ` [PATCH v4 bpf-next 12/14] selftests/bpf: Add verifier test for d_path helper Jiri Olsa
2020-06-30 1:30 ` Andrii Nakryiko
2020-06-25 22:13 ` [PATCH v4 bpf-next 13/14] selftests/bpf: Add " Jiri Olsa
2020-06-26 21:55 ` Andrii Nakryiko
2020-06-28 19:55 ` Jiri Olsa
2020-06-25 22:13 ` [PATCH v4 bpf-next 14/14] selftests/bpf: Add test for resolve_btfids Jiri Olsa
2020-06-30 1:43 ` Andrii Nakryiko
2020-06-30 14:27 ` Jiri Olsa
2020-06-30 18:13 ` Andrii Nakryiko
2020-06-30 1:54 ` [PATCH v4 bpf-next 00/14] bpf: Add d_path helper Andrii Nakryiko
2020-06-30 13:55 ` 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=2de85be7-0910-3129-b881-edbc2854d38e@fb.com \
--to=yhs@fb.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 \
/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;
as well as URLs for NNTP newsgroup(s).