From: Jiri Olsa <jolsa@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Oleg Nesterov <oleg@redhat.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
linux-api@vger.kernel.org, x86@kernel.org, bpf@vger.kernel.org,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Ingo Molnar <mingo@redhat.com>, Andy Lutomirski <luto@kernel.org>
Subject: [PATCHv3 bpf-next 5/7] selftests/bpf: Add uretprobe syscall call from user space test
Date: Sun, 21 Apr 2024 21:42:04 +0200 [thread overview]
Message-ID: <20240421194206.1010934-6-jolsa@kernel.org> (raw)
In-Reply-To: <20240421194206.1010934-1-jolsa@kernel.org>
Adding test to verify that when called from outside of the
trampoline provided by kernel, the uretprobe syscall will cause
calling process to receive SIGILL signal and the attached bpf
program is no executed.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
.../selftests/bpf/prog_tests/uprobe_syscall.c | 92 +++++++++++++++++++
.../selftests/bpf/progs/uprobe_syscall_call.c | 15 +++
2 files changed, 107 insertions(+)
create mode 100644 tools/testing/selftests/bpf/progs/uprobe_syscall_call.c
diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
index 1a50cd35205d..9233210a4c33 100644
--- a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
+++ b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
@@ -7,7 +7,10 @@
#include <unistd.h>
#include <asm/ptrace.h>
#include <linux/compiler.h>
+#include <linux/stringify.h>
+#include <sys/wait.h>
#include "uprobe_syscall.skel.h"
+#include "uprobe_syscall_call.skel.h"
__naked unsigned long uretprobe_regs_trigger(void)
{
@@ -209,6 +212,85 @@ static void test_uretprobe_regs_change(void)
}
}
+#ifndef __NR_uretprobe
+#define __NR_uretprobe 462
+#endif
+
+__naked unsigned long uretprobe_syscall_call_1(void)
+{
+ /*
+ * Pretend we are uretprobe trampoline to trigger the return
+ * probe invocation in order to verify we get SIGILL.
+ */
+ asm volatile (
+ "pushq %rax\n"
+ "pushq %rcx\n"
+ "pushq %r11\n"
+ "movq $" __stringify(__NR_uretprobe) ", %rax\n"
+ "syscall\n"
+ "popq %r11\n"
+ "popq %rcx\n"
+ "retq\n"
+ );
+}
+
+__naked unsigned long uretprobe_syscall_call(void)
+{
+ asm volatile (
+ "call uretprobe_syscall_call_1\n"
+ "retq\n"
+ );
+}
+
+static void __test_uretprobe_syscall_call(void)
+{
+ struct uprobe_syscall_call *skel = NULL;
+ int err;
+
+ skel = uprobe_syscall_call__open_and_load();
+ if (!ASSERT_OK_PTR(skel, "uprobe_syscall_call__open_and_load"))
+ goto cleanup;
+
+ err = uprobe_syscall_call__attach(skel);
+ if (!ASSERT_OK(err, "uprobe_syscall_call__attach"))
+ goto cleanup;
+
+ uretprobe_syscall_call();
+
+cleanup:
+ uprobe_syscall_call__destroy(skel);
+}
+
+static void trace_pipe_cb(const char *str, void *data)
+{
+ if (strstr(str, "uretprobe called") != NULL)
+ (*(int *)data)++;
+}
+
+static void test_uretprobe_syscall_call(void)
+{
+ int pid, status, found = 0;
+
+ pid = fork();
+ if (!ASSERT_GE(pid, 0, "fork"))
+ return;
+
+ if (pid == 0) {
+ __test_uretprobe_syscall_call();
+ _exit(0);
+ }
+
+ waitpid(pid, &status, 0);
+
+ /* verify the child got killed with SIGILL */
+ ASSERT_EQ(WIFSIGNALED(status), 1, "WIFSIGNALED");
+ ASSERT_EQ(WTERMSIG(status), SIGILL, "WTERMSIG");
+
+ /* verify the uretprobe program wasn't called */
+ ASSERT_OK(read_trace_pipe_iter(trace_pipe_cb, &found, 1000),
+ "read_trace_pipe_iter");
+ ASSERT_EQ(found, 0, "found");
+}
#else
static void test_uretprobe_regs_equal(void)
{
@@ -219,6 +301,11 @@ static void test_uretprobe_regs_change(void)
{
test__skip();
}
+
+static void test_uretprobe_syscall_call(void)
+{
+ test__skip();
+}
#endif
void test_uprobe_syscall(void)
@@ -228,3 +315,8 @@ void test_uprobe_syscall(void)
if (test__start_subtest("uretprobe_regs_change"))
test_uretprobe_regs_change();
}
+
+void serial_test_uprobe_syscall_call(void)
+{
+ test_uretprobe_syscall_call();
+}
diff --git a/tools/testing/selftests/bpf/progs/uprobe_syscall_call.c b/tools/testing/selftests/bpf/progs/uprobe_syscall_call.c
new file mode 100644
index 000000000000..5ea03bb47198
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/uprobe_syscall_call.c
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include <string.h>
+
+struct pt_regs regs;
+
+char _license[] SEC("license") = "GPL";
+
+SEC("uretprobe//proc/self/exe:uretprobe_syscall_call")
+int uretprobe(struct pt_regs *regs)
+{
+ bpf_printk("uretprobe called");
+ return 0;
+}
--
2.44.0
next prev parent reply other threads:[~2024-04-21 19:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-21 19:41 [PATCHv3 bpf-next 0/7] uprobe: uretprobe speed up Jiri Olsa
2024-04-21 19:42 ` [PATCHv3 bpf-next 1/7] uprobe: Wire up uretprobe system call Jiri Olsa
2024-04-22 15:57 ` Oleg Nesterov
2024-04-26 17:56 ` Andrii Nakryiko
2024-04-21 19:42 ` [PATCHv3 bpf-next 2/7] uprobe: Add uretprobe syscall to speed up return probe Jiri Olsa
2024-04-22 15:55 ` Oleg Nesterov
2024-04-26 17:58 ` Andrii Nakryiko
2024-04-21 19:42 ` [PATCHv3 bpf-next 3/7] selftests/bpf: Add uretprobe syscall test for regs integrity Jiri Olsa
2024-04-21 19:42 ` [PATCHv3 bpf-next 4/7] selftests/bpf: Add uretprobe syscall test for regs changes Jiri Olsa
2024-04-21 19:42 ` Jiri Olsa [this message]
2024-04-26 18:03 ` [PATCHv3 bpf-next 5/7] selftests/bpf: Add uretprobe syscall call from user space test Andrii Nakryiko
2024-04-29 7:33 ` Jiri Olsa
2024-04-29 16:41 ` Andrii Nakryiko
2024-04-21 19:42 ` [PATCHv3 bpf-next 6/7] selftests/bpf: Add uretprobe compat test Jiri Olsa
2024-04-26 18:06 ` Andrii Nakryiko
2024-04-29 7:39 ` Jiri Olsa
2024-04-29 16:44 ` Andrii Nakryiko
2024-04-21 19:42 ` [PATCH 7/7] man2: Add uretprobe syscall page Jiri Olsa
2024-04-22 15:07 ` Masami Hiramatsu
2024-04-22 20:15 ` Jiri Olsa
2024-04-22 15:09 ` [PATCHv3 bpf-next 0/7] uprobe: uretprobe speed up Masami Hiramatsu
2024-04-22 20:25 ` 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=20240421194206.1010934-6-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bp@alien8.de \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=songliubraving@fb.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).