| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 3 Feb 2023 11:17:42 +0800
From: menglong8.dong@...il.com
To: andrii.nakryiko@...il.com, alan.maguire@...cle.com
Cc: ast@...nel.org, daniel@...earbox.net, andrii@...nel.org,
martin.lau@...ux.dev, song@...nel.org, yhs@...com,
john.fastabend@...il.com, kpsingh@...nel.org, sdf@...gle.com,
haoluo@...gle.com, jolsa@...nel.org, bpf@...r.kernel.org,
linux-kernel@...r.kernel.org, Menglong Dong <imagedong@...cent.com>
Subject: [PATCH bpf-next 2/2] selftests/bpf: add test for legacy/perf kprobe/uprobe attach mode
From: Menglong Dong <imagedong@...cent.com>
Add the testing for kprobe/uprobe attaching in legacy and perf mode.
And the testing passed:
./test_progs -t attach_probe
$5 attach_probe:OK
Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED
Signed-off-by: Menglong Dong <imagedong@...cent.com>
---
.../selftests/bpf/prog_tests/attach_probe.c | 61 ++++++++++++++++++-
.../selftests/bpf/progs/test_attach_probe.c | 32 ++++++++++
2 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
index 9566d9d2f6ee..5f6212ac0b6d 100644
--- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c
+++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
@@ -23,15 +23,22 @@ static noinline void trigger_func3(void)
asm volatile ("");
}
+/* attach point for legacy uprobe */
+static noinline void trigger_func4(void)
+{
+ asm volatile ("");
+}
+
static char test_data[] = "test_data";
void test_attach_probe(void)
{
+ ssize_t uprobe_offset, uprobe4_offset, ref_ctr_offset;
DECLARE_LIBBPF_OPTS(bpf_uprobe_opts, uprobe_opts);
struct bpf_link *kprobe_link, *kretprobe_link;
struct bpf_link *uprobe_link, *uretprobe_link;
+ DECLARE_LIBBPF_OPTS(bpf_kprobe_opts, opts);
struct test_attach_probe* skel;
- ssize_t uprobe_offset, ref_ctr_offset;
struct bpf_link *uprobe_err_link;
bool legacy;
char *mem;
@@ -86,6 +93,25 @@ void test_attach_probe(void)
goto cleanup;
skel->links.handle_kretprobe = kretprobe_link;
+ /* manual-attach kprobe in legacy mode */
+ opts.retprobe = false;
+ opts.mode = PROBE_MODE_LEGACY;
+ kprobe_link = bpf_program__attach_kprobe_opts(skel->progs.handle_kprobe_legacy,
+ SYS_NANOSLEEP_KPROBE_NAME,
+ &opts);
+ if (!ASSERT_OK_PTR(kprobe_link, "attach_kprobe_legacy"))
+ goto cleanup;
+ skel->links.handle_kprobe_legacy = kprobe_link;
+
+ /* manual-attach kprobe in perf mode */
+ opts.mode = PROBE_MODE_PERF;
+ kprobe_link = bpf_program__attach_kprobe_opts(skel->progs.handle_kprobe_perf,
+ SYS_NANOSLEEP_KPROBE_NAME,
+ &opts);
+ if (!ASSERT_OK_PTR(kprobe_link, "attach_kprobe_perf"))
+ goto cleanup;
+ skel->links.handle_kprobe_perf = kprobe_link;
+
/* auto-attachable kprobe and kretprobe */
skel->links.handle_kprobe_auto = bpf_program__attach(skel->progs.handle_kprobe_auto);
ASSERT_OK_PTR(skel->links.handle_kprobe_auto, "attach_kprobe_auto");
@@ -110,6 +136,32 @@ void test_attach_probe(void)
if (!legacy)
ASSERT_GT(uprobe_ref_ctr, 0, "uprobe_ref_ctr_after");
+ uprobe4_offset = get_uprobe_offset(&trigger_func4);
+ if (!ASSERT_GE(uprobe4_offset, 0, "uprobe4_offset"))
+ goto cleanup;
+
+ uprobe_opts.mode = PROBE_MODE_LEGACY;
+ uprobe_opts.ref_ctr_offset = 0;
+ uprobe_link = bpf_program__attach_uprobe_opts(skel->progs.handle_uprobe_legacy,
+ 0 /* self pid */,
+ "/proc/self/exe",
+ uprobe4_offset,
+ &uprobe_opts);
+ if (!ASSERT_OK_PTR(uprobe_link, "attach_uprobe_legacy"))
+ goto cleanup;
+ skel->links.handle_uprobe_legacy = uprobe_link;
+
+ uprobe_opts.mode = PROBE_MODE_PERF;
+ uprobe_opts.ref_ctr_offset = legacy ? 0 : ref_ctr_offset;
+ uprobe_link = bpf_program__attach_uprobe_opts(skel->progs.handle_uprobe_perf,
+ 0 /* self pid */,
+ "/proc/self/exe",
+ uprobe_offset,
+ &uprobe_opts);
+ if (!ASSERT_OK_PTR(uprobe_link, "attach_uprobe_perf"))
+ goto cleanup;
+ skel->links.handle_uprobe_perf = uprobe_link;
+
/* if uprobe uses ref_ctr, uretprobe has to use ref_ctr as well */
uprobe_opts.retprobe = true;
uprobe_opts.ref_ctr_offset = legacy ? 0 : ref_ctr_offset;
@@ -207,11 +259,18 @@ void test_attach_probe(void)
/* trigger & validate sleepable uprobe attached by name */
trigger_func3();
+ /* trigger & validate uprobe in legacy mode */
+ trigger_func4();
+
ASSERT_EQ(skel->bss->kprobe_res, 1, "check_kprobe_res");
ASSERT_EQ(skel->bss->kprobe2_res, 11, "check_kprobe_auto_res");
+ ASSERT_EQ(skel->bss->kprobe3_res, 3, "check_kprobe_legacy_res");
+ ASSERT_EQ(skel->bss->kprobe4_res, 4, "check_kprobe_perf_res");
ASSERT_EQ(skel->bss->kretprobe_res, 2, "check_kretprobe_res");
ASSERT_EQ(skel->bss->kretprobe2_res, 22, "check_kretprobe_auto_res");
ASSERT_EQ(skel->bss->uprobe_res, 3, "check_uprobe_res");
+ ASSERT_EQ(skel->bss->uprobe2_res, 4, "check_uprobe_legacy_res");
+ ASSERT_EQ(skel->bss->uprobe3_res, 5, "check_uprobe_perf_res");
ASSERT_EQ(skel->bss->uretprobe_res, 4, "check_uretprobe_res");
ASSERT_EQ(skel->bss->uprobe_byname_res, 5, "check_uprobe_byname_res");
ASSERT_EQ(skel->bss->uretprobe_byname_res, 6, "check_uretprobe_byname_res");
diff --git a/tools/testing/selftests/bpf/progs/test_attach_probe.c b/tools/testing/selftests/bpf/progs/test_attach_probe.c
index a1e45fec8938..6674deea5686 100644
--- a/tools/testing/selftests/bpf/progs/test_attach_probe.c
+++ b/tools/testing/selftests/bpf/progs/test_attach_probe.c
@@ -9,9 +9,13 @@
int kprobe_res = 0;
int kprobe2_res = 0;
+int kprobe3_res = 0;
+int kprobe4_res = 0;
int kretprobe_res = 0;
int kretprobe2_res = 0;
int uprobe_res = 0;
+int uprobe2_res = 0;
+int uprobe3_res = 0;
int uretprobe_res = 0;
int uprobe_byname_res = 0;
int uretprobe_byname_res = 0;
@@ -30,6 +34,20 @@ int handle_kprobe(struct pt_regs *ctx)
return 0;
}
+SEC("kprobe")
+int handle_kprobe_legacy(struct pt_regs *ctx)
+{
+ kprobe3_res = 3;
+ return 0;
+}
+
+SEC("kprobe")
+int handle_kprobe_perf(struct pt_regs *ctx)
+{
+ kprobe4_res = 4;
+ return 0;
+}
+
SEC("ksyscall/nanosleep")
int BPF_KSYSCALL(handle_kprobe_auto, struct __kernel_timespec *req, struct __kernel_timespec *rem)
{
@@ -69,6 +87,20 @@ int handle_uprobe(struct pt_regs *ctx)
return 0;
}
+SEC("uprobe")
+int handle_uprobe_legacy(struct pt_regs *ctx)
+{
+ uprobe2_res = 4;
+ return 0;
+}
+
+SEC("uprobe")
+int handle_uprobe_perf(struct pt_regs *ctx)
+{
+ uprobe3_res = 5;
+ return 0;
+}
+
SEC("uretprobe")
int handle_uretprobe(struct pt_regs *ctx)
{
--
2.39.0
Powered by blists - more mailing lists