bpf, libbpf: simplify and cleanup perf ring buffer walk
Simplify bpf_perf_event_read_simple() a bit and fix up some minor things along the way: the return code in the header is not of type int but enum bpf_perf_event_ret instead. Once callback indicated to break the loop walking event data, it also needs to be consumed in data_tail since it has been processed already. Moreover, bpf_perf_event_print_t callback should avoid void * as we actually get a pointer to struct perf_event_header and thus applications can make use of container_of() to have type checks. The walk also doesn't have to use modulo op since the ring size is required to be power of two. Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:

committed by
Alexei Starovoitov

parent
84430d4232
commit
3dca21156b
@@ -125,10 +125,11 @@ struct perf_event_sample {
|
||||
char data[];
|
||||
};
|
||||
|
||||
static enum bpf_perf_event_ret bpf_perf_event_print(void *event, void *priv)
|
||||
static enum bpf_perf_event_ret
|
||||
bpf_perf_event_print(struct perf_event_header *hdr, void *private_data)
|
||||
{
|
||||
struct perf_event_sample *e = event;
|
||||
perf_event_print_fn fn = priv;
|
||||
struct perf_event_sample *e = (struct perf_event_sample *)hdr;
|
||||
perf_event_print_fn fn = private_data;
|
||||
int ret;
|
||||
|
||||
if (e->header.type == PERF_RECORD_SAMPLE) {
|
||||
|
Reference in New Issue
Block a user