Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

  * Synthesize anon MMAP records again, fix from Don Zickus.

  * Add an option in 'perf record' to force per-cpu mmaps, from Adrian Hunter.

  * Limit max callchain using max_stack on DWARF unwinding too.

  * Fix segfault in the UI browser caused by off by one handling END key.

  * Add '--demangle'/'--no-demangle' to perf probe, so that we can overcome
    current limitations in handling C++ symbols, from Azat Khuzhin .

  * Tweak 'perf trace' summary output, from Pekka Enberg.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

16 files changed, 50 insertions, 30 deletions

diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index 052f7c4dc00c..43b42c4f4a91 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -201,6 +201,12 @@ abort events and some memory events in precise mode on modern Intel CPUs.
 --transaction::
 Record transaction flags for transaction related events.
 
+--force-per-cpu::
+Force the use of per-cpu mmaps.  By default, when tasks are specified (i.e. -p,
+-t or -u options) per-thread mmaps are created.  This option overrides that and
+forces per-cpu mmaps.  A side-effect of that is that inheritance is
+automatically enabled.  Add the -i option also to disable inheritance.
+
 SEE ALSO
 --------
 linkperf:perf-stat[1], linkperf:perf-list[1]
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 89acc17cf2a0..6ea9e85bdc00 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -325,6 +325,8 @@ int cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)
                      opt_set_filter),
         OPT_CALLBACK('x', "exec", NULL, "executable|path",
                         "target executable name or path", opt_set_target),
+        OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle,
+                    "Disable symbol demangling"),
         OPT_END()
         };
         int ret;
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 4d644fe2d5b7..7c8020a32784 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -888,6 +888,8 @@ const struct option record_options[] = {
                     "sample by weight (on special events only)"),
         OPT_BOOLEAN(0, "transaction", &record.opts.sample_transaction,
                     "sample transaction flags (special events only)"),
+        OPT_BOOLEAN(0, "force-per-cpu", &record.opts.target.force_per_cpu,
+                    "force the use of per-cpu mmaps"),
         OPT_END()
 };
 
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index b8f8e29db332..71e6402729a8 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1172,7 +1172,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         status = target__validate(target);
         if (status) {
                 target__strerror(target, status, errbuf, BUFSIZ);
-                ui__warning("%s", errbuf);
+                ui__warning("%s\n", errbuf);
         }
 
         status = target__parse_uid(target);
@@ -1180,7 +1180,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
                 int saved_errno = errno;
 
                 target__strerror(target, status, errbuf, BUFSIZ);
-                ui__error("%s", errbuf);
+                ui__error("%s\n", errbuf);
 
                 status = -saved_errno;
                 goto out_delete_evlist;
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 6b230af940e2..8be17fc462ba 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2112,9 +2112,9 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 
         printed += fprintf(fp, "\n");
 
-        printed += fprintf(fp, "                                                    msec/call\n");
-        printed += fprintf(fp, "   syscall            calls      min      avg      max stddev\n");
-        printed += fprintf(fp, "   --------------- -------- -------- -------- -------- ------\n");
+        printed += fprintf(fp, "   syscall            calls      min       avg       max      stddev\n");
+        printed += fprintf(fp, "                               (msec)    (msec)    (msec)        (%%)\n");
+        printed += fprintf(fp, "   --------------- -------- --------- --------- ---------     ------\n");
 
         /* each int_node is a syscall */
         while (inode) {
@@ -2131,9 +2131,9 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 
                         sc = &trace->syscalls.table[inode->i];
                         printed += fprintf(fp, "   %-15s", sc->name);
-                        printed += fprintf(fp, " %8" PRIu64 " %8.3f %8.3f",
+                        printed += fprintf(fp, " %8" PRIu64 " %9.3f %9.3f",
                                            n, min, avg);
-                        printed += fprintf(fp, " %8.3f %6.2f\n", max, pct);
+                        printed += fprintf(fp, " %9.3f %9.2f%%\n", max, pct);
                 }
 
                 inode = intlist__next(inode);
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index ef671cd41bb3..3cbd10496087 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -441,9 +441,8 @@ static int test__checkevent_pmu_name(struct perf_evlist *evlist)
 
 static int test__checkevent_pmu_events(struct perf_evlist *evlist)
 {
-        struct perf_evsel *evsel;
+        struct perf_evsel *evsel = perf_evlist__first(evlist);
 
-        evsel = list_entry(evlist->entries.next, struct perf_evsel, node);
         TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
         TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
         TEST_ASSERT_VAL("wrong exclude_user",
diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index bbc782e364b0..cbaa7af45513 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -569,7 +569,7 @@ void ui_browser__argv_seek(struct ui_browser *browser, off_t offset, int whence)
                 browser->top = browser->top + browser->top_idx + offset;
                 break;
         case SEEK_END:
-                browser->top = browser->top + browser->nr_entries + offset;
+                browser->top = browser->top + browser->nr_entries - 1 + offset;
                 break;
         default:
                 return;
@@ -680,7 +680,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
         if (end >= browser->top_idx + browser->height)
                 end_row = browser->height - 1;
         else
-                end_row = end - browser->top_idx;;
+                end_row = end - browser->top_idx;
 
         ui_browser__gotorc(browser, row, column);
         SLsmg_draw_vline(end_row - row + 1);
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 16848bb4c418..a440e03cd8c2 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1847,15 +1847,15 @@ browse_hists:
                         switch (key) {
                         case K_TAB:
                                 if (pos->node.next == &evlist->entries)
-                                        pos = list_entry(evlist->entries.next, struct perf_evsel, node);
+                                        pos = perf_evlist__first(evlist);
                                 else
-                                        pos = list_entry(pos->node.next, struct perf_evsel, node);
+                                        pos = perf_evsel__next(pos);