From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Andrei Matei <andreimatei1@gmail.com>
Cc: bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next 1/1] libbpf: fail early when loading programs with unspecified type
Date: Tue, 1 Dec 2020 17:52:56 -0800 [thread overview]
Message-ID: <CAEf4BzbzEfUc77qe9rZ1HXWAzjr-4BDBfWSdJaxtHUXQPnFKxg@mail.gmail.com> (raw)
In-Reply-To: <20201201044104.24948-2-andreimatei1@gmail.com>
On Mon, Nov 30, 2020 at 8:43 PM Andrei Matei <andreimatei1@gmail.com> wrote:
>
> Before this patch, a program with unspecified type
> (BPF_PROG_TYPE_UNSPEC) would be passed to the BPF syscall, only to have
> the kernel reject it with an opaque invalid argument error. This patch
> makes libbpf reject such programs with a nicer error message - in
> particular libbpf now tries to diagnose bad ELF section names at both
> open time and load time.
>
> Signed-off-by: Andrei Matei <andreimatei1@gmail.com>
> ---
This is useful, thanks. See below for a few comments, though.
> tools/lib/bpf/libbpf.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 313034117070..abca93b4f239 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -6629,6 +6629,18 @@ load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt,
> char *log_buf = NULL;
> int btf_fd, ret;
>
> + if (prog->type == BPF_PROG_TYPE_UNSPEC) {
> + if (!prog->sec_def) {
> + // We couldn't find a proper section definition at load time; that's probably why
> + // the program type is missing.
no C++-style comments, please
> + pr_warn("prog '%s': missing BPF prog type'; check ELF section name '%s'\n",
extra ' after "prog type"? also ';' -> ',' ?
> + prog->name, prog->sec_name);
> + } else {
> + pr_warn("prog '%s': missing BPF prog type\n", prog->name);
while, technically, user can manually set program type to UNSPEC even
with good section name, that's probably extreme case which we
shouldn't worry about. So I'd just always emit the section name.
> + }
> + return -EINVAL;
> + }
> +
> if (!insns || !insns_cnt)
> return -EINVAL;
>
> @@ -6920,9 +6932,11 @@ __bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz,
>
> bpf_object__for_each_program(prog, obj) {
> prog->sec_def = find_sec_def(prog->sec_name);
> - if (!prog->sec_def)
> + if (!prog->sec_def) {
> /* couldn't guess, but user might manually specify */
> + pr_debug("prog '%s': unrecognized ELF section name '%s'\n", prog->name, prog->sec_name);
> continue;
> + }
>
> if (prog->sec_def->is_sleepable)
> prog->prog_flags |= BPF_F_SLEEPABLE;
> --
> 2.27.0
>
next prev parent reply other threads:[~2020-12-02 1:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 4:41 [PATCH bpf-next 0/1] libbpf: fail early when loading programs with unspecified type Andrei Matei
2020-12-01 4:41 ` [PATCH bpf-next 1/1] " Andrei Matei
2020-12-02 1:52 ` Andrii Nakryiko [this message]
2020-12-02 1:39 ` [PATCH bpf-next 0/1] " Andrii Nakryiko
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=CAEf4BzbzEfUc77qe9rZ1HXWAzjr-4BDBfWSdJaxtHUXQPnFKxg@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andreimatei1@gmail.com \
--cc=bpf@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).