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

[platform/kernel/linux-rpi.git] / tools / perf / util / bpf-filter.c

diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c
index 47f01df..b515449 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",