iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpftool: Fix typo in MAX_NUM_METRICS macro name

Browse Source 
Correct typo in bpftool profiler and change all instances of 'MATRICS' to
'METRICS' in the profiler.bpf.c file.

Signed-off-by: Swan Beaujard <beaujardswan@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Quentin Monnet <qmo@kernel.org>
Link: https://lore.kernel.org/bpf/20240602225812.81171-1-beaujardswan@gmail.com
This commit is contained in:
Swan Beaujard 2024-06-03 00:58:12 +02:00 committed by Daniel Borkmann
parent a450d36b05
commit ce5249b91e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/bpf/bpftool/skeleton/profiler.bpf.c
View File

@ -40,17 +40,17 @@ struct {
const volatile __u32 num_cpu = 1; const volatile __u32 num_cpu = 1;
const volatile __u32 num_metric = 1; const volatile __u32 num_metric = 1;
#define MAX_NUM_MATRICS 4 #define MAX_NUM_METRICS 4
SEC("fentry/XXX") SEC("fentry/XXX")
int BPF_PROG(fentry_XXX) int BPF_PROG(fentry_XXX)
{ {
struct bpf_perf_event_value___local *ptrs[MAX_NUM_MATRICS]; struct bpf_perf_event_value___local *ptrs[MAX_NUM_METRICS];
u32 key = bpf_get_smp_processor_id(); u32 key = bpf_get_smp_processor_id();
u32 i; u32 i;
/* look up before reading, to reduce error */ /* look up before reading, to reduce error */
for (i = 0; i < num_metric && i < MAX_NUM_MATRICS; i++) { for (i = 0; i < num_metric && i < MAX_NUM_METRICS; i++) {
u32 flag = i; u32 flag = i;
ptrs[i] = bpf_map_lookup_elem(&fentry_readings, &flag); ptrs[i] = bpf_map_lookup_elem(&fentry_readings, &flag);
@ -58,7 +58,7 @@ int BPF_PROG(fentry_XXX)
return 0; return 0;
} }
for (i = 0; i < num_metric && i < MAX_NUM_MATRICS; i++) { for (i = 0; i < num_metric && i < MAX_NUM_METRICS; i++) {
struct bpf_perf_event_value___local reading; struct bpf_perf_event_value___local reading;
int err; int err;
@ -99,14 +99,14 @@ fexit_update_maps(u32 id, struct bpf_perf_event_value___local *after)
SEC("fexit/XXX") SEC("fexit/XXX")
int BPF_PROG(fexit_XXX) int BPF_PROG(fexit_XXX)
{ {
struct bpf_perf_event_value___local readings[MAX_NUM_MATRICS]; struct bpf_perf_event_value___local readings[MAX_NUM_METRICS];
u32 cpu = bpf_get_smp_processor_id(); u32 cpu = bpf_get_smp_processor_id();
u32 i, zero = 0; u32 i, zero = 0;
int err; int err;
u64 *count; u64 *count;
/* read all events before updating the maps, to reduce error */ /* read all events before updating the maps, to reduce error */
for (i = 0; i < num_metric && i < MAX_NUM_MATRICS; i++) { for (i = 0; i < num_metric && i < MAX_NUM_METRICS; i++) {
err = bpf_perf_event_read_value(&events, cpu + i * num_cpu, err = bpf_perf_event_read_value(&events, cpu + i * num_cpu,
(void *)(readings + i), (void *)(readings + i),
sizeof(*readings)); sizeof(*readings));
@ -116,7 +116,7 @@ int BPF_PROG(fexit_XXX)
count = bpf_map_lookup_elem(&counts, &zero); count = bpf_map_lookup_elem(&counts, &zero);
if (count) { if (count) {
*count += 1; *count += 1;
for (i = 0; i < num_metric && i < MAX_NUM_MATRICS; i++) for (i = 0; i < num_metric && i < MAX_NUM_METRICS; i++)
fexit_update_maps(i, &readings[i]); fexit_update_maps(i, &readings[i]);
} }
return 0; return 0;