From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 20D3AD167E7 for ; Fri, 9 Jan 2026 09:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iePCKqThvl8UucftY09/BLc7SJsp6+M3d3LYNyJg5xU=; b=Dm3OZITBr4c4jcXnG0PhX/ZtXI sC3fBnwQElKOa1+nqyNvopuhfcLClyOby5ni9La4D5jJOAqCjx/0AyC63gBTnMBHaJz6f9zM6KbyD 8QRFq4sFt7QVW7cCFYydHeqXEosPPGruHyTQQl587i/pGLEGls60VXNufSK3d/Ad1gR9ThoJGwJoK 4JJt7VMXFNNrJ/UnLzMTLFzfCFj1L9yIAlHAEWSLgiQgLt0qEq6RIPycafKTCC0kpZbeVnsqAAaYw FYs87O0MqFZP9Q0ZCJiSXgGKLmxjLfgavDXlQ2ePcsPlpYg42mKYTE3IO5mCB05Vmo/9QkB3cjN4c qNaZsvig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ve8tt-000000021zQ-0CDn; Fri, 09 Jan 2026 09:35:21 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ve8tr-000000021yv-2XCo for linux-arm-kernel@lists.infradead.org; Fri, 09 Jan 2026 09:35:19 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 0EFAC60136; Fri, 9 Jan 2026 09:35:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45EC2C4CEF1; Fri, 9 Jan 2026 09:35:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767951318; bh=KYN08OfhJKdVOxdem4pFSBq1PJAMgzGcdLnB3YeasnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M8eU/eG96gPrcMmQdytR870eN8Gfdn3SCe2vxfjGMXig8T6Nxp0VN1B0S6qlcCvX6 6dCL+StgETem+a73inY0excUUCOnIJZdUGPzQOIuPXOCES0MdTZFtkOFQ6R4cSur90 PKRDkaD5lhNH5221f1p5xCkCEF4Qf5jlLDqJ6J9V5JnvDcQ7l7kDCbUl8sGIS29Pcx F4qCeMIwDl6bHzBOl+s3eVU5pclZs4z3YGgBdnnuxGuDo0F84tKdy+tkex/DXeeyZA OjBHl5tC4l9z17prGhEHz7K8mLjkpqKOFISyUSGlOntRkhwVmhof3VPEyW+qnTUt/O qP9jkuSp0NBIw== From: Jiri Olsa To: Masami Hiramatsu , Steven Rostedt , Will Deacon Cc: Song Liu , Peter Zijlstra , bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org, Yonghong Song , Song Liu , Andrii Nakryiko , Mark Rutland , Mahe Tardy Subject: [PATCHv2 bpf-next 2/2] selftests/bpf: Add test for bpf_override_return helper Date: Fri, 9 Jan 2026 10:34:54 +0100 Message-ID: <20260109093454.389295-2-jolsa@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109093454.389295-1-jolsa@kernel.org> References: <20260109093454.389295-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We do not actually test the bpf_override_return helper functionality itself at the moment, only the bpf program being able to attach it. Adding test that override prctl syscall return value on top of kprobe and kprobe.multi. Acked-by: Song Liu Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/kprobe_multi_test.c | 44 +++++++++++++++++++ .../bpf/progs/kprobe_multi_override.c | 15 +++++++ tools/testing/selftests/bpf/trace_helpers.h | 12 +++++ 3 files changed, 71 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c index 6cfaa978bc9a..9caef222e528 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include +#include #include #include "kprobe_multi.skel.h" #include "trace_helpers.h" @@ -540,6 +542,46 @@ static void test_attach_override(void) kprobe_multi_override__destroy(skel); } +static void test_override(void) +{ + struct kprobe_multi_override *skel = NULL; + int err; + + skel = kprobe_multi_override__open_and_load(); + if (!ASSERT_OK_PTR(skel, "kprobe_multi_empty__open_and_load")) + goto cleanup; + + skel->bss->pid = getpid(); + + /* no override */ + err = prctl(0xffff, 0); + ASSERT_EQ(err, -1, "err"); + + /* kprobe.multi override */ + skel->links.test_override = bpf_program__attach_kprobe_multi_opts(skel->progs.test_override, + SYS_PREFIX "sys_prctl", NULL); + if (!ASSERT_OK_PTR(skel->links.test_override, "bpf_program__attach_kprobe_multi_opts")) + goto cleanup; + + err = prctl(0xffff, 0); + ASSERT_EQ(err, 123, "err"); + + bpf_link__destroy(skel->links.test_override); + skel->links.test_override = NULL; + + /* kprobe override */ + skel->links.test_kprobe_override = bpf_program__attach_kprobe(skel->progs.test_kprobe_override, + false, SYS_PREFIX "sys_prctl"); + if (!ASSERT_OK_PTR(skel->links.test_kprobe_override, "bpf_program__attach_kprobe")) + goto cleanup; + + err = prctl(0xffff, 0); + ASSERT_EQ(err, 123, "err"); + +cleanup: + kprobe_multi_override__destroy(skel); +} + #ifdef __x86_64__ static void test_attach_write_ctx(void) { @@ -597,6 +639,8 @@ void test_kprobe_multi_test(void) test_attach_api_fails(); if (test__start_subtest("attach_override")) test_attach_override(); + if (test__start_subtest("override")) + test_override(); if (test__start_subtest("session")) test_session_skel_api(); if (test__start_subtest("session_cookie")) diff --git a/tools/testing/selftests/bpf/progs/kprobe_multi_override.c b/tools/testing/selftests/bpf/progs/kprobe_multi_override.c index 28f8487c9059..14f39fa6d515 100644 --- a/tools/testing/selftests/bpf/progs/kprobe_multi_override.c +++ b/tools/testing/selftests/bpf/progs/kprobe_multi_override.c @@ -5,9 +5,24 @@ char _license[] SEC("license") = "GPL"; +int pid = 0; + SEC("kprobe.multi") int test_override(struct pt_regs *ctx) { + if (bpf_get_current_pid_tgid() >> 32 != pid) + return 0; + + bpf_override_return(ctx, 123); + return 0; +} + +SEC("kprobe") +int test_kprobe_override(struct pt_regs *ctx) +{ + if (bpf_get_current_pid_tgid() >> 32 != pid) + return 0; + bpf_override_return(ctx, 123); return 0; } diff --git a/tools/testing/selftests/bpf/trace_helpers.h b/tools/testing/selftests/bpf/trace_helpers.h index 9437bdd4afa5..a5576b2dfc26 100644 --- a/tools/testing/selftests/bpf/trace_helpers.h +++ b/tools/testing/selftests/bpf/trace_helpers.h @@ -4,6 +4,18 @@ #include +#ifdef __x86_64__ +#define SYS_PREFIX "__x64_" +#elif defined(__s390x__) +#define SYS_PREFIX "__s390x_" +#elif defined(__aarch64__) +#define SYS_PREFIX "__arm64_" +#elif defined(__riscv) +#define SYS_PREFIX "__riscv_" +#else +#define SYS_PREFIX "" +#endif + #define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) #define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) -- 2.52.0