]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
perf evlist: Allow multiple read formats
authorAdrian Hunter <adrian.hunter@intel.com>
Wed, 1 Apr 2020 10:16:12 +0000 (13:16 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 18 Apr 2020 12:05:00 +0000 (09:05 -0300)
Tools find the correct evsel, and therefore read format, using the event
ID, so it isn't necessary for all read formats to be the same. In the
case of leader-sampling of AUX area events, dummy tracking events will
have a different read format, so relax the validation to become a debug
message only.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20200401101613.6201-16-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/evlist.c

index 1548237b6558d9105dcc07ae8094fb7f06dcc2b4..82d9f9bb897533e931fb5bc64e2e5865344037c7 100644 (file)
@@ -1131,8 +1131,10 @@ bool perf_evlist__valid_read_format(struct evlist *evlist)
        u64 sample_type = first->core.attr.sample_type;
 
        evlist__for_each_entry(evlist, pos) {
-               if (read_format != pos->core.attr.read_format)
-                       return false;
+               if (read_format != pos->core.attr.read_format) {
+                       pr_debug("Read format differs %#" PRIx64 " vs %#" PRIx64 "\n",
+                                read_format, (u64)pos->core.attr.read_format);
+               }
        }
 
        /* PERF_SAMPLE_READ imples PERF_FORMAT_ID. */