bpf: Adjust BPF stack helper functions to accommodate skip > 0
Subsystems (6)
PATCH v2 1/2 bpf: Adjust BPF stack helper functions to accommodate skip > 0
Let's say that the caller has storage for num_elem stack frames. Then, the BPF stack helper functions walk the stack for only num_elem frames. This means that if skip > 0, one keeps only 'num_elem - skip' frames.
This is because it sets init_nr in the perf_callchain_entry to the end of the buffer to save num_elem entries only. I believe it was because the perf callchain code unwound the stack frames until it reached the global max size (sysctl_perf_event_max_stack).
However it now has perf_callchain_entry_ctx.max_stack to limit the iteration locally. This simplifies the code to handle init_nr in the BPF callstack entries and removes the confusion with the perf_event's __PERF_SAMPLE_CALLCHAIN_EARLY which sets init_nr to 0.
Also change the comment on bpf_get_stack() in the header file to be more explicit what the return value means.
--- include/uapi/linux/bpf.h | 8 +++--- kernel/bpf/stackmap.c | 56 +++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 36 deletions(-)
include/uapi/linux/bpf.h +4 -4
@@ -2975,8 +2975,8 @@ union bpf_attr {* * # sysctl kernel.perf_event_max_stack=<new value> * Return -* A non-negative value equal to or less than *size* on success, -* or a negative error in case of failure. +* The non-negative copied *buf* length equal to or less than +* *size* on success, or a negative error in case of failure. * * long bpf_skb_load_bytes_relative(const void *skb, u32 offset, void *to, u32 len, u32 start_header) * Description
@@ -4279,8 +4279,8 @@ union bpf_attr {* * # sysctl kernel.perf_event_max_stack=<new value> * Return -* A non-negative value equal to or less than *size* on success, -* or a negative error in case of failure. +* The non-negative copied *buf* length equal to or less than +* *size* on success, or a negative error in case of failure. * * long bpf_load_hdr_opt(struct bpf_sock_ops *skops, void *searchby_res, u32 len, u64 flags) * Description
kernel/bpf/stackmap.c +24 -32
127 lines not on this page · raw message
Signature · 1 line
2.35.1.723.g4982287a31-goog
PATCH v2 2/2 bpf/selftests: Test skipping stacktrace
Add a test case for stacktrace with skip > 0 using a small sized buffer. It didn't support skipping entries greater than or equal to the size of buffer and filled the skipped part with 0.
--- .../bpf/prog_tests/stacktrace_map_skip.c | 61 ++++++++++++++++++ .../selftests/bpf/progs/stacktrace_map_skip.c | 64 +++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c create mode 100644 tools/testing/selftests/bpf/progs/stacktrace_map_skip.c
tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c new file +61 -0
@@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <test_progs.h> +#include "stacktrace_map_skip.skel.h" + +#define TEST_STACK_DEPTH 2 + +void test_stacktrace_map_skip (void ) +{ +struct stacktrace_map_skip *skel; +int stackid_hmap_fd, stackmap_fd, stack_amap_fd; +int err, stack_trace_len; + + skel =stacktrace_map_skip__open_and_load (); +if (ASSERT_OK_PTR (skel,"skel_open_and_load" )) +return ; + +/* find map fds */ + stackid_hmap_fd =bpf_map__fd (skel->maps.stackid_hmap); +if (ASSERT_GE (stackid_hmap_fd,0 ,"stackid_hmap fd" )) + goto out; + + stackmap_fd =bpf_map__fd (skel->maps.stackmap); +if (ASSERT_GE (stackmap_fd,0 ,"stackmap fd" )) + goto out; + + stack_amap_fd =bpf_map__fd (skel->maps.stack_amap); +if (ASSERT_GE (stack_amap_fd,0 ,"stack_amap fd" )) + goto out; + + err =stacktrace_map_skip__attach (skel); +if (ASSERT_OK (err,"skel_attach" )) + goto out; + +/* give some time for bpf program run */ +sleep (1 ); + +/* disable stack trace collection */ + skel->bss->control =1 ; + +/* for every element in stackid_hmap, we can find a corresponding one +* in stackmap, and vise versa. +*/ + err =compare_map_keys (stackid_hmap_fd, stackmap_fd); +if (ASSERT_OK (err,"compare_map_keys stackid_hmap vs. stackmap" )) + goto out; + + err =compare_map_keys (stackmap_fd, stackid_hmap_fd); +if (ASSERT_OK (err,"compare_map_keys stackmap vs. stackid_hmap" )) + goto out; + + stack_trace_len =TEST_STACK_DEPTH *sizeof (__u64); + err =compare_stack_ips (stackmap_fd, stack_amap_fd, stack_trace_len); +if (ASSERT_OK (err,"compare_stack_ips stackmap vs. stack_amap" )) + goto out; + +if (ASSERT_EQ (skel->bss->failed,0 ,"skip_failed" )) + goto out; + +out: +stacktrace_map_skip__destroy (skel); +}
tools/testing/selftests/bpf/progs/stacktrace_map_skip.c new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
2.35.1.723.g4982287a31-goog