From: Rafael David Tinoco <rafaeldtinoco@gmail.com>
To: bpf@vger.kernel.org
Cc: rafaeldtinoco@gmail.com, andrii.nakryiko@gmail.com
Subject: [PATCH bpf-next v3] libbpf: introduce legacy kprobe events support
Date: Fri, 25 Jun 2021 01:44:59 -0300 [thread overview]
Message-ID: <20210625044459.1249282-1-rafaeldtinoco@gmail.com> (raw)
In-Reply-To: <CAEf4BzYQcD8vrTkXSgwBVGhRKvSWM6KyNc07QthK+=60+vUf8w@mail.gmail.com>
Allow kprobe tracepoint events creation through legacy interface, as the
kprobe dynamic PMUs support, used by default, was only created in v4.17.
This enables CO.RE support for older kernels.
Signed-off-by: Rafael David Tinoco <rafaeldtinoco@gmail.com>
---
tools/lib/bpf/libbpf.c | 125 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 123 insertions(+), 2 deletions(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 1e04ce724240..72a22c4d8295 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -10007,6 +10007,10 @@ struct bpf_link {
char *pin_path; /* NULL, if not pinned */
int fd; /* hook FD, -1 if not applicable */
bool disconnected;
+ struct {
+ char *name;
+ bool retprobe;
+ } legacy;
};
/* Replace link's underlying BPF program with the new one */
@@ -10143,6 +10147,47 @@ int bpf_link__unpin(struct bpf_link *link)
return 0;
}
+static int poke_kprobe_events(bool add, const char *name, bool retprobe)
+{
+ int fd, ret = 0;
+ char probename[32], cmd[160];
+ const char *file = "/sys/kernel/debug/tracing/kprobe_events";
+
+ memset(probename, 0, sizeof(probename));
+
+ if (retprobe)
+ ret = snprintf(probename, sizeof(probename), "kprobes/%s_ret", name);
+ else
+ ret = snprintf(probename, sizeof(probename), "kprobes/%s", name);
+
+ if (ret <= strlen("kprobes/"))
+ return -EINVAL;
+
+ if (add)
+ snprintf(cmd, sizeof(cmd),"%c:%s %s", retprobe ? 'r' : 'p', probename, name);
+ else
+ snprintf(cmd, sizeof(cmd), "-:%s", probename);
+
+ if (!(fd = open(file, O_WRONLY|O_APPEND, 0)))
+ return -errno;
+ if ((ret = write(fd, cmd, strlen(cmd))) < 0)
+ ret = -errno;
+
+ close(fd);
+
+ return ret;
+}
+
+static inline int add_kprobe_event_legacy(const char* name, bool retprobe)
+{
+ return poke_kprobe_events(true, name, retprobe);
+}
+
+static inline int remove_kprobe_event_legacy(const char* name, bool retprobe)
+{
+ return poke_kprobe_events(false, name, retprobe);
+}
+
static int bpf_link__detach_perf_event(struct bpf_link *link)
{
int err;
@@ -10152,6 +10197,12 @@ static int bpf_link__detach_perf_event(struct bpf_link *link)
err = -errno;
close(link->fd);
+
+ if (link->legacy.name) {
+ remove_kprobe_event_legacy(link->legacy.name, link->legacy.retprobe);
+ free(link->legacy.name);
+ }
+
return libbpf_err(err);
}
@@ -10229,6 +10280,23 @@ 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;
+}
+
+static int determine_kprobe_perf_type_legacy(const char *func_name)
+{
+ char file[96];
+ const char *fname = "/sys/kernel/debug/tracing/events/kprobes/%s/id";
+
+ snprintf(file, sizeof(file), fname, func_name);
+
+ 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";
@@ -10304,6 +10372,43 @@ static int perf_event_open_probe(bool uprobe, bool retprobe, const char *name,
return pfd;
}
+static int perf_event_open_probe_legacy(bool uprobe, bool retprobe, const char *name,
+ uint64_t offset, int pid)
+{
+ struct perf_event_attr attr = {};
+ char errmsg[STRERR_BUFSIZE];
+ int type, pfd, err;
+
+ if (uprobe) // unsupported
+ return -EINVAL;
+
+ if ((err = add_kprobe_event_legacy(name, retprobe)) < 0) {
+ pr_warn("failed to add legacy kprobe event: %s\n",
+ libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
+ return err;
+ }
+ if ((type = determine_kprobe_perf_type_legacy(name)) < 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(struct bpf_program *prog,
bool retprobe,
const char *func_name)
@@ -10311,9 +10416,18 @@ struct bpf_link *bpf_program__attach_kprobe(struct bpf_program *prog,
char errmsg[STRERR_BUFSIZE];
struct bpf_link *link;
int pfd, err;
+ bool legacy = false;
- pfd = perf_event_open_probe(false /* uprobe */, retprobe, func_name,
- 0 /* offset */, -1 /* pid */);
+ if (!(legacy = determine_kprobe_legacy()))
+ pfd = perf_event_open_probe(false /* uprobe */,
+ retprobe, func_name,
+ 0 /* offset */,
+ -1 /* pid */);
+ else
+ pfd = perf_event_open_probe_legacy(false /* uprobe */,
+ retprobe, func_name,
+ 0 /* 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,
@@ -10329,6 +10443,13 @@ struct bpf_link *bpf_program__attach_kprobe(struct bpf_program *prog,
libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
return libbpf_err_ptr(err);
}
+
+ if (legacy) {
+ /* needed history for the legacy probe cleanup */
+ link->legacy.name = strdup(func_name);
+ link->legacy.retprobe = retprobe;
+ }
+
return link;
}
--
2.27.0
next prev parent reply other threads:[~2021-06-25 4:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 6:25 [RFC][PATCH] libbpf: support kprobe/kretprobe events in legacy environments Rafael David Tinoco
2021-03-18 19:31 ` [PATCH] libbpf: allow bpf object kern_version to be overridden Rafael David Tinoco
2021-03-18 19:46 ` Andrii Nakryiko
2021-03-18 20:56 ` Daniel Borkmann
2021-03-19 4:38 ` Rafael David Tinoco
2021-03-19 4:51 ` [RFC][PATCH] libbpf: support kprobe/kretprobe events in legacy environments Andrii Nakryiko
2021-03-22 18:04 ` [PATCH v2 bpf-next][RFC] libbpf: introduce legacy kprobe events support Rafael David Tinoco
2021-03-22 18:25 ` Rafael David Tinoco
2021-03-26 20:50 ` Andrii Nakryiko
2021-04-07 4:49 ` Rafael David Tinoco
2021-04-07 22:33 ` Andrii Nakryiko
2021-04-08 23:59 ` John Fastabend
2021-04-14 14:30 ` Rafael David Tinoco
2021-04-14 20:06 ` Rafael David Tinoco
2021-04-14 23:23 ` Andrii Nakryiko
2021-04-15 5:53 ` Rafael David Tinoco
2021-04-15 22:48 ` Andrii Nakryiko
2021-06-25 4:44 ` Rafael David Tinoco [this message]
2021-06-25 5:01 ` [PATCH bpf-next v3] " Rafael David Tinoco
2021-07-07 13:38 ` Rafael David Tinoco
2021-07-07 21:52 ` Andrii Nakryiko
2021-07-19 1:59 ` Rafael David Tinoco
2021-07-20 0:10 ` Andrii Nakryiko
2021-07-20 4:16 ` Rafael David Tinoco
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=20210625044459.1249282-1-rafaeldtinoco@gmail.com \
--to=rafaeldtinoco@gmail.com \
--cc=andrii.nakryiko@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).