From: Jiri Olsa <jolsa@kernel.org>
To: Oleg Nesterov <oleg@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
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@fomichev.me>, Hao Luo <haoluo@google.com>,
Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: [PATCHv4 13/14] selftests/bpf: Add uprobe session single consumer test
Date: Tue, 17 Sep 2024 10:50:23 +0200 [thread overview]
Message-ID: <20240917085024.765883-14-jolsa@kernel.org> (raw)
In-Reply-To: <20240917085024.765883-1-jolsa@kernel.org>
Testing that the session ret_handler bypass works on single
uprobe with multiple consumers, each with different session
ignore return value.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
.../bpf/prog_tests/uprobe_multi_test.c | 33 ++++++++++++++
.../bpf/progs/uprobe_multi_session_single.c | 44 +++++++++++++++++++
2 files changed, 77 insertions(+)
create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_session_single.c
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 210cdb620ee0..594aa8c06f58 100644
--- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
+++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
@@ -7,6 +7,7 @@
#include "uprobe_multi_bench.skel.h"
#include "uprobe_multi_usdt.skel.h"
#include "uprobe_multi_session.skel.h"
+#include "uprobe_multi_session_single.skel.h"
#include "uprobe_multi_session_cookie.skel.h"
#include "uprobe_multi_session_recursive.skel.h"
#include "uprobe_multi_verifier.skel.h"
@@ -669,6 +670,36 @@ static void test_session_skel_api(void)
uprobe_multi_session__destroy(skel);
}
+static void test_session_single_skel_api(void)
+{
+ struct uprobe_multi_session_single *skel = NULL;
+ LIBBPF_OPTS(bpf_kprobe_multi_opts, opts);
+ int err;
+
+ skel = uprobe_multi_session_single__open_and_load();
+ if (!ASSERT_OK_PTR(skel, "uprobe_multi_session_single__open_and_load"))
+ goto cleanup;
+
+ skel->bss->pid = getpid();
+
+ err = uprobe_multi_session_single__attach(skel);
+ if (!ASSERT_OK(err, "uprobe_multi_session_single__attach"))
+ goto cleanup;
+
+ uprobe_multi_func_1();
+
+ /*
+ * We expect consumer 0 and 2 to trigger just entry handler (value 1)
+ * and consumer 1 to hit both (value 2).
+ */
+ ASSERT_EQ(skel->bss->uprobe_session_result[0], 1, "uprobe_session_result_0");
+ ASSERT_EQ(skel->bss->uprobe_session_result[1], 2, "uprobe_session_result_1");
+ ASSERT_EQ(skel->bss->uprobe_session_result[2], 1, "uprobe_session_result_2");
+
+cleanup:
+ uprobe_multi_session_single__destroy(skel);
+}
+
static void test_session_cookie_skel_api(void)
{
struct uprobe_multi_session_cookie *skel = NULL;
@@ -835,6 +866,8 @@ void test_uprobe_multi_test(void)
test_attach_api_fails();
if (test__start_subtest("session"))
test_session_skel_api();
+ if (test__start_subtest("session_single"))
+ test_session_single_skel_api();
if (test__start_subtest("session_cookie"))
test_session_cookie_skel_api();
if (test__start_subtest("session_cookie_recursive"))
diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi_session_single.c b/tools/testing/selftests/bpf/progs/uprobe_multi_session_single.c
new file mode 100644
index 000000000000..1fa53d3785f6
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/uprobe_multi_session_single.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_tracing.h>
+#include <stdbool.h>
+#include "bpf_kfuncs.h"
+#include "bpf_misc.h"
+
+char _license[] SEC("license") = "GPL";
+
+__u64 uprobe_session_result[3] = {};
+int pid = 0;
+
+static int uprobe_multi_check(void *ctx, bool is_return, int idx)
+{
+ if (bpf_get_current_pid_tgid() >> 32 != pid)
+ return 1;
+
+ uprobe_session_result[idx]++;
+
+ /* only consumer 1 executes return probe */
+ if (idx == 0 || idx == 2)
+ return 1;
+
+ return 0;
+}
+
+SEC("uprobe.session//proc/self/exe:uprobe_multi_func_1")
+int uprobe_0(struct pt_regs *ctx)
+{
+ return uprobe_multi_check(ctx, bpf_session_is_return(), 0);
+}
+
+SEC("uprobe.session//proc/self/exe:uprobe_multi_func_1")
+int uprobe_1(struct pt_regs *ctx)
+{
+ return uprobe_multi_check(ctx, bpf_session_is_return(), 1);
+}
+
+SEC("uprobe.session//proc/self/exe:uprobe_multi_func_1")
+int uprobe_2(struct pt_regs *ctx)
+{
+ return uprobe_multi_check(ctx, bpf_session_is_return(), 2);
+}
--
2.46.0
next prev parent reply other threads:[~2024-09-17 8:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-17 8:50 [PATCHv4 00/14] uprobe, bpf: Add session support Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 01/14] uprobe: Add data pointer to consumer handlers Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 02/14] uprobe: Add support for session consumer Jiri Olsa
2024-09-17 12:03 ` Oleg Nesterov
2024-09-17 12:51 ` Jiri Olsa
2024-09-22 15:27 ` Oleg Nesterov
2024-09-23 8:05 ` Jiri Olsa
2024-09-23 10:05 ` Oleg Nesterov
2024-09-23 11:02 ` Jiri Olsa
2024-09-23 12:13 ` Oleg Nesterov
2024-09-17 12:22 ` Oleg Nesterov
2024-09-17 8:50 ` [PATCHv4 03/14] bpf: Add support for uprobe multi session attach Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 04/14] bpf: Add support for uprobe multi session context Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 05/14] bpf: Allow return values 0 and 1 for uprobe/kprobe session Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 06/14] libbpf: Fix uretprobe.multi.s programs auto attachment Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 07/14] libbpf: Add support for uprobe multi session attach Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 08/14] selftests/bpf: Add uprobe session test Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 09/14] selftests/bpf: Add uprobe session cookie test Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 10/14] selftests/bpf: Add uprobe session recursive test Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 11/14] selftests/bpf: Add uprobe session verifier test for return value Jiri Olsa
2024-09-17 8:50 ` [PATCHv4 12/14] selftests/bpf: Add kprobe " Jiri Olsa
2024-09-17 8:50 ` Jiri Olsa [this message]
2024-09-17 8:50 ` [PATCHv4 14/14] selftests/bpf: Add consumers stress test on single uprobe Jiri Olsa
2024-09-23 8:34 ` [PATCHv4 00/14] uprobe, bpf: Add session support 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=20240917085024.765883-14-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=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sdf@fomichev.me \
--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.