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>
Subject: [PATCHv3 bpf-next 26/26] selftests/bpf: Add extra link to uprobe_multi tests
Date: Fri, 30 Jun 2023 10:33:44 +0200 [thread overview]
Message-ID: <20230630083344.984305-27-jolsa@kernel.org> (raw)
In-Reply-To: <20230630083344.984305-1-jolsa@kernel.org>
Attaching extra program to same functions system wide for api
and link tests.
This way we can test the pid filter works properly when there's
extra system wide consumer on the same uprobe that will trigger
the original uprobe handler.
We expect to have the same counts as before.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
.../bpf/prog_tests/uprobe_multi_test.c | 19 +++++++++++++++++++
.../selftests/bpf/progs/uprobe_multi.c | 6 ++++++
2 files changed, 25 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
index 8ca7a45e21e6..39bd16786cd0 100644
--- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
+++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
@@ -153,6 +153,7 @@ __test_attach_api(const char *binary, const char *pattern, struct bpf_uprobe_mul
struct bpf_link *link1 = NULL, *link2 = NULL;
struct bpf_link *link3 = NULL, *link4 = NULL;
pid_t pid = child ? child->pid : -1;
+ struct bpf_link *link_extra = NULL;
struct uprobe_multi *skel = NULL;
skel = uprobe_multi__open_and_load();
@@ -183,9 +184,16 @@ __test_attach_api(const char *binary, const char *pattern, struct bpf_uprobe_mul
if (!ASSERT_OK_PTR(link2, "bpf_program__attach_uprobe_multi_retprobe"))
goto cleanup;
+ opts->retprobe = false;
+ link_extra = bpf_program__attach_uprobe_multi(skel->progs.test_uprobe_extra, -1,
+ binary, pattern, opts);
+ if (!ASSERT_OK_PTR(link_extra, "bpf_program__attach_uprobe_multi"))
+ goto cleanup;
+
uprobe_multi_test_run(skel, child);
cleanup:
+ bpf_link__destroy(link_extra);
bpf_link__destroy(link4);
bpf_link__destroy(link3);
bpf_link__destroy(link2);
@@ -243,6 +251,7 @@ static void __test_link_api(struct child *child)
"uprobe_multi_func_2",
"uprobe_multi_func_3",
};
+ int link_extra_fd = -1;
int err;
err = elf_resolve_syms_offsets(path, 3, syms, (unsigned long **) &offsets);
@@ -281,6 +290,14 @@ static void __test_link_api(struct child *child)
link4_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_UPROBE_MULTI, &opts);
if (!ASSERT_GE(link2_fd, 0, "link4_fd"))
goto cleanup;
+
+ opts.kprobe_multi.flags = 0;
+ opts.uprobe_multi.pid = 0;
+ prog_fd = bpf_program__fd(skel->progs.test_uprobe_extra);
+ link_extra_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_UPROBE_MULTI, &opts);
+ if (!ASSERT_GE(link_extra_fd, 0, "link_extra_fd"))
+ goto cleanup;
+
uprobe_multi_test_run(skel, child);
cleanup:
@@ -292,6 +309,8 @@ static void __test_link_api(struct child *child)
close(link3_fd);
if (link4_fd >= 0)
close(link4_fd);
+ if (link_extra_fd >= 0)
+ close(link_extra_fd);
uprobe_multi__destroy(skel);
free(offsets);
diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi.c b/tools/testing/selftests/bpf/progs/uprobe_multi.c
index 1086312b5d1e..8ee957670303 100644
--- a/tools/testing/selftests/bpf/progs/uprobe_multi.c
+++ b/tools/testing/selftests/bpf/progs/uprobe_multi.c
@@ -102,3 +102,9 @@ int test_uprobe_bench(struct pt_regs *ctx)
count++;
return 0;
}
+
+SEC("uprobe.multi//proc/self/exe:uprobe_multi_func_*")
+int test_uprobe_extra(struct pt_regs *ctx)
+{
+ return 0;
+}
--
2.41.0
next prev parent reply other threads:[~2023-06-30 8:38 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 8:33 [PATCHv3 bpf-next 00/26] bpf: Add multi uprobe link Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 01/26] bpf: Add attach_type checks under bpf_prog_attach_check_attach_type Jiri Olsa
2023-07-06 22:34 ` Andrii Nakryiko
2023-06-30 8:33 ` [PATCHv3 bpf-next 02/26] bpf: Add multi uprobe link Jiri Olsa
2023-07-06 22:34 ` Andrii Nakryiko
2023-07-11 9:00 ` Jiri Olsa
2023-07-07 4:22 ` Andrii Nakryiko
2023-07-11 9:01 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 03/26] bpf: Add cookies support for uprobe_multi link Jiri Olsa
2023-07-01 3:40 ` Yafang Shao
2023-07-01 8:54 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 04/26] bpf: Add pid filter " Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 05/26] bpf: Add bpf_get_func_ip helper support for uprobe link Jiri Olsa
2023-07-06 22:29 ` Andrii Nakryiko
2023-07-10 7:24 ` Jiri Olsa
2023-07-10 17:55 ` Andrii Nakryiko
2023-07-11 8:28 ` Jiri Olsa
2023-07-11 16:57 ` Andrii Nakryiko
2023-06-30 8:33 ` [PATCHv3 bpf-next 06/26] libbpf: Add uprobe_multi attach type and link names Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 07/26] libbpf: Move elf_find_func_offset* functions to elf object Jiri Olsa
2023-07-06 23:02 ` Andrii Nakryiko
2023-07-11 9:05 ` Jiri Olsa
2023-07-11 17:01 ` Andrii Nakryiko
2023-07-06 23:03 ` Andrii Nakryiko
2023-07-11 9:05 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 08/26] libbpf: Add elf_open/elf_close functions Jiri Olsa
2023-07-06 23:09 ` Andrii Nakryiko
2023-07-11 9:01 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 09/26] libbpf: Add elf symbol iterator Jiri Olsa
2023-07-06 23:24 ` Andrii Nakryiko
2023-07-11 9:03 ` Jiri Olsa
2023-07-11 16:59 ` Andrii Nakryiko
2023-06-30 8:33 ` [PATCHv3 bpf-next 10/26] libbpf: Add elf_resolve_syms_offsets function Jiri Olsa
2023-07-07 3:48 ` Andrii Nakryiko
2023-07-11 9:04 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 11/26] libbpf: Add elf_resolve_pattern_offsets function Jiri Olsa
2023-07-07 3:52 ` Andrii Nakryiko
2023-07-11 9:04 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 12/26] libbpf: Add bpf_link_create support for multi uprobes Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 13/26] libbpf: Add bpf_program__attach_uprobe_multi function Jiri Olsa
2023-07-07 4:05 ` Andrii Nakryiko
2023-07-11 9:05 ` Jiri Olsa
2023-07-11 17:02 ` Andrii Nakryiko
2023-06-30 8:33 ` [PATCHv3 bpf-next 14/26] libbpf: Add support for u[ret]probe.multi[.s] program sections Jiri Olsa
2023-07-07 4:07 ` Andrii Nakryiko
2023-06-30 8:33 ` [PATCHv3 bpf-next 15/26] libbpf: Add uprobe multi link detection Jiri Olsa
2023-07-07 4:20 ` Andrii Nakryiko
2023-07-11 9:03 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 16/26] libbpf: Add uprobe multi link support to bpf_program__attach_usdt Jiri Olsa
2023-07-07 4:29 ` Andrii Nakryiko
2023-07-11 9:04 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 17/26] selftests/bpf: Add uprobe_multi skel test Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 18/26] selftests/bpf: Add uprobe_multi api test Jiri Olsa
2023-07-07 4:32 ` Andrii Nakryiko
2023-07-11 9:06 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 19/26] selftests/bpf: Add uprobe_multi link test Jiri Olsa
2023-07-07 4:33 ` Andrii Nakryiko
2023-07-11 9:06 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 20/26] selftests/bpf: Add uprobe_multi test program Jiri Olsa
2023-07-07 4:35 ` Andrii Nakryiko
2023-06-30 8:33 ` [PATCHv3 bpf-next 21/26] selftests/bpf: Add uprobe_multi bench test Jiri Olsa
2023-07-07 4:38 ` Andrii Nakryiko
2023-07-11 9:07 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 22/26] selftests/bpf: Add usdt_multi test program Jiri Olsa
2023-07-07 4:39 ` Andrii Nakryiko
2023-06-30 8:33 ` [PATCHv3 bpf-next 23/26] selftests/bpf: Add usdt_multi bench test Jiri Olsa
2023-07-07 4:42 ` Andrii Nakryiko
2023-07-11 9:07 ` Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 24/26] selftests/bpf: Add uprobe_multi cookie test Jiri Olsa
2023-06-30 8:33 ` [PATCHv3 bpf-next 25/26] selftests/bpf: Add uprobe_multi pid filter tests Jiri Olsa
2023-06-30 8:33 ` Jiri Olsa [this message]
2023-07-05 12:45 ` [PATCHv3 bpf-next 00/26] bpf: Add multi uprobe link Daniel Borkmann
2023-07-05 19:10 ` 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=20230630083344.984305-27-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=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 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.