From: Quentin Monnet <quentin@isovalent.com>
To: Milan Landaverde <milan@mdaverde.com>, bpf@vger.kernel.org
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
kafai@fb.com, songliubraving@fb.com, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org,
davemarchevsky@fb.com, sdf@google.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH bpf-next 1/3] bpf/bpftool: add syscall prog type
Date: Fri, 1 Apr 2022 17:04:53 +0100 [thread overview]
Message-ID: <f2f8634f-7921-dc7d-e5cb-571ea82f487d@isovalent.com> (raw)
In-Reply-To: <20220331154555.422506-2-milan@mdaverde.com>
2022-03-31 11:45 UTC-0400 ~ Milan Landaverde <milan@mdaverde.com>
> In addition to displaying the program type in bpftool prog show
> this enables us to be able to query bpf_prog_type_syscall
> availability through feature probe as well as see
> which helpers are available in those programs (such as
> bpf_sys_bpf and bpf_sys_close)
>
> Signed-off-by: Milan Landaverde <milan@mdaverde.com>
> ---
> tools/bpf/bpftool/prog.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> index bc4e05542c2b..8643b37d4e43 100644
> --- a/tools/bpf/bpftool/prog.c
> +++ b/tools/bpf/bpftool/prog.c
> @@ -68,6 +68,7 @@ const char * const prog_type_name[] = {
> [BPF_PROG_TYPE_EXT] = "ext",
> [BPF_PROG_TYPE_LSM] = "lsm",
> [BPF_PROG_TYPE_SK_LOOKUP] = "sk_lookup",
> + [BPF_PROG_TYPE_SYSCALL] = "syscall",
> };
>
> const size_t prog_type_name_size = ARRAY_SIZE(prog_type_name);
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Thanks! This one should have been caught by CI :/. Instead it complains
when you add it. This is because BPF_PROG_TYPE_SYSCALL in the UAPI
header has a comment next to it, and the regex used in
tools/testing/selftests/bpf/test_bpftool_synctypes.py to extract the
program types does not account for it. The fix should be:
------
diff --git a/tools/testing/selftests/bpf/test_bpftool_synctypes.py
b/tools/testing/selftests/bpf/test_bpftool_synctypes.py
index 6bf21e47882a..cd239cbfd80c 100755
--- a/tools/testing/selftests/bpf/test_bpftool_synctypes.py
+++ b/tools/testing/selftests/bpf/test_bpftool_synctypes.py
@@ -180,7 +180,7 @@ class FileExtractor(object):
@enum_name: name of the enum to parse
"""
start_marker = re.compile(f'enum {enum_name} {{\n')
- pattern = re.compile('^\s*(BPF_\w+),?$')
+ pattern = re.compile('^\s*(BPF_\w+),?( /\* .* \*/)?$')
end_marker = re.compile('^};')
parser = BlockParser(self.reader)
parser.search_block(start_marker)
------
I can submit this separately as a patch.
Quentin
next prev parent reply other threads:[~2022-04-01 16:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 15:45 [PATCH bpf-next 0/3] bpf/bpftool: add program & link type names Milan Landaverde
2022-03-31 15:45 ` [PATCH bpf-next 1/3] bpf/bpftool: add syscall prog type Milan Landaverde
2022-04-01 16:04 ` Quentin Monnet [this message]
2022-04-01 18:40 ` Andrii Nakryiko
2022-04-01 21:20 ` Quentin Monnet
2022-03-31 15:45 ` [PATCH bpf-next 2/3] bpf/bpftool: add missing link types Milan Landaverde
2022-04-01 16:05 ` Quentin Monnet
2022-04-04 21:55 ` Andrii Nakryiko
2022-03-31 15:45 ` [PATCH bpf-next 3/3] bpf/bpftool: handle libbpf_probe_prog_type errors Milan Landaverde
2022-04-01 16:05 ` Quentin Monnet
2022-04-01 18:42 ` Andrii Nakryiko
2022-04-01 21:33 ` Quentin Monnet
2022-04-03 23:51 ` Andrii Nakryiko
2022-04-04 22:00 ` [PATCH bpf-next 0/3] bpf/bpftool: add program & link type names patchwork-bot+netdevbpf
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=f2f8634f-7921-dc7d-e5cb-571ea82f487d@isovalent.com \
--to=quentin@isovalent.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davemarchevsky@fb.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=milan@mdaverde.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=songliubraving@fb.com \
--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
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).