Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar:
 "Kernel side changes:

   - Add Intel RAPL energy counter support (Stephane Eranian)
   - Clean up uprobes (Oleg Nesterov)
   - Optimize ring-buffer writes (Peter Zijlstra)

  Tooling side changes, user visible:

   - 'perf diff':
     - Add column colouring improvements (Ramkumar Ramachandra)

  - 'perf kvm':
     - Add guest related improvements, including allowing to specify a
       directory with guest specific /proc information (Dongsheng Yang)
     - Add shell completion support (Ramkumar Ramachandra)
     - Add '-v' option (Dongsheng Yang)
     - Support --guestmount (Dongsheng Yang)

   - 'perf probe':
     - Support showing source code, asking for variables to be collected
       at probe time and other 'perf probe' operations that use DWARF
       information.

       This supports only binaries with debugging information at this
       time, detached debuginfo (aka debuginfo packages) support should
       come in later patches (Masami Hiramatsu)

   - 'perf record':
     - Rename --no-delay option to --no-buffering, better reflecting its
       purpose and freeing up '--delay' to take the place of
       '--initial-delay', so that 'record' and 'stat' are consistent
       (Arnaldo Carvalho de Melo)
     - Default the -t/--thread option to no inheritance (Adrian Hunter)
     - Make per-cpu mmaps the default (Adrian Hunter)

   - 'perf report':
     - Improve callchain processing performance (Frederic Weisbecker)
     - Retain bfd reference to lookup source line numbers, greatly
       optimizing, among other use cases, 'perf report -s srcline'
       (Adrian Hunter)
     - Improve callchain processing performance even more (Namhyung Kim)
     - Add a perf.data file header window in the 'perf report' TUI,
       associated with the 'i' hotkey, providing a counterpart to the
       --header option in the stdio UI (Namhyung Kim)

   - 'perf script':
     - Add an option in 'perf script' to print the source line number
       (Adrian Hunter)
     - Add --header/--header-only options to 'script' and 'report', the
       default is not tho show the header info, but as this has been the
       default for some time, leave a single line explaining how to
       obtain that information (Jiri Olsa)
     - Add options to show comm, fork, exit and mmap PERF_RECORD_ events
       (Namhyung Kim)
     - Print callchains and symbols if they exist (David Ahern)

   - 'perf timechart'
     - Add backtrace support to CPU info
     - Print pid along the name
     - Add support for CPU topology
     - Add new option --highlight'ing threads, be it by name or, if a
       numeric value is provided, that run more than given duration
       (Stanislav Fomichev)

   - 'perf top':
     - Make 'perf top -g' refer to callchains, for consistency with
       other tools (David Ahern)

   - 'perf trace':
     - Handle old kernels where the "raw_syscalls" tracepoints were
       called plain "syscalls" (David Ahern)
     - Remove thread summary coloring, by Pekka Enberg.
     - Honour -m option in 'trace', the tool was offering the option to
       set the mmap size, but wasn't using it when doing the actual mmap
       on the events file descriptors (Jiri Olsa)

   - generic:
     - Backport libtraceevent plugin support (trace-cmd repository, with
       plugins for jbd2, hrtimer, kmem, kvm, mac80211, sched_switch,
       function, xen, scsi, cfg80211 (Jiri Olsa)
     - Print session information only if --stdio is given (Namhyung Kim)

  Tooling side changes, developer visible (plumbing):

   - Improve 'perf probe' exit path, release resources (Masami
     Hiramatsu)
   - Improve libtraceevent plugins exit path, allowing the registering
     of an unregister handler to be called at exit time (Namhyung Kim)
   - Add an alias to the build test makefile (make -C tools/perf
     build-test) (Namhyung Kim)
   - Get rid of die() and friends (good riddance!) in libtraceevent
     (Namhyung Kim)
   - Fix cross build problems related to pkgconfig and CROSS_COMPILE not
     being propagated to the feature tests, leading to features being
     tested in the host and then being enabled on the target (Mark
     Rutland)
   - Improve forked workload error reporting by sending the errno in the
     signal data queueing integer field, using sigqueue and by doing the
     signal setup in the evlist methods, removing open coded equivalents
     in various tools (Arnaldo Carvalho de Melo)
   - Do more auto exit cleanup chores in the 'evlist' destructor, so
     that the tools don't have to all do that sequence (Arnaldo Carvalho
     de Melo)
   - Pack 'struct perf_session_env' and 'struct trace' (Arnaldo Carvalho
     de Melo)
   - Add test for building detached source tarballs (Arnaldo Carvalho de
     Melo)
   - Move some header files (tools/perf/ to tools/include/ to make them
     available to other tools/ dwelling codebases (Namhyung Kim)
   - Move logic to warn about kptr_restrict'ed kernels to separate
     function in 'report' (Arnaldo Carvalho de Melo)
   - Move hist browser selection code to separate function (Arnaldo
     Carvalho de Melo)
   - Move histogram entries collapsing to separate function (Arnaldo
     Carvalho de Melo)
   - Introduce evlist__for_each() & friends (Arnaldo Carvalho de Melo)
   - Automate setup of FEATURE_CHECK_(C|LD)FLAGS-all variables (Jiri
     Olsa)
   - Move arch setup into seprate Makefile (Jiri Olsa)
   - Make libtraceevent install target quieter (Jiri Olsa)
   - Make tests/make output more compact (Jiri Olsa)
   - Ignore generated files in feature-checks (Chunwei Chen)
   - Introduce pevent_filter_strerror() in libtraceevent, similar in
     purpose to libc's strerror() function (Namhyung Kim)
   - Use perf_data_file methods to write output file in 'record' and
     'inject' (Jiri Olsa)
   - Use pr_*() functions where applicable in 'report' (Namhyumg Kim)
   - Add 'machine' 'addr_location' struct to have full picture (machine,
     thread, map, symbol, addr) for a (partially) resolved address,
     reducing function signatures (Arnaldo Carvalho de Melo)
   - Reduce code duplication in the histogram entry creation/insertion
     (Arnaldo Carvalho de Melo)
   - Auto allocate annotation histogram data structures (Arnaldo
     Carvalho de Melo)
   - No need to test against NULL before calling free, also set freed
     memory in struct pointers to NULL, to help fixing use after free
     bugs (Arnaldo Carvalho de Melo)
   - Rename some struct DSO binary_type related members and methods, to
     clarify its purpose and need for differentiation (symtab_type, ie
     one is about the files .text, CFI, etc, i.e.  its binary contents,
     and the other is about where the symbol table came from (Arnaldo
     Carvalho de Melo)
   - Convert to new topic libraries, starting with an API one (sysfs,
     debugfs, etc), renaming liblk in the process (Borislav Petkov)
   - Get rid of some more panic() like error handling in libtraceevent.
     (Namhyung Kim)
   - Get rid of panic() like calls in libtraceevent (Namyung Kim)
   - Start carving out symbol parsing routines (perf, just moving
     routines to topic files in tools/lib/symbol/, tools that want to
     use it need to integrate it directly, ie no
     tools/lib/symbol/Makefile is provided (Arnaldo Carvalho de Melo)
   - Assorted refactoring patches, moving code around and adding utility
     evlist methods that will be used in the IPT patchset (Adrian
     Hunter)
   - Assorted mmap_pages handling fixes (Adrian Hunter)
   - Several man pages typo fixes (Dongsheng Yang)
   - Get rid of several die() calls in libtraceevent (Namhyung Kim)
   - Use basename() in a more robust way, to avoid problems related to
     different system library implementations for that function
     (Stephane Eranian)
   - Remove open coded management of short_name_allocated member (Adrian
     Hunter)
   - Several cleanups in the "dso" methods, constifying some parameters
     and renaming some fields to clarify its purpose (Arnaldo Carvalho
     de Melo)
   - Add per-feature check flags, fixing libunwind related build
     problems on some architectures (Jean Pihet)
   - Do not disable source line lookup just because of one failure.
     (Adrian Hunter)
   - Several 'perf kvm' man page corrections (Dongsheng Yang)
   - Correct the message in feature-libnuma checking, swowing the right
     devel package names for various distros (Dongsheng Yang)
   - Polish 'readn()' function and introduce its counterpart,
     'writen()' (Jiri Olsa)
   - Start moving timechart state from global variables to a 'perf_tool'
     derived 'timechart' struct (Arnaldo Carvalho de Melo)

  ... and lots of fixes and improvements I forgot to list"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (282 commits)
  perf tools: Remove unnecessary callchain cursor state restore on unmatch
  perf callchain: Spare double comparison of callchain first entry
  perf tools: Do proper comm override error handling
  perf symbols: Export elf_section_by_name and reuse
  perf probe: Release all dynamically allocated parameters
  perf probe: Release allocated probe_trace_event if failed
  perf tools: Add 'build-test' make target
  tools lib traceevent: Unregister handler when xen plugin is unloaded
  tools lib traceevent: Unregister handler when scsi plugin is unloaded
  tools lib traceevent: Unregister handler when jbd2 plugin is is unloaded
  tools lib traceevent: Unregister handler when cfg80211 plugin is unloaded
  tools lib traceevent: Unregister handler when mac80211 plugin is unloaded
  tools lib traceevent: Unregister handler when sched_switch plugin is unloaded
  tools lib traceevent: Unregister handler when kvm plugin is unloaded
  tools lib traceevent: Unregister handler when kmem plugin is unloaded
  tools lib traceevent: Unregister handler when hrtimer plugin is unloaded
  tools lib traceevent: Unregister handler when function plugin is unloaded
  tools lib traceevent: Add pevent_unregister_print_function()
  tools lib traceevent: Add pevent_unregister_event_handler()
  tools lib traceevent: fix pointer-integer size mismatch
  ...

1 files changed, 128 insertions, 58 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index ee0d565f83e3..8b0e1c9234d9 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -138,6 +138,7 @@ static const char		*post_cmd			= NULL;
 static bool                     sync_run                        = false;
 static unsigned int             interval                        = 0;
 static unsigned int             initial_delay                   = 0;
+static unsigned int             unit_width                      = 4; /* strlen("unit") */
 static bool                     forever                         = false;
 static struct timespec          ref_time;
 static struct cpu_map           *aggr_map;
@@ -184,8 +185,7 @@ static int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel)
 
 static void perf_evsel__free_stat_priv(struct perf_evsel *evsel)
 {
-        free(evsel->priv);
-        evsel->priv = NULL;
+        zfree(&evsel->priv);
 }
 
 static int perf_evsel__alloc_prev_raw_counts(struct perf_evsel *evsel)
@@ -207,15 +207,14 @@ static int perf_evsel__alloc_prev_raw_counts(struct perf_evsel *evsel)
 
 static void perf_evsel__free_prev_raw_counts(struct perf_evsel *evsel)
 {
-        free(evsel->prev_raw_counts);
-        evsel->prev_raw_counts = NULL;
+        zfree(&evsel->prev_raw_counts);
 }
 
 static void perf_evlist__free_stats(struct perf_evlist *evlist)
 {
         struct perf_evsel *evsel;
 
-        list_for_each_entry(evsel, &evlist->entries, node) {
+        evlist__for_each(evlist, evsel) {
                 perf_evsel__free_stat_priv(evsel);
                 perf_evsel__free_counts(evsel);
                 perf_evsel__free_prev_raw_counts(evsel);
@@ -226,7 +225,7 @@ static int perf_evlist__alloc_stats(struct perf_evlist *evlist, bool alloc_raw)
 {
         struct perf_evsel *evsel;
 
-        list_for_each_entry(evsel, &evlist->entries, node) {
+        evlist__for_each(evlist, evsel) {
                 if (perf_evsel__alloc_stat_priv(evsel) < 0 ||
                     perf_evsel__alloc_counts(evsel, perf_evsel__nr_cpus(evsel)) < 0 ||
                     (alloc_raw && perf_evsel__alloc_prev_raw_counts(evsel) < 0))
@@ -260,7 +259,7 @@ static void perf_stat__reset_stats(struct perf_evlist *evlist)
 {
         struct perf_evsel *evsel;
 
-        list_for_each_entry(evsel, &evlist->entries, node) {
+        evlist__for_each(evlist, evsel) {
                 perf_evsel__reset_stat_priv(evsel);
                 perf_evsel__reset_counts(evsel, perf_evsel__nr_cpus(evsel));
         }
@@ -327,13 +326,13 @@ static struct perf_evsel *nth_evsel(int n)
 
         /* Assumes this only called when evsel_list does not change anymore. */
         if (!array) {
-                list_for_each_entry(ev, &evsel_list->entries, node)
+                evlist__for_each(evsel_list, ev)
                         array_len++;
                 array = malloc(array_len * sizeof(void *));
                 if (!array)
                         exit(ENOMEM);
                 j = 0;
-                list_for_each_entry(ev, &evsel_list->entries, node)
+                evlist__for_each(evsel_list, ev)
                         array[j++] = ev;
         }
         if (n < array_len)
@@ -441,13 +440,13 @@ static void print_interval(void)
         char prefix[64];
 
         if (aggr_mode == AGGR_GLOBAL) {
-                list_for_each_entry(counter, &evsel_list->entries, node) {
+                evlist__for_each(evsel_list, counter) {
                         ps = counter->priv;
                         memset(ps->res_stats, 0, sizeof(ps->res_stats));
                         read_counter_aggr(counter);
                 }
         } else  {
-                list_for_each_entry(counter, &evsel_list->entries, node) {
+                evlist__for_each(evsel_list, counter) {
                         ps = counter->priv;
                         memset(ps->res_stats, 0, sizeof(ps->res_stats));
                         read_counter(counter);
@@ -461,17 +460,17 @@ static void print_interval(void)
         if (num_print_interval == 0 && !csv_output) {
                 switch (aggr_mode) {
                 case AGGR_SOCKET:
-                        fprintf(output, "#           time socket cpus             counts events\n");
+                        fprintf(output, "#           time socket cpus             counts %*s events\n", unit_width, "unit");
                         break;
                 case AGGR_CORE:
-                        fprintf(output, "#           time core         cpus             counts events\n");
+                        fprintf(output, "#           time core         cpus             counts %*s events\n", unit_width, "unit");
                         break;
                 case AGGR_NONE:
-                        fprintf(output, "#           time CPU                 counts events\n");
+                        fprintf(output, "#           time CPU                counts %*s events\n", unit_width, "unit");
                         break;
                 case AGGR_GLOBAL:
                 default:
-                        fprintf(output, "#           time             counts events\n");
+                        fprintf(output, "#           time             counts %*s events\n", unit_width, "unit");
                 }
         }
 
@@ -484,12 +483,12 @@ static void print_interval(void)
                 print_aggr(prefix);
                 break;
         case AGGR_NONE:
-                list_for_each_entry(counter, &evsel_list->entries, node)
+                evlist__for_each(evsel_list, counter)
                         print_counter(counter, prefix);
                 break;
         case AGGR_GLOBAL:
         default:
-                list_for_each_entry(counter, &evsel_list->entries, node)
+                evlist__for_each(evsel_list, counter)
                         print_counter_aggr(counter, prefix);
         }
 
@@ -505,17 +504,31 @@ static void handle_initial_delay(void)
                         nthreads = thread_map__nr(evsel_list->threads);
 
                 usleep(initial_delay * 1000);
-                list_for_each_entry(counter, &evsel_list->entries, node)
+                evlist__for_each(evsel_list, counter)
                         perf_evsel__enable(counter, ncpus, nthreads);
         }
 }
 
+static volatile int workload_exec_errno;
+
+/*
+ * perf_evlist__prepare_workload will send a SIGUSR1
+ * if the fork fails, since we asked by setting its
+ * want_signal to true.
+ */
+static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *info,
+                                        void *ucontext __maybe_unused)
+{
+        workload_exec_errno = info->si_value.sival_int;
+}
+
 static int __run_perf_stat(int argc, const char **argv)
 {
         char msg[512];
         unsigned long long t0, t1;
         struct perf_evsel *counter;
         struct timespec ts;
+        size_t l;
         int status = 0;
         const bool forks = (argc > 0);
 
@@ -528,8 +541,8 @@ static int __run_perf_stat(int argc, const char **argv)
         }
 
         if (forks) {
-                if (perf_evlist__prepare_workload(evsel_list, &target, argv,
-                                                  false, false) < 0) {
+                if (perf_evlist__prepare_workload(evsel_list, &target, argv, false,
+                                                  workload_exec_failed_signal) < 0) {
                         perror("failed to prepare workload");
                         return -1;
                 }
@@ -539,7 +552,7 @@ static int __run_perf_stat(int argc, const char **argv)
         if (group)
                 perf_evlist__set_leader(evsel_list);
 
-        list_for_each_entry(counter, &evsel_list->entries, node) {
+        evlist__for_each(evsel_list, counter) {
                 if (create_perf_stat_counter(counter) < 0) {
                         /*
                          * PPC returns ENXIO for HW counters until 2.6.37
@@ -565,6 +578,10 @@ static int __run_perf_stat(int argc, const char **argv)
                         return -1;
                 }
                 counter->supported = true;
+
+                l = strlen(counter->unit);
+                if (l > unit_width)
+                        unit_width = l;
         }
 
         if (perf_evlist__apply_filters(evsel_list)) {
@@ -590,6 +607,13 @@ static int __run_perf_stat(int argc, const char **argv)
                         }
                 }
                 wait(&status);
+
+                if (workload_exec_errno) {
+                        const char *emsg = strerror_r(workload_exec_errno, msg, sizeof(msg));
+                        pr_err("Workload failed: %s\n", emsg);
+                        return -1;
+                }
+
                 if (WIFSIGNALED(status))
                         psignal(WTERMSIG(status), argv[0]);
         } else {
@@ -606,13 +630,13 @@ static int __run_perf_stat(int argc, const char **argv)
         update_stats(&walltime_nsecs_stats, t1 - t0);
 
         if (aggr_mode == AGGR_GLOBAL) {
-                list_for_each_entry(counter, &evsel_list->entries, node) {
+                evlist__for_each(evsel_list, counter) {
                         read_counter_aggr(counter);
                         perf_evsel__close_fd(counter, perf_evsel__nr_cpus(counter),
                                              thread_map__nr(evsel_list->threads));
                 }
         } else {
-                list_for_each_entry(counter, &evsel_list->entries, node) {
+                evlist__for_each(evsel_list, counter) {
                         read_counter(counter);
                         perf_evsel__close_fd(counter, perf_evsel__nr_cpus(counter), 1);
                 }
@@ -621,7 +645,7 @@ static int __run_perf_stat(int argc, const char **argv)
         return WEXITSTATUS(status);
 }
 
-static int run_perf_stat(int argc __maybe_unused, const char **argv)
+static int run_perf_stat(int argc, const char **argv)
 {
         int ret;
 
@@ -704,14 +728,25 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr)
 static void nsec_printout(int cpu, int nr, struct perf_evsel *evsel, double avg)
 {
         double msecs = avg / 1e6;
-        const char *fmt = csv_output ? "%.6f%s%s" : "%18.6f%s%-25s";
+        const char *fmt_v, *fmt_n;
         char name[25];
 
+        fmt_v = csv_output ? "%.6f%s" : "%18.6f%s";
+        fmt_n = csv_output ? "%s" : "%-25s";
+
         aggr_printout(evsel, cpu, nr);
 
         scnprintf(name, sizeof(name), "%s%s",
                   perf_evsel__name(evsel), csv_output ? "" : " (msec)");
-        fprintf(output, fmt, msecs, csv_sep, name);
+
+        fprintf(output, fmt_v, msecs, csv_sep);
+
+        if (csv_output)
+                fprintf(output, "%s%s", evsel->unit, csv_sep);
+        else
+                fprintf(output, "%-*s%s", unit_width, evsel->unit, csv_sep);
+
+        fprintf(output, fmt_n, name);
 
         if (evsel->cgrp)
                 fprintf(output, "%s%s", csv_sep, evsel->cgrp->name);
@@ -908,21 +943,31 @@ static void print_ll_cache_misses(int cpu,
 static void abs_printout(int cpu, int nr, struct perf_evsel *evsel, double avg)
 {
         double total, ratio = 0.0, total2;
+        double sc =  evsel->scale;
         const char *fmt;
 
-        if (csv_output)
-                fmt = "%.0f%s%s";
-        else if (big_num)
-                fmt = "%'18.0f%s%-25s";
-        else
-                fmt = "%18.0f%s%-25s";
+        if (csv_output) {
+                fmt = sc != 1.0 ?  "%.2f%s" : "%.0f%s";
+        } else {
+                if (big_num)
+                        fmt = sc != 1.0 ? "%'18.2f%s" : "%'18.0f%s";
+                else
+                        fmt = sc != 1.0 ? "%18.2f%s" : "%18.0f%s";
+        }
 
         aggr_printout(evsel, cpu, nr);
 
         if (aggr_mode == AGGR_GLOBAL)
                 cpu = 0;
 
-        fprintf(output, fmt, avg, csv_sep, perf_evsel__name(evsel));
+        fprintf(output, fmt, avg, csv_sep);
+
+        if (evsel->unit)
+                fprintf(output, "%-*s%s",
+                        csv_output ? 0 : unit_width,
+                        evsel->unit, csv_sep);
+
+        fprintf(output, "%-*s", csv_output ? 0 : 25, perf_evsel__name(evsel));
 
         if (evsel->cgrp)
                 fprintf(output, "%s%s", csv_sep, evsel->cgrp->name);
@@ -941,7 +986,10 @@ static void abs_printout(int cpu, int nr, struct perf_evsel *evsel, double avg)
 
                 if (total && avg) {
                         ratio = total / avg;
-                        fprintf(output, "\n                                             #   %5.2f  stalled cycles per insn", ratio);
+                        fprintf(output, "\n");
+                        if (aggr_mode == AGGR_NONE)
+                                fprintf(output, "        ");
+                        fprintf(output, "                                                  #   %5.2f  stalled cycles per insn", ratio);
                 }
 
         } else if (perf_evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES) &&
@@ -1061,6 +1109,7 @@ static void print_aggr(char *prefix)
 {
         struct perf_evsel *counter;
         int cpu, cpu2, s, s2, id, nr;
+        double uval;
         u64 ena, run, val;
 
         if (!(aggr_map || aggr_get_id))
@@ -1068,7 +1117,7 @@ static void print_aggr(char *prefix)
 
         for (s = 0; s < aggr_map->nr; s++) {
                 id = aggr_map->map[s];
-                list_for_each_entry(counter, &evsel_list->entries, node) {
+                evlist__for_each(evsel_list, counter) {
                         val = ena = run = 0;
                         nr = 0;
                         for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
@@ -1087,11 +1136,17 @@ static void print_aggr(char *prefix)
                         if (run == 0 || ena == 0) {
                                 aggr_printout(counter, id, nr);
 
-                                fprintf(output, "%*s%s%*s",
+                                fprintf(output, "%*s%s",
                                         csv_output ? 0 : 18,
                                         counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
-                                        csv_sep,
-                                        csv_output ? 0 : -24,
+                                        csv_sep);
+
+                                fprintf(output, "%-*s%s",
+                                        csv_output ? 0 : unit_width,
+                                        counter->unit, csv_sep);
+
+                                fprintf(output, "%*s",
+                                        csv_output ? 0 : -25,
                                         perf_evsel__name(counter));
 
                                 if (counter->cgrp)
@@ -1101,11 +1156,12 @@ static void print_aggr(char *prefix)
                                 fputc('\n', output);
                                 continue;
                         }
+                        uval = val * counter->scale;
 
                         if (nsec_counter(counter))
-                                nsec_printout(id, nr, counter, val);
+                                nsec_printout(id, nr, counter, uval);
                         else
-                                abs_printout(id, nr, counter, val);
+                                abs_printout(id, nr, counter, uval);
 
                         if (!csv_output) {
                                 print_noise(counter, 1.0);
@@ -1128,16 +1184,21 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
         struct perf_stat *ps = counter->priv;
         double avg = avg_stats(&ps->res_stats[0]);
         int scaled = counter->counts->scaled;
+        double uval;
 
         if (prefix)
                 fprintf(output, "%s", prefix);
 
         if (scaled == -1) {
-                fprintf(output, "%*s%s%*s",
+                fprintf(output, "%*s%s",
                         csv_output ? 0 : 18,
                         counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
-                        csv_sep,
-                        csv_output ? 0 : -24,
+                        csv_sep);
+                fprintf(output, "%-*s%s",
+                        csv_output ? 0 : unit_width,
+                        counter->unit, csv_sep);
+                fprintf(output, "%*s",
+                        csv_output ? 0 : -25,
                         perf_evsel__name(counter));
 
                 if (counter->cgrp)
@@ -1147,10 +1208,12 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
                 return;
         }
 
+        uval = avg * counter->scale;
+
         if (nsec_counter(counter))
-                nsec_printout(-1, 0, counter, avg);
+                nsec_printout(-1, 0, counter, uval);
         else
-                abs_printout(-1, 0, counter, avg);
+                abs_printout(-1, 0, counter, uval);
 
         print_noise(counter, avg);
 
@@ -1177,6 +1240,7 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
 static void print_counter(struct perf_evsel *counter, char *prefix)
 {
         u64 ena, run, val;
+        double uval;
         int cpu;
 
         for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
@@ -1188,14 +1252,20 @@ static void print_counter(struct perf_evsel *counter, char *prefix)
                         fprintf(output, "%s", prefix);
 
                 if (run == 0 || ena == 0) {
-                        fprintf(output, "CPU%*d%s%*s%s%*s",
+                        fprintf(output, "CPU%*d%s%*s%s",
                                 csv_output ? 0 : -4,
                                 perf_evsel__cpus(counter)->map[cpu], csv_sep,
                                 csv_output ? 0 : 18,
                                 counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
-                                csv_sep,
-                                csv_output ? 0 : -24,
-                                perf_evsel__name(counter));
+                                csv_sep);
+
+                                fprintf(output, "%-*s%s",
+                                        csv_output ? 0 : unit_width,
+                                        counter->unit, csv_sep);
+
+                                fprintf(output, "%*s",
+                                        csv_output ? 0 : -25,
+                                        perf_evsel__name(counter));
 
                         if (counter->cgrp)
                                 fprintf(output, "%s%s",
@@ -1205,10 +1275,12 @@ static void print_counter(struct perf_evsel *counter, char *prefix)
                         continue;
                 }
 
+                uval = val * counter->scale;
+
                 if (nsec_counter(counter))
-                        nsec_printout(cpu, 0, counter, val);
+                        nsec_printout(cpu, 0, counter, uval);
                 else
-                        abs_printout(cpu, 0, counter, val);
+                        abs_printout(cpu, 0, counter, uval);
 
                 if (!csv_output) {
                         print_noise(counter, 1.0);
@@ -1256,11 +1328,11 @@ static void print_stat(int argc, const char **argv)
                 print_aggr(NULL);
                 break;
         case AGGR_GLOBAL:
-                list_for_each_entry(counter, &evsel_list->entries, node)
+                evlist__for_each(evsel_list, counter)
                         print_counter_aggr(counter, NULL);
                 break;
         case AGGR_NONE:
-                list_for_each_entry(counter, &evsel_list->entries, node)
+                evlist__for_each(evsel_list, counter)
                         print_counter(counter, NULL);
                 break;
         default:
@@ -1710,14 +1782,14 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
         if (interval && interval < 100) {
                 pr_err("print interval must be >= 100ms\n");
                 parse_options_usage(stat_usage, options, "I", 1);
-                goto out_free_maps;
+                goto out;
         }
 
         if (perf_evlist__alloc_stats(evsel_list, interval))
-                goto out_free_maps;
+                goto out;
 
         if (perf_stat_init_aggr_mode())
-                goto out_free_maps;
+                goto out;
 
         /*
          * We dont want to block the signals - that would cause
@@ -1749,8 +1821,6 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
                 print_stat(argc, argv);
 
         perf_evlist__free_stats(evsel_list);
-out_free_maps:
-        perf_evlist__delete_maps(evsel_list);
 out:
         perf_evlist__delete(evsel_list);
         return status;