From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Cc: 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>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCHv7 bpf-next 15/28] libbpf: Add support for u[ret]probe.multi[.s] program sections
Date: Wed, 9 Aug 2023 10:34:27 +0200 [thread overview]
Message-ID: <20230809083440.3209381-16-jolsa@kernel.org> (raw)
In-Reply-To: <20230809083440.3209381-1-jolsa@kernel.org>
Adding support for several uprobe_multi program sections
to allow auto attach of multi_uprobe programs.
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/lib/bpf/libbpf.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index eb16d6f307e0..d7b1a159d001 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -8683,6 +8683,7 @@ static int attach_tp(const struct bpf_program *prog, long cookie, struct bpf_lin
static int attach_raw_tp(const struct bpf_program *prog, long cookie, struct bpf_link **link);
static int attach_trace(const struct bpf_program *prog, long cookie, struct bpf_link **link);
static int attach_kprobe_multi(const struct bpf_program *prog, long cookie, struct bpf_link **link);
+static int attach_uprobe_multi(const struct bpf_program *prog, long cookie, struct bpf_link **link);
static int attach_lsm(const struct bpf_program *prog, long cookie, struct bpf_link **link);
static int attach_iter(const struct bpf_program *prog, long cookie, struct bpf_link **link);
@@ -8698,6 +8699,10 @@ static const struct bpf_sec_def section_defs[] = {
SEC_DEF("uretprobe.s+", KPROBE, 0, SEC_SLEEPABLE, attach_uprobe),
SEC_DEF("kprobe.multi+", KPROBE, BPF_TRACE_KPROBE_MULTI, SEC_NONE, attach_kprobe_multi),
SEC_DEF("kretprobe.multi+", KPROBE, BPF_TRACE_KPROBE_MULTI, SEC_NONE, attach_kprobe_multi),
+ SEC_DEF("uprobe.multi+", KPROBE, BPF_TRACE_UPROBE_MULTI, SEC_NONE, attach_uprobe_multi),
+ SEC_DEF("uretprobe.multi+", KPROBE, BPF_TRACE_UPROBE_MULTI, SEC_NONE, attach_uprobe_multi),
+ SEC_DEF("uprobe.multi.s+", KPROBE, BPF_TRACE_UPROBE_MULTI, SEC_SLEEPABLE, attach_uprobe_multi),
+ SEC_DEF("uretprobe.multi.s+", KPROBE, BPF_TRACE_UPROBE_MULTI, SEC_SLEEPABLE, attach_uprobe_multi),
SEC_DEF("ksyscall+", KPROBE, 0, SEC_NONE, attach_ksyscall),
SEC_DEF("kretsyscall+", KPROBE, 0, SEC_NONE, attach_ksyscall),
SEC_DEF("usdt+", KPROBE, 0, SEC_NONE, attach_usdt),
@@ -10904,6 +10909,37 @@ static int attach_kprobe_multi(const struct bpf_program *prog, long cookie, stru
return libbpf_get_error(*link);
}
+static int attach_uprobe_multi(const struct bpf_program *prog, long cookie, struct bpf_link **link)
+{
+ char *probe_type = NULL, *binary_path = NULL, *func_name = NULL;
+ LIBBPF_OPTS(bpf_uprobe_multi_opts, opts);
+ int n, ret = -EINVAL;
+
+ *link = NULL;
+
+ n = sscanf(prog->sec_name, "%m[^/]/%m[^:]:%ms",
+ &probe_type, &binary_path, &func_name);
+ switch (n) {
+ case 1:
+ /* handle SEC("u[ret]probe") - format is valid, but auto-attach is impossible. */
+ ret = 0;
+ break;
+ case 3:
+ opts.retprobe = strcmp(probe_type, "uretprobe.multi") == 0;
+ *link = bpf_program__attach_uprobe_multi(prog, -1, binary_path, func_name, &opts);
+ ret = libbpf_get_error(*link);
+ break;
+ default:
+ pr_warn("prog '%s': invalid format of section definition '%s'\n", prog->name,
+ prog->sec_name);
+ break;
+ }
+ free(probe_type);
+ free(binary_path);
+ free(func_name);
+ return ret;
+}
+
static void gen_uprobe_legacy_event_name(char *buf, size_t buf_sz,
const char *binary_path, uint64_t offset)
{
--
2.41.0
next prev parent reply other threads:[~2023-08-09 8:37 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 8:34 [PATCHv7 bpf-next 00/28] bpf: Add multi uprobe link Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 01/28] bpf: Switch BPF_F_KPROBE_MULTI_RETURN macro to enum Jiri Olsa
2023-08-09 16:06 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 02/28] bpf: Add attach_type checks under bpf_prog_attach_check_attach_type Jiri Olsa
2023-08-09 16:11 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 03/28] bpf: Add multi uprobe link Jiri Olsa
2023-08-09 16:29 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 04/28] bpf: Add cookies support for uprobe_multi link Jiri Olsa
2023-08-09 16:39 ` Yonghong Song
2023-08-11 13:19 ` Jiri Olsa
2023-08-11 16:45 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 05/28] bpf: Add pid filter " Jiri Olsa
2023-08-09 16:45 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 06/28] bpf: Add bpf_get_func_ip helper support for uprobe link Jiri Olsa
2023-08-09 16:48 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 07/28] libbpf: Add uprobe_multi attach type and link names Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 08/28] libbpf: Move elf_find_func_offset* functions to elf object Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 09/28] libbpf: Add elf_open/elf_close functions Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 10/28] libbpf: Add elf symbol iterator Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 11/28] libbpf: Add elf_resolve_syms_offsets function Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 12/28] libbpf: Add elf_resolve_pattern_offsets function Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 13/28] libbpf: Add bpf_link_create support for multi uprobes Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 14/28] libbpf: Add bpf_program__attach_uprobe_multi function Jiri Olsa
2023-08-09 8:34 ` Jiri Olsa [this message]
2023-08-09 8:34 ` [PATCHv7 bpf-next 16/28] libbpf: Add uprobe multi link detection Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 17/28] libbpf: Add uprobe multi link support to bpf_program__attach_usdt Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 18/28] selftests/bpf: Move get_time_ns to testing_helpers.h Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 19/28] selftests/bpf: Add uprobe_multi skel test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 20/28] selftests/bpf: Add uprobe_multi api test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 21/28] selftests/bpf: Add uprobe_multi link test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 22/28] selftests/bpf: Add uprobe_multi test program Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 23/28] selftests/bpf: Add uprobe_multi bench test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 24/28] selftests/bpf: Add uprobe_multi usdt test code Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 25/28] selftests/bpf: Add uprobe_multi usdt bench test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 26/28] selftests/bpf: Add uprobe_multi cookie test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 27/28] selftests/bpf: Add uprobe_multi pid filter tests Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 28/28] selftests/bpf: Add extra link to uprobe_multi tests Jiri Olsa
2023-08-21 23:00 ` [PATCHv7 bpf-next 00/28] bpf: Add multi uprobe link 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=20230809083440.3209381-16-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=laoar.shao@gmail.com \
--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