perf evsel: Separate missing feature detection from evsel__open_cpu()

This is a preparatory patch for the workqueue patches with the goal to
separate in evlist__open_cpu() the actual opening, which could be
performed in parallel, from the existing fallback mechanisms, which
should be handled sequentially.

This patch separates the missing feature detection in evsel__open_cpu()
into a new evsel__detect_missing_features() function.

Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/cba0b7d939862473662adeedb0f9c9b69566ee9a.1629490974.git.rickyman7@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 45d778f..943ddea 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1841,6 +1841,96 @@ int evsel__prepare_open(struct evsel *evsel, struct perf_cpu_map *cpus,
        return err;
 }
 
+bool evsel__detect_missing_features(struct evsel *evsel)
+{
+       /*
+        * Must probe features in the order they were added to the
+        * perf_event_attr interface.
+        */
+       if (!perf_missing_features.weight_struct &&
+           (evsel->core.attr.sample_type & PERF_SAMPLE_WEIGHT_STRUCT)) {
+               perf_missing_features.weight_struct = true;
+               pr_debug2("switching off weight struct support\n");
+               return true;
+       } else if (!perf_missing_features.code_page_size &&
+           (evsel->core.attr.sample_type & PERF_SAMPLE_CODE_PAGE_SIZE)) {
+               perf_missing_features.code_page_size = true;
+               pr_debug2_peo("Kernel has no PERF_SAMPLE_CODE_PAGE_SIZE support, bailing out\n");
+               return false;
+       } else if (!perf_missing_features.data_page_size &&
+           (evsel->core.attr.sample_type & PERF_SAMPLE_DATA_PAGE_SIZE)) {
+               perf_missing_features.data_page_size = true;
+               pr_debug2_peo("Kernel has no PERF_SAMPLE_DATA_PAGE_SIZE support, bailing out\n");
+               return false;
+       } else if (!perf_missing_features.cgroup && evsel->core.attr.cgroup) {
+               perf_missing_features.cgroup = true;
+               pr_debug2_peo("Kernel has no cgroup sampling support, bailing out\n");
+               return false;
+       } else if (!perf_missing_features.branch_hw_idx &&
+           (evsel->core.attr.branch_sample_type & PERF_SAMPLE_BRANCH_HW_INDEX)) {
+               perf_missing_features.branch_hw_idx = true;
+               pr_debug2("switching off branch HW index support\n");
+               return true;
+       } else if (!perf_missing_features.aux_output && evsel->core.attr.aux_output) {
+               perf_missing_features.aux_output = true;
+               pr_debug2_peo("Kernel has no attr.aux_output support, bailing out\n");
+               return false;
+       } else if (!perf_missing_features.bpf && evsel->core.attr.bpf_event) {
+               perf_missing_features.bpf = true;
+               pr_debug2_peo("switching off bpf_event\n");
+               return true;
+       } else if (!perf_missing_features.ksymbol && evsel->core.attr.ksymbol) {
+               perf_missing_features.ksymbol = true;
+               pr_debug2_peo("switching off ksymbol\n");
+               return true;
+       } else if (!perf_missing_features.write_backward && evsel->core.attr.write_backward) {
+               perf_missing_features.write_backward = true;
+               pr_debug2_peo("switching off write_backward\n");
+               return false;
+       } else if (!perf_missing_features.clockid_wrong && evsel->core.attr.use_clockid) {
+               perf_missing_features.clockid_wrong = true;
+               pr_debug2_peo("switching off clockid\n");
+               return true;
+       } else if (!perf_missing_features.clockid && evsel->core.attr.use_clockid) {
+               perf_missing_features.clockid = true;
+               pr_debug2_peo("switching off use_clockid\n");
+               return true;
+       } else if (!perf_missing_features.cloexec && (evsel->open_flags & PERF_FLAG_FD_CLOEXEC)) {
+               perf_missing_features.cloexec = true;
+               pr_debug2_peo("switching off cloexec flag\n");
+               return true;
+       } else if (!perf_missing_features.mmap2 && evsel->core.attr.mmap2) {
+               perf_missing_features.mmap2 = true;
+               pr_debug2_peo("switching off mmap2\n");
+               return true;
+       } else if (!perf_missing_features.exclude_guest &&
+                  (evsel->core.attr.exclude_guest || evsel->core.attr.exclude_host)) {
+               perf_missing_features.exclude_guest = true;
+               pr_debug2_peo("switching off exclude_guest, exclude_host\n");
+               return true;
+       } else if (!perf_missing_features.sample_id_all) {
+               perf_missing_features.sample_id_all = true;
+               pr_debug2_peo("switching off sample_id_all\n");
+               return true;
+       } else if (!perf_missing_features.lbr_flags &&
+                       (evsel->core.attr.branch_sample_type &
+                        (PERF_SAMPLE_BRANCH_NO_CYCLES |
+                         PERF_SAMPLE_BRANCH_NO_FLAGS))) {
+               perf_missing_features.lbr_flags = true;
+               pr_debug2_peo("switching off branch sample type no (cycles/flags)\n");
+               return true;
+       } else if (!perf_missing_features.group_read &&
+                   evsel->core.attr.inherit &&
+                  (evsel->core.attr.read_format & PERF_FORMAT_GROUP) &&
+                  evsel__is_group_leader(evsel)) {
+               perf_missing_features.group_read = true;
+               pr_debug2_peo("switching off group read\n");
+               return true;
+       } else {
+               return false;
+       }
+}
+
 static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
                struct perf_thread_map *threads,
                int start_cpu, int end_cpu)
