lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 080/247] selftests/bpf: fix selftest after random: Urandom_read tracepoint removal
    Date
    From: Andrii Nakryiko <andrii@kernel.org>

    [ Upstream commit 99dea2c664d7bc7e4f6f6947182d0d365165a998 ]

    14c174633f34 ("random: remove unused tracepoints") removed all the
    tracepoints from drivers/char/random.c, one of which,
    random:urandom_read, was used by stacktrace_build_id selftest to trigger
    stack trace capture.

    Fix breakage by switching to kprobing urandom_read() function.

    Suggested-by: Yonghong Song <yhs@fb.com>
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Acked-by: Yonghong Song <yhs@fb.com>
    Link: https://lore.kernel.org/bpf/20220325225643.2606-1-andrii@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../selftests/bpf/progs/test_stacktrace_build_id.c | 12 ++----------
    1 file changed, 2 insertions(+), 10 deletions(-)

    diff --git a/tools/testing/selftests/bpf/progs/test_stacktrace_build_id.c b/tools/testing/selftests/bpf/progs/test_stacktrace_build_id.c
    index 0cf0134631b4..08aee18d9ded 100644
    --- a/tools/testing/selftests/bpf/progs/test_stacktrace_build_id.c
    +++ b/tools/testing/selftests/bpf/progs/test_stacktrace_build_id.c
    @@ -39,16 +39,8 @@ struct {
    __type(value, stack_trace_t);
    } stack_amap SEC(".maps");

    -/* taken from /sys/kernel/debug/tracing/events/random/urandom_read/format */
    -struct random_urandom_args {
    - unsigned long long pad;
    - int got_bits;
    - int pool_left;
    - int input_left;
    -};
    -
    -SEC("tracepoint/random/urandom_read")
    -int oncpu(struct random_urandom_args *args)
    +SEC("kprobe/urandom_read")
    +int oncpu(struct pt_regs *args)
    {
    __u32 max_len = sizeof(struct bpf_stack_build_id)
    * PERF_MAX_STACK_DEPTH;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 15:05    [W:4.225 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site