Skip to content

Commit db52f57

Browse files
kjain101borkmann
authored andcommitted
bpf: Remove config check to enable bpf support for branch records
Branch data available to BPF programs can be very useful to get stack traces out of userspace application. Commit fff7b64 ("bpf: Add bpf_read_branch_records() helper") added BPF support to capture branch records in x86. Enable this feature also for other architectures as well by removing checks specific to x86. If an architecture doesn't support branch records, bpf_read_branch_records() still has appropriate checks and it will return an -EINVAL in that scenario. Based on UAPI helper doc in include/uapi/linux/bpf.h, unsupported architectures should return -ENOENT in such case. Hence, update the appropriate check to return -ENOENT instead. Selftest 'perf_branches' result on power9 machine which has the branch stacks support: - Before this patch: [command]# ./test_progs -t perf_branches #88/1 perf_branches/perf_branches_hw:FAIL #88/2 perf_branches/perf_branches_no_hw:OK #88 perf_branches:FAIL Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILED - After this patch: [command]# ./test_progs -t perf_branches #88/1 perf_branches/perf_branches_hw:OK #88/2 perf_branches/perf_branches_no_hw:OK #88 perf_branches:OK Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED Selftest 'perf_branches' result on power9 machine which doesn't have branch stack report: - After this patch: [command]# ./test_progs -t perf_branches #88/1 perf_branches/perf_branches_hw:SKIP #88/2 perf_branches/perf_branches_no_hw:OK #88 perf_branches:OK Summary: 1/1 PASSED, 1 SKIPPED, 0 FAILED Fixes: fff7b64 ("bpf: Add bpf_read_branch_records() helper") Suggested-by: Peter Zijlstra <[email protected]> Signed-off-by: Kajol Jain <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 942df4d commit db52f57

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

kernel/trace/bpf_trace.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,9 +1404,6 @@ static const struct bpf_func_proto bpf_perf_prog_read_value_proto = {
14041404
BPF_CALL_4(bpf_read_branch_records, struct bpf_perf_event_data_kern *, ctx,
14051405
void *, buf, u32, size, u64, flags)
14061406
{
1407-
#ifndef CONFIG_X86
1408-
return -ENOENT;
1409-
#else
14101407
static const u32 br_entry_size = sizeof(struct perf_branch_entry);
14111408
struct perf_branch_stack *br_stack = ctx->data->br_stack;
14121409
u32 to_copy;
@@ -1415,7 +1412,7 @@ BPF_CALL_4(bpf_read_branch_records, struct bpf_perf_event_data_kern *, ctx,
14151412
return -EINVAL;
14161413

14171414
if (unlikely(!br_stack))
1418-
return -EINVAL;
1415+
return -ENOENT;
14191416

14201417
if (flags & BPF_F_GET_BRANCH_RECORDS_SIZE)
14211418
return br_stack->nr * br_entry_size;
@@ -1427,7 +1424,6 @@ BPF_CALL_4(bpf_read_branch_records, struct bpf_perf_event_data_kern *, ctx,
14271424
memcpy(buf, br_stack->entries, to_copy);
14281425

14291426
return to_copy;
1430-
#endif
14311427
}
14321428

14331429
static const struct bpf_func_proto bpf_read_branch_records_proto = {

0 commit comments

Comments
 (0)