@@ -1979,90 +2069,8 @@ try_fallback:
        if (err != -EINVAL || cpu > 0 || thread > 0)
                goto out_close;
 
-       /*
-        * Must probe features in the order they were added to the
-        * perf_event_attr interface.
-        */
-       if (!perf_missing_features.weight_struct &&
-           (evsel->core.attr.sample_type & PERF_SAMPLE_WEIGHT_STRUCT)) {
-               perf_missing_features.weight_struct = true;
-               pr_debug2("switching off weight struct support\n");
+       if (evsel__detect_missing_features(evsel))
                goto fallback_missing_features;
-       } else if (!perf_missing_features.code_page_size &&
-           (evsel->core.attr.sample_type & PERF_SAMPLE_CODE_PAGE_SIZE)) {
-               perf_missing_features.code_page_size = true;
-               pr_debug2_peo("Kernel has no PERF_SAMPLE_CODE_PAGE_SIZE support, bailing out\n");
-               goto out_close;
-       } else if (!perf_missing_features.data_page_size &&
-           (evsel->core.attr.sample_type & PERF_SAMPLE_DATA_PAGE_SIZE)) {
-               perf_missing_features.data_page_size = true;
-               pr_debug2_peo("Kernel has no PERF_SAMPLE_DATA_PAGE_SIZE support, bailing out\n");
-               goto out_close;
-       } else if (!perf_missing_features.cgroup && evsel->core.attr.cgroup) {
-               perf_missing_features.cgroup = true;
-               pr_debug2_peo("Kernel has no cgroup sampling support, bailing out\n");
-               goto out_close;
-        } else if (!perf_missing_features.branch_hw_idx &&
-           (evsel->core.attr.branch_sample_type & PERF_SAMPLE_BRANCH_HW_INDEX)) {
-               perf_missing_features.branch_hw_idx = true;
-               pr_debug2("switching off branch HW index support\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.aux_output && evsel->core.attr.aux_output) {
-               perf_missing_features.aux_output = true;
-               pr_debug2_peo("Kernel has no attr.aux_output support, bailing out\n");
-               goto out_close;
-       } else if (!perf_missing_features.bpf && evsel->core.attr.bpf_event) {
-               perf_missing_features.bpf = true;
-               pr_debug2_peo("switching off bpf_event\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.ksymbol && evsel->core.attr.ksymbol) {
-               perf_missing_features.ksymbol = true;
-               pr_debug2_peo("switching off ksymbol\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.write_backward && evsel->core.attr.write_backward) {
-               perf_missing_features.write_backward = true;
-               pr_debug2_peo("switching off write_backward\n");
-               goto out_close;
-       } else if (!perf_missing_features.clockid_wrong && evsel->core.attr.use_clockid) {
-               perf_missing_features.clockid_wrong = true;
-               pr_debug2_peo("switching off clockid\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.clockid && evsel->core.attr.use_clockid) {
-               perf_missing_features.clockid = true;
-               pr_debug2_peo("switching off use_clockid\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.cloexec && (evsel->open_flags & PERF_FLAG_FD_CLOEXEC)) {
-               perf_missing_features.cloexec = true;
-               pr_debug2_peo("switching off cloexec flag\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.mmap2 && evsel->core.attr.mmap2) {
-               perf_missing_features.mmap2 = true;
-               pr_debug2_peo("switching off mmap2\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.exclude_guest &&
-                  (evsel->core.attr.exclude_guest || evsel->core.attr.exclude_host)) {
-               perf_missing_features.exclude_guest = true;
-               pr_debug2_peo("switching off exclude_guest, exclude_host\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.sample_id_all) {
-               perf_missing_features.sample_id_all = true;
-               pr_debug2_peo("switching off sample_id_all\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.lbr_flags &&
-                       (evsel->core.attr.branch_sample_type &
-                        (PERF_SAMPLE_BRANCH_NO_CYCLES |
-                         PERF_SAMPLE_BRANCH_NO_FLAGS))) {
-               perf_missing_features.lbr_flags = true;
-               pr_debug2_peo("switching off branch sample type no (cycles/flags)\n");
-               goto fallback_missing_features;
-       } else if (!perf_missing_features.group_read &&
-                   evsel->core.attr.inherit &&
-                  (evsel->core.attr.read_format & PERF_FORMAT_GROUP) &&
-                  evsel__is_group_leader(evsel)) {
-               perf_missing_features.group_read = true;
-               pr_debug2_peo("switching off group read\n");
-               goto fallback_missing_features;
-       }
 out_close:
        if (err)
                threads->err_thread = thread;

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index b173700..e683f4a 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -289,6 +289,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,
 void evsel__close(struct evsel *evsel);
 int evsel__prepare_open(struct evsel *evsel, struct perf_cpu_map *cpus,
                struct perf_thread_map *threads);
+bool evsel__detect_missing_features(struct evsel *evsel);
 
 struct perf_sample;