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>

diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c
index 47f01df658d9a6d1d29d9392d78254021e2d9c47..b51544996046d47d9d12c224c63027852fb87b75 100644 (file)
--- a/tools/perf/util/bpf-filter.c
+++ b/tools/perf/util/bpf-filter.c
@@ -62,6 +62,16 @@ static int check_sample_flags(struct evsel *evsel, struct perf_bpf_filter_expr *
        if (evsel->core.attr.sample_type & expr->sample_flags)
                return 0;
 
+       if (expr->op == PBF_OP_GROUP_BEGIN) {
+               struct perf_bpf_filter_expr *group;
+
+               list_for_each_entry(group, &expr->groups, list) {
+                       if (check_sample_flags(evsel, group) < 0)
+                               return -1;
+               }
+               return 0;
+       }
+
        info = get_sample_info(expr->sample_flags);
        if (info == NULL) {
                pr_err("Error: %s event does not have sample flags %lx\n",