mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
5a897531e0
When building bpf_skel with clang-10, typedef causes confusions like:
libbpf: map 'prev_readings': unexpected def kind var.
Fix this by removing the typedef.
Fixes: 7fac83aaf2 ("perf stat: Introduce 'bperf' to share hardware PMCs with BPF")
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/BEF5C312-4331-4A60-AEC0-AD7617CB2BC4@fb.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
55 lines
1.4 KiB
C
55 lines
1.4 KiB
C
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
|
// Copyright (c) 2021 Facebook
|
|
#include "vmlinux.h"
|
|
#include <bpf/bpf_helpers.h>
|
|
#include <bpf/bpf_tracing.h>
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
|
|
__uint(key_size, sizeof(__u32));
|
|
__uint(value_size, sizeof(int));
|
|
__uint(map_flags, BPF_F_PRESERVE_ELEMS);
|
|
} events SEC(".maps");
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
|
|
__uint(key_size, sizeof(__u32));
|
|
__uint(value_size, sizeof(struct bpf_perf_event_value));
|
|
__uint(max_entries, 1);
|
|
} prev_readings SEC(".maps");
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
|
|
__uint(key_size, sizeof(__u32));
|
|
__uint(value_size, sizeof(struct bpf_perf_event_value));
|
|
__uint(max_entries, 1);
|
|
} diff_readings SEC(".maps");
|
|
|
|
SEC("raw_tp/sched_switch")
|
|
int BPF_PROG(on_switch)
|
|
{
|
|
struct bpf_perf_event_value val, *prev_val, *diff_val;
|
|
__u32 key = bpf_get_smp_processor_id();
|
|
__u32 zero = 0;
|
|
long err;
|
|
|
|
prev_val = bpf_map_lookup_elem(&prev_readings, &zero);
|
|
if (!prev_val)
|
|
return 0;
|
|
|
|
diff_val = bpf_map_lookup_elem(&diff_readings, &zero);
|
|
if (!diff_val)
|
|
return 0;
|
|
|
|
err = bpf_perf_event_read_value(&events, key, &val, sizeof(val));
|
|
if (err)
|
|
return 0;
|
|
|
|
diff_val->counter = val.counter - prev_val->counter;
|
|
diff_val->enabled = val.enabled - prev_val->enabled;
|
|
diff_val->running = val.running - prev_val->running;
|
|
*prev_val = val;
|
|
return 0;
|
|
}
|
|
|
|
char LICENSE[] SEC("license") = "Dual BSD/GPL";
|