Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf bpf-filter: Fix sample flag check with ||

For logical OR operator, the actual sample_flags are in the 'groups'
list so it needs to check entries in the list instead. Otherwise it
would show the following error message.

$ sudo perf record -a -e cycles:p --filter 'period > 100 || weight > 0' sleep 1
Error: cycles:p event does not have sample flags 0
failed to set filter "BPF" on event cycles:p with 2 (No such file or directory)

Actually it should warn on 'weight' is used without WEIGHT flag.

Error: cycles:p event does not have PERF_SAMPLE_WEIGHT
Hint: please add -W option to perf record
failed to set filter "BPF" on event cycles:p with 2 (No such file or directory)

Fixes: 4310551b76e0d676 ("perf bpf filter: Show warning for missing sample flags")
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230811025822.3859771-1-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Namhyung Kim and committed by
Arnaldo Carvalho de Melo
dc7f01f1 cd2cece6

+10
+10
tools/perf/util/bpf-filter.c
··· 62 62 if (evsel->core.attr.sample_type & expr->sample_flags) 63 63 return 0; 64 64 65 + if (expr->op == PBF_OP_GROUP_BEGIN) { 66 + struct perf_bpf_filter_expr *group; 67 + 68 + list_for_each_entry(group, &expr->groups, list) { 69 + if (check_sample_flags(evsel, group) < 0) 70 + return -1; 71 + } 72 + return 0; 73 + } 74 + 65 75 info = get_sample_info(expr->sample_flags); 66 76 if (info == NULL) { 67 77 pr_err("Error: %s event does not have sample flags %lx\n",