From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Rafael David Tinoco <rafaeldtinoco@gmail.com>
Cc: bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next v5] libbpf: introduce legacy kprobe events support
Date: Mon, 13 Sep 2021 21:44:01 -0700 [thread overview]
Message-ID: <CAEf4BzYpyuw4Bw5+Avx_qmNyrRqgXKRH+MJQ91CPLv9ftBhLhg@mail.gmail.com> (raw)
In-Reply-To: <20210912064844.3181742-1-rafaeldtinoco@gmail.com>
On Sat, Sep 11, 2021 at 11:48 PM Rafael David Tinoco
<rafaeldtinoco@gmail.com> wrote:
>
> Allow kprobe tracepoint events creation through legacy interface, as the
> kprobe dynamic PMUs support, used by default, was only created in v4.17.
>
> After commit "bpf: implement minimal BPF perf link", it was allowed that
> some extra - to the link - information is accessed through container_of
> struct bpf_link. This allows the tracing perf event legacy name, and
> information whether it is a retprobe, to be saved outside bpf_link
> structure, which would not be optimal.
>
> This enables CO-RE support for older kernels.
>
> Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
> Signed-off-by: Rafael David Tinoco <rafaeldtinoco@gmail.com>
> ---
I've adjusted the commit message a bit (this has nothing to do with
CO-RE per se, so I dropped that, for example). Also see my comments
below, I've applied all that to your patch while applying, please
check them out.
> tools/lib/bpf/libbpf.c | 141 +++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 135 insertions(+), 6 deletions(-)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 88d8825fc6f6..780a45e54572 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -8987,9 +8987,57 @@ int bpf_link__unpin(struct bpf_link *link)
> return 0;
> }
>
> +static int poke_kprobe_events(bool add, const char *name, bool retprobe, uint64_t offset)
> +{
> + int fd, ret = 0;
> + pid_t p = getpid();
> + char cmd[192] = {}, probename[128] = {}, probefunc[128] = {};
cmd and probename don't need initialization, and for probefunc it's
cheaper to just do probefunc[0] = '\0' separately to avoid zeroing out
all 128 characters
> + const char *file = "/sys/kernel/debug/tracing/kprobe_events";
> +
> + if (retprobe)
> + snprintf(probename, sizeof(probename), "kretprobes/%s_libbpf_%u", name, p);
> + else
> + snprintf(probename, sizeof(probename), "kprobes/%s_libbpf_%u", name, p);
> +
> + if (offset)
> + snprintf(probefunc, sizeof(probefunc), "%s+%lu", name, offset);
(size_t)offset and %zu is necessary to avoid compilation warnings on
some architectures (e.g., mips, I think)
> +
> + if (add) {
> + snprintf(cmd, sizeof(cmd), "%c:%s %s",
> + retprobe ? 'r' : 'p',
> + probename,
> + offset ? probefunc : name);
> + } else {
> + snprintf(cmd, sizeof(cmd), "-:%s", probename);
> + }
> +
> + fd = open(file, O_WRONLY | O_APPEND, 0);
> + if (!fd)
> + return -errno;
> + ret = write(fd, cmd, strlen(cmd));
> + if (ret < 0)
> + ret = -errno;
> + close(fd);
> +
> + return ret;
> +}
> +
> +static inline int add_kprobe_event_legacy(const char *name, bool retprobe, uint64_t offset)
> +{
> + return poke_kprobe_events(true, name, retprobe, offset);
> +}
> +
> +static inline int remove_kprobe_event_legacy(const char *name, bool retprobe)
> +{
> + return poke_kprobe_events(false, name, retprobe, 0);
> +}
> +
> struct bpf_link_perf {
> struct bpf_link link;
> int perf_event_fd;
> + /* legacy kprobe support: keep track of probe identifier and type */
> + char *legacy_probe_name;
> + bool legacy_is_retprobe;
> };
>
> static int bpf_link_perf_detach(struct bpf_link *link)
> @@ -8997,20 +9045,26 @@ static int bpf_link_perf_detach(struct bpf_link *link)
> struct bpf_link_perf *perf_link = container_of(link, struct bpf_link_perf, link);
> int err = 0;
>
> - if (ioctl(perf_link->perf_event_fd, PERF_EVENT_IOC_DISABLE, 0) < 0)
> - err = -errno;
> + ioctl(perf_link->perf_event_fd, PERF_EVENT_IOC_DISABLE, 0);
what's the reason for dropping the error check? I kept it, but please
let me know if there is any reason to drop it
>
> if (perf_link->perf_event_fd != link->fd)
> close(perf_link->perf_event_fd);
> close(link->fd);
>
> - return libbpf_err(err);
> + /* legacy kprobe needs to be removed after perf event fd closure */
> + if (perf_link->legacy_probe_name) {
> + err = remove_kprobe_event_legacy(perf_link->legacy_probe_name,
> + perf_link->legacy_is_retprobe);
> + }
> +
> + return err;
> }
>
> static void bpf_link_perf_dealloc(struct bpf_link *link)
> {
> struct bpf_link_perf *perf_link = container_of(link, struct bpf_link_perf, link);
>
> + free(perf_link->legacy_probe_name);
> free(perf_link);
> }
>
> @@ -9124,6 +9178,25 @@ static int parse_uint_from_file(const char *file, const char *fmt)
> return ret;
> }
>
> +static bool determine_kprobe_legacy(void)
> +{
> + const char *file = "/sys/bus/event_source/devices/kprobe/type";
> +
> + return access(file, 0) == 0 ? false : true;
this is almost the same as what determine_kprobe_perf_type() does, so
we can just reuse it
> +}
> +
> +static int determine_kprobe_perf_type_legacy(const char *func_name, bool is_retprobe)
> +{
> + char file[192];
> + const char *fname = "/sys/kernel/debug/tracing/events/%s/%s_libbpf_%d/id";
> +
> + snprintf(file, sizeof(file), fname,
> + is_retprobe ? "kretprobes" : "kprobes",
> + func_name, getpid());
> +
> + return parse_uint_from_file(file, "%d\n");
> +}
> +
> static int determine_kprobe_perf_type(void)
> {
> const char *file = "/sys/bus/event_source/devices/kprobe/type";
> @@ -9206,6 +9279,41 @@ static int perf_event_open_probe(bool uprobe, bool retprobe, const char *name,
> return pfd;
> }
>
> +static int perf_event_kprobe_open_legacy(bool retprobe, const char *name, uint64_t offset, int pid)
> +{
> + struct perf_event_attr attr = {};
> + char errmsg[STRERR_BUFSIZE];
> + int type, pfd, err;
> +
> + err = add_kprobe_event_legacy(name, retprobe, offset);
> + if (err < 0) {
> + pr_warn("failed to add legacy kprobe event: %s\n",
> + libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
> + return err;
> + }
> + type = determine_kprobe_perf_type_legacy(name, retprobe);
> + if (type < 0) {
> + pr_warn("failed to determine legacy kprobe event id: %s\n",
> + libbpf_strerror_r(type, errmsg, sizeof(errmsg)));
> + return type;
> + }
> + attr.size = sizeof(attr);
> + attr.config = type;
> + attr.type = PERF_TYPE_TRACEPOINT;
> +
> + pfd = syscall(__NR_perf_event_open, &attr,
> + pid < 0 ? -1 : pid, /* pid */
> + pid == -1 ? 0 : -1, /* cpu */
> + -1 /* group_fd */, PERF_FLAG_FD_CLOEXEC);
> + if (pfd < 0) {
> + err = -errno;
> + pr_warn("legacy kprobe perf_event_open() failed: %s\n",
> + libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
> + return err;
> + }
> + return pfd;
> +}
> +
> struct bpf_link *
> bpf_program__attach_kprobe_opts(struct bpf_program *prog,
> const char *func_name,
> @@ -9215,8 +9323,9 @@ bpf_program__attach_kprobe_opts(struct bpf_program *prog,
> char errmsg[STRERR_BUFSIZE];
> struct bpf_link *link;
> unsigned long offset;
> - bool retprobe;
> + bool retprobe, legacy;
> int pfd, err;
> + char *legacy_probe = NULL;
>
> if (!OPTS_VALID(opts, bpf_kprobe_opts))
> return libbpf_err_ptr(-EINVAL);
> @@ -9225,8 +9334,21 @@ bpf_program__attach_kprobe_opts(struct bpf_program *prog,
> offset = OPTS_GET(opts, offset, 0);
> pe_opts.bpf_cookie = OPTS_GET(opts, bpf_cookie, 0);
>
> - pfd = perf_event_open_probe(false /* uprobe */, retprobe, func_name,
> - offset, -1 /* pid */, 0 /* ref_ctr_off */);
> + legacy = determine_kprobe_legacy();
> + if (!legacy) {
> + pfd = perf_event_open_probe(false /* uprobe */,
> + retprobe, func_name,
> + offset, -1 /* pid */,
> + 0 /* ref_ctr_off */);
> + } else {
> + legacy_probe = strdup(func_name);
> + err = libbpf_get_error(legacy_probe);
> + if (err)
> + return libbpf_err_ptr(err);
let's not use libbpf_get_error() to check libc errors. Should be just
if (!legacy_probe)
> + pfd = perf_event_kprobe_open_legacy(retprobe, func_name,
> + 0 /* offset */,
gotta use the actual offset
> + -1 /* pid */);
> + }
> if (pfd < 0) {
> pr_warn("prog '%s': failed to create %s '%s' perf event: %s\n",
> prog->name, retprobe ? "kretprobe" : "kprobe", func_name,
> @@ -9242,6 +9364,13 @@ bpf_program__attach_kprobe_opts(struct bpf_program *prog,
> libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
> return libbpf_err_ptr(err);
> }
> + if (legacy) {
> + struct bpf_link_perf *perf_link = container_of(link, struct bpf_link_perf, link);
> +
> + perf_link->legacy_probe_name = legacy_probe;
> + perf_link->legacy_is_retprobe = retprobe;
> + }
> +
> return link;
> }
>
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-09-14 4:44 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 5:33 [PATCH v3 bpf-next 00/14] BPF perf link and user-provided bpf_cookie Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 01/14] bpf: refactor BPF_PROG_RUN into a function Andrii Nakryiko
2021-07-30 17:19 ` Yonghong Song
2021-08-09 22:43 ` Daniel Borkmann
2021-08-10 0:28 ` Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 02/14] bpf: refactor BPF_PROG_RUN_ARRAY family of macros into functions Andrii Nakryiko
2021-08-09 23:00 ` Daniel Borkmann
2021-08-10 0:36 ` Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 03/14] bpf: refactor perf_event_set_bpf_prog() to use struct bpf_prog input Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 04/14] bpf: implement minimal BPF perf link Andrii Nakryiko
2021-07-30 17:24 ` Yonghong Song
2021-07-30 5:34 ` [PATCH v3 bpf-next 05/14] bpf: allow to specify user-provided bpf_cookie for BPF perf links Andrii Nakryiko
2021-07-30 22:02 ` Yonghong Song
2021-08-09 23:30 ` Daniel Borkmann
2021-08-10 0:52 ` Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 06/14] bpf: add bpf_get_attach_cookie() BPF helper to access bpf_cookie value Andrii Nakryiko
2021-07-30 22:13 ` Yonghong Song
2021-07-30 5:34 ` [PATCH v3 bpf-next 07/14] libbpf: re-build libbpf.so when libbpf.map changes Andrii Nakryiko
2021-07-30 22:31 ` Yonghong Song
2021-07-30 5:34 ` [PATCH v3 bpf-next 08/14] libbpf: remove unused bpf_link's destroy operation, but add dealloc Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 09/14] libbpf: use BPF perf link when supported by kernel Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 10/14] libbpf: add bpf_cookie support to bpf_link_create() API Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 11/14] libbpf: add bpf_cookie to perf_event, kprobe, uprobe, and tp attach APIs Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 12/14] selftests/bpf: test low-level perf BPF link API Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 13/14] selftests/bpf: extract uprobe-related helpers into trace_helpers.{c,h} Andrii Nakryiko
2021-07-30 5:34 ` [PATCH v3 bpf-next 14/14] selftests/bpf: add bpf_cookie selftests for high-level APIs Andrii Nakryiko
2021-08-01 5:11 ` [PATCH bpf-next v4] libbpf: introduce legacy kprobe events support Rafael David Tinoco
2021-08-06 22:29 ` Andrii Nakryiko
2021-09-12 6:48 ` [PATCH bpf-next v5] " Rafael David Tinoco
2021-09-12 6:52 ` Rafael David Tinoco
2021-09-14 4:44 ` Andrii Nakryiko [this message]
2021-09-14 5:02 ` Rafael David Tinoco
2021-09-14 5:21 ` Andrii Nakryiko
2021-09-14 14:27 ` sunyucong
2021-09-14 15:42 ` Rafael David Tinoco
2021-09-14 20:34 ` [PATCH bpf-next] libbpf: fix build error introduced by legacy kprobe feature Rafael David Tinoco
2021-09-14 21:04 ` Alexei Starovoitov
2021-09-14 21:35 ` [PATCH bpf-next v2] " Rafael David Tinoco
2021-09-14 21:39 ` Rafael David Tinoco
2021-09-14 21:48 ` 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=CAEf4BzYpyuw4Bw5+Avx_qmNyrRqgXKRH+MJQ91CPLv9ftBhLhg@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=rafaeldtinoco@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.