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 16/28] libbpf: Add uprobe multi link detection
Date: Wed, 9 Aug 2023 10:34:28 +0200 [thread overview]
Message-ID: <20230809083440.3209381-17-jolsa@kernel.org> (raw)
In-Reply-To: <20230809083440.3209381-1-jolsa@kernel.org>
Adding uprobe-multi link detection. It will be used later in
bpf_program__attach_usdt function to check and use uprobe_multi
link over standard uprobe links.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/lib/bpf/libbpf.c | 36 +++++++++++++++++++++++++++++++++
tools/lib/bpf/libbpf_internal.h | 2 ++
2 files changed, 38 insertions(+)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index d7b1a159d001..d1bb6eb7cde2 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -4819,6 +4819,39 @@ static int probe_perf_link(void)
return link_fd < 0 && err == -EBADF;
}
+static int probe_uprobe_multi_link(void)
+{
+ LIBBPF_OPTS(bpf_prog_load_opts, load_opts,
+ .expected_attach_type = BPF_TRACE_UPROBE_MULTI,
+ );
+ LIBBPF_OPTS(bpf_link_create_opts, link_opts);
+ struct bpf_insn insns[] = {
+ BPF_MOV64_IMM(BPF_REG_0, 0),
+ BPF_EXIT_INSN(),
+ };
+ int prog_fd, link_fd, err;
+ unsigned long offset = 0;
+
+ prog_fd = bpf_prog_load(BPF_PROG_TYPE_KPROBE, NULL, "GPL",
+ insns, ARRAY_SIZE(insns), &load_opts);
+ if (prog_fd < 0)
+ return -errno;
+
+ /* Creating uprobe in '/' binary should fail with -EBADF. */
+ link_opts.uprobe_multi.path = "/";
+ link_opts.uprobe_multi.offsets = &offset;
+ link_opts.uprobe_multi.cnt = 1;
+
+ link_fd = bpf_link_create(prog_fd, -1, BPF_TRACE_UPROBE_MULTI, &link_opts);
+ err = -errno; /* close() can clobber errno */
+
+ if (link_fd >= 0)
+ close(link_fd);
+ close(prog_fd);
+
+ return link_fd < 0 && err == -EBADF;
+}
+
static int probe_kern_bpf_cookie(void)
{
struct bpf_insn insns[] = {
@@ -4915,6 +4948,9 @@ static struct kern_feature_desc {
[FEAT_SYSCALL_WRAPPER] = {
"Kernel using syscall wrapper", probe_kern_syscall_wrapper,
},
+ [FEAT_UPROBE_MULTI_LINK] = {
+ "BPF multi-uprobe link support", probe_uprobe_multi_link,
+ },
};
bool kernel_supports(const struct bpf_object *obj, enum kern_feature_id feat_id)
diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h
index ead551318fec..f0f08635adb0 100644
--- a/tools/lib/bpf/libbpf_internal.h
+++ b/tools/lib/bpf/libbpf_internal.h
@@ -355,6 +355,8 @@ enum kern_feature_id {
FEAT_BTF_ENUM64,
/* Kernel uses syscall wrapper (CONFIG_ARCH_HAS_SYSCALL_WRAPPER) */
FEAT_SYSCALL_WRAPPER,
+ /* BPF multi-uprobe link support */
+ FEAT_UPROBE_MULTI_LINK,
__FEAT_CNT,
};
--
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 ` [PATCHv7 bpf-next 15/28] libbpf: Add support for u[ret]probe.multi[.s] program sections Jiri Olsa
2023-08-09 8:34 ` Jiri Olsa [this message]
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-17-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