Merge tag 'drm/tegra/for-5.1-rc5' of git://anongit.freedesktop.org/tegra/linux into...

[thirdparty/kernel/stable.git] / tools / perf / builtin-top.c

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 231a90daa958131e132fb79ef7f7d4b0f3d10ff0..1999d6533d12a35e672e4caf8c98e24010191bcf 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1189,30 +1189,26 @@ static int __cmd_top(struct perf_top *top)
        pthread_t thread, thread_process;
        int ret;
 
-       top->session = perf_session__new(NULL, false, NULL);
-       if (top->session == NULL)
-               return -1;
-
        if (!top->annotation_opts.objdump_path) {
                ret = perf_env__lookup_objdump(&top->session->header.env,
                                               &top->annotation_opts.objdump_path);
                if (ret)
-                       goto out_delete;
+                       return ret;
        }
 
        ret = callchain_param__setup_sample_type(&callchain_param);
        if (ret)
-               goto out_delete;
+               return ret;
 
        if (perf_session__register_idle_thread(top->session) < 0)
-               goto out_delete;
+               return ret;
 
        if (top->nr_threads_synthesize > 1)
                perf_set_multithreaded();
 
        init_process_thread(top);
 
-       ret = perf_event__synthesize_bpf_events(&top->tool, perf_event__process,
+       ret = perf_event__synthesize_bpf_events(top->session, perf_event__process,
                                                &top->session->machines.host,
                                                &top->record_opts);
        if (ret < 0)
@@ -1227,13 +1223,18 @@ static int __cmd_top(struct perf_top *top)
 
        if (perf_hpp_list.socket) {
                ret = perf_env__read_cpu_topology_map(&perf_env);
-               if (ret < 0)
-                       goto out_err_cpu_topo;
+               if (ret < 0) {
+                       char errbuf[BUFSIZ];
+                       const char *err = str_error_r(-ret, errbuf, sizeof(errbuf));
+
+                       ui__error("Could not read the CPU topology map: %s\n", err);
+                       return ret;
+               }
        }
 
        ret = perf_top__start_counters(top);
        if (ret)
-               goto out_delete;
+               return ret;
 
        top->session->evlist = top->evlist;
        perf_session__set_id_hdr_size(top->session);
@@ -1252,7 +1253,7 @@ static int __cmd_top(struct perf_top *top)
        ret = -1;
        if (pthread_create(&thread_process, NULL, process_thread, top)) {
                ui__error("Could not create process thread.\n");
-               goto out_delete;
+               return ret;
        }
 
        if (pthread_create(&thread, NULL, (use_browser > 0 ? display_thread_tui :
@@ -1296,19 +1297,7 @@ out_join:
 out_join_thread:
        pthread_cond_signal(&top->qe.cond);
        pthread_join(thread_process, NULL);
-out_delete:
-       perf_session__delete(top->session);
-       top->session = NULL;
-
        return ret;
-
-out_err_cpu_topo: {
-       char errbuf[BUFSIZ];
-       const char *err = str_error_r(-ret, errbuf, sizeof(errbuf));
-
-       ui__error("Could not read the CPU topology map: %s\n", err);
-       goto out_delete;
-}
 }
 
 static int
@@ -1480,6 +1469,7 @@ int cmd_top(int argc, const char **argv)
                    "Display raw encoding of assembly instructions (default)"),
        OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel,
                    "Enable kernel symbol demangling"),
+       OPT_BOOLEAN(0, "no-bpf-event", &top.record_opts.no_bpf_event, "do not record bpf events"),
        OPT_STRING(0, "objdump", &top.annotation_opts.objdump_path, "path",
                    "objdump binary to use for disassembly and annotations"),
        OPT_STRING('M', "disassembler-style", &top.annotation_opts.disassembler_style, "disassembler style",
@@ -1511,6 +1501,7 @@ int cmd_top(int argc, const char **argv)
                        "number of thread to run event synthesize"),
        OPT_END()
        };
+       struct perf_evlist *sb_evlist = NULL;
        const char * const top_usage[] = {
                "perf top [<options>]",
                NULL
@@ -1628,8 +1619,9 @@ int cmd_top(int argc, const char **argv)
        annotation_config__init();
 
        symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);
-       if (symbol__init(NULL) < 0)
-               return -1;
+       status = symbol__init(NULL);
+       if (status < 0)
+               goto out_delete_evlist;
 
        sort__setup_elide(stdout);
 
@@ -1639,10 +1631,28 @@ int cmd_top(int argc, const char **argv)
                signal(SIGWINCH, winch_sig);
        }
 
+       top.session = perf_session__new(NULL, false, NULL);
+       if (top.session == NULL) {
+               status = -1;
+               goto out_delete_evlist;
+       }
+
+       if (!top.record_opts.no_bpf_event)
+               bpf_event__add_sb_event(&sb_evlist, &perf_env);
+
+       if (perf_evlist__start_sb_thread(sb_evlist, target)) {
+               pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n");
+               opts->no_bpf_event = true;
+       }
+
        status = __cmd_top(&top);
 
+       if (!opts->no_bpf_event)
+               perf_evlist__stop_sb_thread(sb_evlist);
+
 out_delete_evlist:
        perf_evlist__delete(top.evlist);
+       perf_session__delete(top.session);
 
        return status;
 }