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>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>, Daniel Xu <dxu@dxuuu.xyz>,
Viktor Malik <vmalik@redhat.com>
Subject: Re: [PATCH 14/19] libbpf: Add btf__find_by_pattern_kind function
Date: Tue, 8 Jun 2021 22:29:19 -0700 [thread overview]
Message-ID: <CAEf4BzaT9eiyMrpKbmmq3hOpD29b8K6DiRzB0eRKnTso93YRoA@mail.gmail.com> (raw)
In-Reply-To: <20210605111034.1810858-15-jolsa@kernel.org>
On Sat, Jun 5, 2021 at 4:14 AM Jiri Olsa <jolsa@kernel.org> wrote:
>
> Adding btf__find_by_pattern_kind function that returns
> array of BTF ids for given function name pattern.
>
> Using libc's regex.h support for that.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/lib/bpf/btf.c | 68 +++++++++++++++++++++++++++++++++++++++++++++
> tools/lib/bpf/btf.h | 3 ++
> 2 files changed, 71 insertions(+)
>
> diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
> index b46760b93bb4..421dd6c1e44a 100644
> --- a/tools/lib/bpf/btf.c
> +++ b/tools/lib/bpf/btf.c
> @@ -1,6 +1,7 @@
> // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
> /* Copyright (c) 2018 Facebook */
>
> +#define _GNU_SOURCE
> #include <byteswap.h>
> #include <endian.h>
> #include <stdio.h>
> @@ -16,6 +17,7 @@
> #include <linux/err.h>
> #include <linux/btf.h>
> #include <gelf.h>
> +#include <regex.h>
> #include "btf.h"
> #include "bpf.h"
> #include "libbpf.h"
> @@ -711,6 +713,72 @@ __s32 btf__find_by_name_kind(const struct btf *btf, const char *type_name,
> return libbpf_err(-ENOENT);
> }
>
> +static bool is_wildcard(char c)
> +{
> + static const char *wildchars = "*?[|";
> +
> + return strchr(wildchars, c);
> +}
> +
> +int btf__find_by_pattern_kind(const struct btf *btf,
> + const char *type_pattern, __u32 kind,
> + __s32 **__ids)
> +{
> + __u32 i, nr_types = btf__get_nr_types(btf);
> + __s32 *ids = NULL;
> + int cnt = 0, alloc = 0, ret;
> + regex_t regex;
> + char *pattern;
> +
> + if (kind == BTF_KIND_UNKN || !strcmp(type_pattern, "void"))
> + return 0;
> +
> + /* When the pattern does not start with wildcard, treat it as
> + * if we'd want to match it from the beginning of the string.
> + */
This assumption is absolutely atrocious. If we say it's regexp, then
it has to always be regexp, not something based on some random
heuristic based on the first character.
Taking a step back, though. Do we really need to provide this API? Why
applications can't implement it on their own, given regexp
functionality is provided by libc. Which I didn't know, actually, so
that's pretty nice, assuming that it's also available in more minimal
implementations like musl.
> + asprintf(&pattern, "%s%s",
> + is_wildcard(type_pattern[0]) ? "^" : "",
> + type_pattern);
> +
> + ret = regcomp(®ex, pattern, REG_EXTENDED);
> + if (ret) {
> + pr_warn("failed to compile regex\n");
> + free(pattern);
> + return -EINVAL;
> + }
> +
> + free(pattern);
> +
> + for (i = 1; i <= nr_types; i++) {
> + const struct btf_type *t = btf__type_by_id(btf, i);
> + const char *name;
> + __s32 *p;
> +
> + if (btf_kind(t) != kind)
> + continue;
> + name = btf__name_by_offset(btf, t->name_off);
> + if (name && regexec(®ex, name, 0, NULL, 0))
> + continue;
> + if (cnt == alloc) {
> + alloc = max(100, alloc * 3 / 2);
> + p = realloc(ids, alloc * sizeof(__u32));
this memory allocation and re-allocation on behalf of users is another
argument against this API
> + if (!p) {
> + free(ids);
> + regfree(®ex);
> + return -ENOMEM;
> + }
> + ids = p;
> + }
> +
> + ids[cnt] = i;
> + cnt++;
> + }
> +
> + regfree(®ex);
> + *__ids = ids;
> + return cnt ?: -ENOENT;
> +}
> +
> static bool btf_is_modifiable(const struct btf *btf)
> {
> return (void *)btf->hdr != btf->raw_data;
> diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h
> index b54f1c3ebd57..036857aded94 100644
> --- a/tools/lib/bpf/btf.h
> +++ b/tools/lib/bpf/btf.h
> @@ -371,6 +371,9 @@ btf_var_secinfos(const struct btf_type *t)
> return (struct btf_var_secinfo *)(t + 1);
> }
>
> +int btf__find_by_pattern_kind(const struct btf *btf,
> + const char *type_pattern, __u32 kind,
> + __s32 **__ids);
> #ifdef __cplusplus
> } /* extern "C" */
> #endif
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-06-09 5:30 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 11:10 [RFCv3 00/19] x86/ftrace/bpf: Add batch support for direct/tracing attach Jiri Olsa
2021-06-05 11:10 ` [PATCH 01/19] x86/ftrace: Remove extra orig rax move Jiri Olsa
2021-06-05 11:10 ` [PATCH 02/19] x86/ftrace: Remove fault protection code in prepare_ftrace_return Jiri Olsa
2021-06-05 11:10 ` [PATCH 03/19] x86/ftrace: Make function graph use ftrace directly Jiri Olsa
2021-06-08 18:35 ` Andrii Nakryiko
2021-06-08 18:51 ` Jiri Olsa
2021-06-08 19:11 ` Steven Rostedt
2021-06-05 11:10 ` [PATCH 04/19] tracing: Add trampoline/graph selftest Jiri Olsa
2021-06-05 11:10 ` [PATCH 05/19] ftrace: Add ftrace_add_rec_direct function Jiri Olsa
2021-06-05 11:10 ` [PATCH 06/19] ftrace: Add multi direct register/unregister interface Jiri Olsa
2021-06-05 11:10 ` [PATCH 07/19] ftrace: Add multi direct modify interface Jiri Olsa
2021-06-05 11:10 ` [PATCH 08/19] ftrace/samples: Add multi direct interface test module Jiri Olsa
2021-06-05 11:10 ` [PATCH 09/19] bpf, x64: Allow to use caller address from stack Jiri Olsa
2021-06-07 3:07 ` Yonghong Song
2021-06-07 18:13 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 10/19] bpf: Allow to store caller's ip as argument Jiri Olsa
2021-06-07 3:21 ` Yonghong Song
2021-06-07 18:15 ` Jiri Olsa
2021-06-08 18:49 ` Andrii Nakryiko
2021-06-08 20:58 ` Jiri Olsa
2021-06-08 21:02 ` Andrii Nakryiko
2021-06-08 21:11 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 11/19] bpf: Add support to load multi func tracing program Jiri Olsa
2021-06-07 3:56 ` Yonghong Song
2021-06-07 18:18 ` Jiri Olsa
2021-06-07 19:35 ` Yonghong Song
2021-06-05 11:10 ` [PATCH 12/19] bpf: Add bpf_trampoline_alloc function Jiri Olsa
2021-06-05 11:10 ` [PATCH 13/19] bpf: Add support to link multi func tracing program Jiri Olsa
2021-06-07 5:36 ` Yonghong Song
2021-06-07 18:25 ` Jiri Olsa
2021-06-07 19:39 ` Yonghong Song
2021-06-08 15:42 ` Alexei Starovoitov
2021-06-08 18:17 ` Jiri Olsa
2021-06-08 18:49 ` Alexei Starovoitov
2021-06-08 21:07 ` Jiri Olsa
2021-06-08 23:05 ` Alexei Starovoitov
2021-06-09 5:08 ` Andrii Nakryiko
2021-06-09 13:42 ` Jiri Olsa
2021-06-09 13:33 ` Jiri Olsa
2021-06-09 5:18 ` Andrii Nakryiko
2021-06-09 13:53 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 14/19] libbpf: Add btf__find_by_pattern_kind function Jiri Olsa
2021-06-09 5:29 ` Andrii Nakryiko [this message]
2021-06-09 13:59 ` Jiri Olsa
2021-06-09 14:19 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 15/19] libbpf: Add support to link multi func tracing program Jiri Olsa
2021-06-07 5:49 ` Yonghong Song
2021-06-07 18:28 ` Jiri Olsa
2021-06-07 19:42 ` Yonghong Song
2021-06-07 20:11 ` Jiri Olsa
2021-06-09 5:34 ` Andrii Nakryiko
2021-06-09 14:17 ` Jiri Olsa
2021-06-10 17:05 ` Andrii Nakryiko
2021-06-10 20:35 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 16/19] selftests/bpf: Add fentry multi func test Jiri Olsa
2021-06-07 6:06 ` Yonghong Song
2021-06-07 18:42 ` Jiri Olsa
2021-06-09 5:40 ` Andrii Nakryiko
2021-06-09 14:29 ` Jiri Olsa
2021-06-10 17:00 ` Andrii Nakryiko
2021-06-10 20:28 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 17/19] selftests/bpf: Add fexit " Jiri Olsa
2021-06-05 11:10 ` [PATCH 18/19] selftests/bpf: Add fentry/fexit " Jiri Olsa
2021-06-09 5:41 ` Andrii Nakryiko
2021-06-09 14:29 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 19/19] selftests/bpf: Temporary fix for fentry_fexit_multi_test Jiri Olsa
2021-06-17 20:29 ` [RFCv3 00/19] x86/ftrace/bpf: Add batch support for direct/tracing attach Andrii Nakryiko
2021-06-19 8:33 ` Jiri Olsa
2021-06-19 16:19 ` Yonghong Song
2021-06-19 17:09 ` Jiri Olsa
2021-06-20 16:56 ` Yonghong Song
2021-06-20 17:47 ` Alexei Starovoitov
2021-06-21 6:46 ` Andrii Nakryiko
2021-06-21 6:50 ` Andrii Nakryiko
2021-07-06 20:26 ` Andrii Nakryiko
2021-07-07 15:19 ` 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=CAEf4BzaT9eiyMrpKbmmq3hOpD29b8K6DiRzB0eRKnTso93YRoA@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dxu@dxuuu.xyz \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=songliubraving@fb.com \
--cc=vmalik@redhat.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).