From: Martin KaFai Lau <kafai@fb.com>
To: Andrii Nakryiko <andrii@kernel.org>
Cc: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>, <ast@fb.com>,
<daniel@iogearbox.net>, <kernel-team@fb.com>
Subject: Re: [PATCH bpf-next 4/6] libbpf: add kernel module BTF support for CO-RE relocations
Date: Fri, 20 Nov 2020 15:05:49 -0800 [thread overview]
Message-ID: <20201120230549.37k4zsjsrxbyjin3@kafai-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <20201119232244.2776720-5-andrii@kernel.org>
On Thu, Nov 19, 2020 at 03:22:42PM -0800, Andrii Nakryiko wrote:
[ ... ]
> +static int load_module_btfs(struct bpf_object *obj)
> +{
> + struct bpf_btf_info info;
> + struct module_btf *mod_btf;
> + struct btf *btf;
> + char name[64];
> + __u32 id, len;
> + int err, fd;
> +
> + if (obj->btf_modules_loaded)
> + return 0;
> +
> + /* don't do this again, even if we find no module BTFs */
> + obj->btf_modules_loaded = true;
> +
> + /* kernel too old to support module BTFs */
> + if (!kernel_supports(FEAT_MODULE_BTF))
> + return 0;
> +
> + while (true) {
> + err = bpf_btf_get_next_id(id, &id);
> + if (err && errno == ENOENT)
> + return 0;
> + if (err) {
> + err = -errno;
> + pr_warn("failed to iterate BTF objects: %d\n", err);
> + return err;
> + }
> +
> + fd = bpf_btf_get_fd_by_id(id);
> + if (fd < 0) {
> + if (errno == ENOENT)
> + continue; /* expected race: BTF was unloaded */
> + err = -errno;
> + pr_warn("failed to get BTF object #%d FD: %d\n", id, err);
> + return err;
> + }
> +
> + len = sizeof(info);
> + memset(&info, 0, sizeof(info));
> + info.name = ptr_to_u64(name);
> + info.name_len = sizeof(name);
> +
> + err = bpf_obj_get_info_by_fd(fd, &info, &len);
> + if (err) {
> + err = -errno;
> + pr_warn("failed to get BTF object #%d info: %d\n", id, err);
close(fd);
> + return err;
> + }
> +
> + /* ignore non-module BTFs */
> + if (!info.kernel_btf || strcmp(name, "vmlinux") == 0) {
> + close(fd);
> + continue;
> + }
> +
[ ... ]
> @@ -8656,9 +8815,6 @@ static inline int __find_vmlinux_btf_id(struct btf *btf, const char *name,
> else
> err = btf__find_by_name_kind(btf, name, BTF_KIND_FUNC);
>
> - if (err <= 0)
> - pr_warn("%s is not found in vmlinux BTF\n", name);
> -
> return err;
> }
>
> @@ -8675,6 +8831,9 @@ int libbpf_find_vmlinux_btf_id(const char *name,
> }
>
> err = __find_vmlinux_btf_id(btf, name, attach_type);
> + if (err <= 0)
> + pr_warn("%s is not found in vmlinux BTF\n", name);
> +
Please explain this move in the commit message.
> btf__free(btf);
> return err;
> }
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-11-20 23:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 23:22 [PATCH bpf-next 0/6] libbpf: add support for kernel module BTF CO-RE relocations Andrii Nakryiko
2020-11-19 23:22 ` [PATCH bpf-next 1/6] bpf: fix bpf_put_raw_tracepoint()'s use of __module_address() Andrii Nakryiko
2020-11-20 17:55 ` Martin KaFai Lau
2020-11-24 5:49 ` Alexei Starovoitov
2020-11-24 7:49 ` Andrii Nakryiko
2020-11-19 23:22 ` [PATCH bpf-next 2/6] libbpf: add internal helper to load BTF data by FD Andrii Nakryiko
2020-11-20 18:20 ` Martin KaFai Lau
2020-11-20 18:25 ` Andrii Nakryiko
2020-11-19 23:22 ` [PATCH bpf-next 3/6] libbpf: refactor CO-RE relocs to not assume a single BTF object Andrii Nakryiko
2020-11-20 22:11 ` Martin KaFai Lau
2020-11-19 23:22 ` [PATCH bpf-next 4/6] libbpf: add kernel module BTF support for CO-RE relocations Andrii Nakryiko
2020-11-20 0:46 ` Maciej Fijalkowski
2020-11-20 1:24 ` Andrii Nakryiko
2020-11-20 2:05 ` Maciej Fijalkowski
2020-11-20 3:31 ` Andrii Nakryiko
2020-11-20 23:05 ` Martin KaFai Lau [this message]
2020-11-20 23:12 ` Andrii Nakryiko
2020-11-19 23:22 ` [PATCH bpf-next 5/6] selftests/bpf: add bpf_sidecar kernel module for testing Andrii Nakryiko
2020-11-20 23:21 ` Martin KaFai Lau
2020-11-19 23:22 ` [PATCH bpf-next 6/6] selftests/bpf: add CO-RE relocs selftest relying on kernel module BTF Andrii Nakryiko
2020-11-20 23:27 ` Martin KaFai Lau
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=20201120230549.37k4zsjsrxbyjin3@kafai-mbp.dhcp.thefacebook.com \
--to=kafai@fb.com \
--cc=andrii@kernel.org \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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).