From nobody Sun Nov 24 02:57:59 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5F131EE022; Fri, 8 Nov 2024 13:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073636; cv=none; b=JNwCEdkbmJRHx9+hvqiLSCbckhifHf8iYu2x4jrbKzpqPotkZMs9uyxScxfxMohTJ55kJPs1VO8lQ9ny8mP9ed5fK3IfRHTweyOfNBni8444yyaOSRaHq0fgKfKlLvZDBRYj9kiwu4PTtYsV08cUczhn6zcqklvjNlvm9K7On5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073636; c=relaxed/simple; bh=8GXWW17gG4ieCsIRt49tA/42DlL3aah/7d/aROI27Ps=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cR0y+rOoxxILeL5JLtTsphZpAAtVZ5Ldr1lgRmp/CFvHFbjI/1zkB+uDPtXyTq5MefwiFa35daHy7Unc1lIsII1x4kDJjlJZzfK52sjoo4XmjN3jyHl21y1vt8JiGfgulli1NFxoZuploXV0x4pgMd6140CQ67+MQ9fHIxooNYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KH7Ny4TY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KH7Ny4TY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62062C4CECD; Fri, 8 Nov 2024 13:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073635; bh=8GXWW17gG4ieCsIRt49tA/42DlL3aah/7d/aROI27Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KH7Ny4TYvKTQqoLCvJzQzz2yFvr61Dd/n0m4ZoC+CGGlZ7+8Yf+JDs4/r/DVCVAdI 10nXOcTXH+OKbbqf1R2wVjYqxeBxwNDZYGm6bhHFMY6/Lf+FUwrCpLX/YVamHR6Z9y 42jbMdA5Mo+V4rgfyjGxwlBxW+KUyv/m9Q7G0zUQLsZkKl4+0NfALl0Ok3zYEnqW2X DZ+Slrrs2ZlTnFLvWYxVO7WNe9tJDwD8om/QGAY7zBULBuGejLryL4u03ahZbxrM56 7rcTznKIGK9Jsny48kLP1RaBIhcDjyV8539xyu0lpf8il3Bzc+U2LhQ7Wl2gkEkEa/ XeyerfZ3ikWIw== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 06/13] selftests/bpf: Add uprobe session test Date: Fri, 8 Nov 2024 14:45:37 +0100 Message-ID: <20241108134544.480660-7-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adding uprobe session test and testing that the entry program return value controls execution of the return probe program. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/uprobe_multi_test.c | 47 ++++++++++++ .../bpf/progs/uprobe_multi_session.c | 71 +++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_session.c diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c index 616441fdd7f2..d9c20ca7a833 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c @@ -8,6 +8,7 @@ #include "uprobe_multi_usdt.skel.h" #include "uprobe_multi_consumers.skel.h" #include "uprobe_multi_pid_filter.skel.h" +#include "uprobe_multi_session.skel.h" #include "bpf/libbpf_internal.h" #include "testing_helpers.h" #include "../sdt.h" @@ -1017,6 +1018,50 @@ static void test_pid_filter_process(bool clone_vm) uprobe_multi_pid_filter__destroy(skel); } =20 +static void test_session_skel_api(void) +{ + struct uprobe_multi_session *skel =3D NULL; + LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); + struct bpf_link *link =3D NULL; + int err; + + skel =3D uprobe_multi_session__open_and_load(); + if (!ASSERT_OK_PTR(skel, "uprobe_multi_session__open_and_load")) + goto cleanup; + + skel->bss->pid =3D getpid(); + skel->bss->user_ptr =3D test_data; + + err =3D uprobe_multi_session__attach(skel); + if (!ASSERT_OK(err, "uprobe_multi_session__attach")) + goto cleanup; + + /* trigger all probes */ + skel->bss->uprobe_multi_func_1_addr =3D (__u64) uprobe_multi_func_1; + skel->bss->uprobe_multi_func_2_addr =3D (__u64) uprobe_multi_func_2; + skel->bss->uprobe_multi_func_3_addr =3D (__u64) uprobe_multi_func_3; + + uprobe_multi_func_1(); + uprobe_multi_func_2(); + uprobe_multi_func_3(); + + /* + * We expect 2 for uprobe_multi_func_2 because it runs both entry/return = probe, + * uprobe_multi_func_[13] run just the entry probe. All expected numbers = are + * doubled, because we run extra test for sleepable session. + */ + ASSERT_EQ(skel->bss->uprobe_session_result[0], 2, "uprobe_multi_func_1_re= sult"); + ASSERT_EQ(skel->bss->uprobe_session_result[1], 4, "uprobe_multi_func_2_re= sult"); + ASSERT_EQ(skel->bss->uprobe_session_result[2], 2, "uprobe_multi_func_3_re= sult"); + + /* We expect increase in 3 entry and 1 return session calls -> 4 */ + ASSERT_EQ(skel->bss->uprobe_multi_sleep_result, 4, "uprobe_multi_sleep_re= sult"); + +cleanup: + bpf_link__destroy(link); + uprobe_multi_session__destroy(skel); +} + static void test_bench_attach_uprobe(void) { long attach_start_ns =3D 0, attach_end_ns =3D 0; @@ -1113,4 +1158,6 @@ void test_uprobe_multi_test(void) test_pid_filter_process(false); if (test__start_subtest("filter_clone_vm")) test_pid_filter_process(true); + if (test__start_subtest("session")) + test_session_skel_api(); } diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi_session.c b/too= ls/testing/selftests/bpf/progs/uprobe_multi_session.c new file mode 100644 index 000000000000..30bff90b68dc --- /dev/null +++ b/tools/testing/selftests/bpf/progs/uprobe_multi_session.c @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include "bpf_kfuncs.h" +#include "bpf_misc.h" + +char _license[] SEC("license") =3D "GPL"; + +__u64 uprobe_multi_func_1_addr =3D 0; +__u64 uprobe_multi_func_2_addr =3D 0; +__u64 uprobe_multi_func_3_addr =3D 0; + +__u64 uprobe_session_result[3] =3D {}; +__u64 uprobe_multi_sleep_result =3D 0; + +void *user_ptr =3D 0; +int pid =3D 0; + +static int uprobe_multi_check(void *ctx, bool is_return) +{ + const __u64 funcs[] =3D { + uprobe_multi_func_1_addr, + uprobe_multi_func_2_addr, + uprobe_multi_func_3_addr, + }; + unsigned int i; + __u64 addr; + + if (bpf_get_current_pid_tgid() >> 32 !=3D pid) + return 1; + + addr =3D bpf_get_func_ip(ctx); + + for (i =3D 0; i < ARRAY_SIZE(funcs); i++) { + if (funcs[i] =3D=3D addr) { + uprobe_session_result[i]++; + break; + } + } + + /* only uprobe_multi_func_2 executes return probe */ + if ((addr =3D=3D uprobe_multi_func_1_addr) || + (addr =3D=3D uprobe_multi_func_3_addr)) + return 1; + + return 0; +} + +SEC("uprobe.session//proc/self/exe:uprobe_multi_func_*") +int uprobe(struct pt_regs *ctx) +{ + return uprobe_multi_check(ctx, bpf_session_is_return()); +} + +static __always_inline bool verify_sleepable_user_copy(void) +{ + char data[9]; + + bpf_copy_from_user(data, sizeof(data), user_ptr); + return bpf_strncmp(data, sizeof(data), "test_data") =3D=3D 0; +} + +SEC("uprobe.session.s//proc/self/exe:uprobe_multi_func_*") +int uprobe_sleepable(struct pt_regs *ctx) +{ + if (verify_sleepable_user_copy()) + uprobe_multi_sleep_result++; + return uprobe_multi_check(ctx, bpf_session_is_return()); +} --=20 2.47.0