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

Pull perf updates from Ingo Molnar:
 "As a first remark I'd like to note that the way to build perf tooling
  has been simplified and sped up, in the future it should be enough for
  you to build perf via:

        cd tools/perf/
        make install

  (ie without the -j option.) The build system will figure out the
  number of CPUs and will do a parallel build+install.

  The various build system inefficiencies and breakages Linus reported
  against the v3.12 pull request should now be resolved - please
  (re-)report any remaining annoyances or bugs.

  Main changes on the perf kernel side:

   * Performance optimizations:
      . perf ring-buffer code optimizations,          by Peter Zijlstra
      . perf ring-buffer code optimizations,          by Oleg Nesterov
      . x86 NMI call-stack processing optimizations,  by Peter Zijlstra
      . perf context-switch optimizations,            by Peter Zijlstra
      . perf sampling speedups,                       by Peter Zijlstra
      . x86 Intel PEBS processing speedups,           by Peter Zijlstra

   * Enhanced hardware support:
      . for Intel Ivy Bridge-EP uncore PMUs,          by Zheng Yan
      . for Haswell transactions,                     by Andi Kleen, Peter Zijlstra

   * Core perf events code enhancements and fixes by Oleg Nesterov:
      . for uprobes, if fork() is called with pending ret-probes
      . for uprobes platform support code

   * New ABI details by Andi Kleen:
      . Report x86 Haswell TSX transaction abort cost as weight

  Main changes on the perf tooling side (some of these tooling changes
  utilize the above kernel side changes):

   * 'perf report/top' enhancements:

      . Convert callchain children list to rbtree, greatly reducing the
        time taken for callchain processing, from Namhyung Kim.

      . Add new COMM infrastructure, further improving histogram
        processing, from Frédéric Weisbecker, one fix from Namhyung Kim.

      . Add /proc/kcore based live-annotation improvements, including
        build-id cache support, multi map 'call' instruction navigation
        fixes, kcore address validation, objdump workarounds.  From
        Adrian Hunter.

      . Show progress on histogram collapsing, that can take a long
        time, from Namhyung Kim.

      . Add --max-stack option to limit callchain stack scan in 'top'
        and 'report', improving callchain processing when reducing the
        stack depth is an option, from Waiman Long.

      . Add new option --ignore-vmlinux for perf top, from Willy
        Tarreau.

   * 'perf trace' enhancements:

      . 'perf trace' now can can use a 'perf probe' dynamic tracepoints
        to hook into the userspace -> kernel pathname copy so that it
        can map fds to pathnames without reading /proc/pid/fd/ symlinks.
        From Arnaldo Carvalho de Melo.

      . Show VFS path associated with fd in live sessions, using a
        'vfs_getname' 'perf probe' created dynamic tracepoint or by
        looking at /proc/pid/fd, from Arnaldo Carvalho de Melo.

      . Add 'trace' beautifiers for lots of syscall arguments, from
        Arnaldo Carvalho de Melo.

      . Implement more compact 'trace' output by suppressing zeroed
        args, from Arnaldo Carvalho de Melo.

      . Show thread COMM by default in 'trace', from Arnaldo Carvalho de
        Melo.

      . Add option to show full timestamp in 'trace', from David Ahern.

      . Add 'record' command in 'trace', to record raw_syscalls:*, from
        David Ahern.

      . Add summary option to dump syscall statistics in 'trace', from
        David Ahern.

      . Improve error messages in 'trace', providing hints about system
        configuration steps needed for using it, from Ramkumar
        Ramachandra.

      . 'perf trace' now emits hints as to why tracing is not possible,
        helping the user to setup the system to allow tracing in the
        desired permission granularity, telling if the problem is due to
        debugfs not being mounted or with not enough permission for
        !root, /proc/sys/kernel/perf_event_paranoit value, etc.  From
        Arnaldo Carvalho de Melo.

   * 'perf record' enhancements:

      . Check maximum frequency rate for record/top, emitting better
        error messages, from Jiri Olsa.

      . 'perf record' code cleanups, from David Ahern.

      . Improve write_output error message in 'perf record', from Adrian
        Hunter.

      . Allow specifying B/K/M/G unit to the --mmap-pages arguments,
        from Jiri Olsa.

      . Fix command line callchain attribute tests to handle the new
        -g/--call-chain semantics, from Arnaldo Carvalho de Melo.

   * 'perf kvm' enhancements:

      . Disable live kvm command if timerfd is not supported, from David
        Ahern.

      . Fix detection of non-core features, from David Ahern.

   * 'perf list' enhancements:

      . Add usage to 'perf list', from David Ahern.

      . Show error in 'perf list' if tracepoints not available, from
        Pekka Enberg.

   * 'perf probe' enhancements:

      . Support "$vars" meta argument syntax for local variables,
        allowing asking for all possible variables at a given probe
        point to be collected when it hits, from Masami Hiramatsu.

   * 'perf sched' enhancements:

      . Address the root cause of that 'perf sched' stack initialization
        build slowdown, by programmatically setting a big array after
        moving the global variable back to the stack.  Fix from Adrian
        Hunter.

   * 'perf script' enhancements:

      . Set up output options for in-stream attributes, from Adrian
        Hunter.

      . Print addr by default for BTS in 'perf script', from Adrian
        Juntmer

   * 'perf stat' enhancements:

      . Improved messages when doing profiling in all or a subset of
        CPUs using a workload as the session delimitator, as in:

         'perf stat --cpu 0,2 sleep 10s'

        from Arnaldo Carvalho de Melo.

      . Add units to nanosec-based counters in 'perf stat', from David
        Ahern.

      . Remove bogus info when using 'perf stat' -e cycles/instructions,
        from Ramkumar Ramachandra.

   * 'perf lock' enhancements:

      . 'perf lock' fixes and cleanups, from Davidlohr Bueso.

   * 'perf test' enhancements:

      . Fixup PERF_SAMPLE_TRANSACTION handling in sample synthesizing
        and 'perf test', from Adrian Hunter.

      . Clarify the "sample parsing" test entry, from Arnaldo Carvalho
        de Melo.

      . Consider PERF_SAMPLE_TRANSACTION in the "sample parsing" test,
        from Arnaldo Carvalho de Melo.

      . Memory leak fixes in 'perf test', from Felipe Pena.

   * 'perf bench' enhancements:

      . Change the procps visible command-name of invididual benchmark
        tests plus cleanups, from Ingo Molnar.

   * Generic perf tooling infrastructure/plumbing changes:

      . Separating data file properties from session, code
        reorganization from Jiri Olsa.

      . Fix version when building out of tree, as when using one of
        these:

        $ make help | grep perf
          perf-tar-src-pkg    - Build perf-3.12.0.tar source tarball
          perf-targz-src-pkg  - Build perf-3.12.0.tar.gz source tarball
          perf-tarbz2-src-pkg - Build perf-3.12.0.tar.bz2 source tarball
          perf-tarxz-src-pkg  - Build perf-3.12.0.tar.xz source tarball
        $

        from David Ahern.

      . Enhance option parse error message, showing just the help lines
        of the options affected, from Namhyung Kim.

      . libtraceevent updates from upstream trace-cmd repo, from Steven
        Rostedt.

      . Always use perf_evsel__set_sample_bit to set sample_type, from
        Adrian Hunter.

      . Memory and mmap leak fixes from Chenggang Qin.

      . Assorted build fixes for from David Ahern and Jiri Olsa.

      . Speed up and prettify the build system, from Ingo Molnar.

      . Implement addr2line directly using libbfd, from Roberto Vitillo.

      . Separate the GTK support in a separate libperf-gtk.so DSO, that
        is only loaded when --gtk is specified, from Namhyung Kim.

      . perf bash completion fixes and improvements from Ramkumar
        Ramachandra.

      . Support for Openembedded/Yocto -dbg packages, from Ricardo
        Ribalda Delgado.

  And lots and lots of other fixes and code reorganizations that did not
  make it into the list, see the shortlog, diffstat and the Git log for
  details!"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (300 commits)
  uprobes: Fix the memory out of bound overwrite in copy_insn()
  uprobes: Fix the wrong usage of current->utask in uprobe_copy_process()
  perf tools: Remove unneeded include
  perf record: Remove post_processing_offset variable
  perf record: Remove advance_output function
  perf record: Refactor feature handling into a separate function
  perf trace: Don't relookup fields by name in each sample
  perf tools: Fix version when building out of tree
  perf evsel: Ditch evsel->handler.data field
  uprobes: Export write_opcode() as uprobe_write_opcode()
  uprobes: Introduce arch_uprobe->ixol
  uprobes: Kill module_init() and module_exit()
  uprobes: Move function declarations out of arch
  perf/x86/intel: Add Ivy Bridge-EP uncore IRP box support
  perf/x86/intel/uncore: Add filter support for IvyBridge-EP QPI boxes
  perf: Factor out strncpy() in perf_event_mmap_event()
  tools/perf: Add required memory barriers
  perf: Fix arch_perf_out_copy_user default
  perf: Update a stale comment
  perf: Optimize perf_output_begin() -- address calculation
  ...

1 files changed, 130 insertions, 88 deletions

diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index 2bc9e70df7e2..31f404a032a9 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -339,10 +339,10 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
                 if (arg[1] != '-') {
                         ctx->opt = arg + 1;
                         if (internal_help && *ctx->opt == 'h')
-                                return parse_options_usage(usagestr, options);
+                                return usage_with_options_internal(usagestr, options, 0);
                         switch (parse_short_opt(ctx, options)) {
                         case -1:
-                                return parse_options_usage(usagestr, options);
+                                return parse_options_usage(usagestr, options, arg + 1, 1);
                         case -2:
                                 goto unknown;
                         default:
@@ -352,10 +352,11 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
                                 check_typos(arg + 1, options);
                         while (ctx->opt) {
                                 if (internal_help && *ctx->opt == 'h')
-                                        return parse_options_usage(usagestr, options);
+                                        return usage_with_options_internal(usagestr, options, 0);
+                                arg = ctx->opt;
                                 switch (parse_short_opt(ctx, options)) {
                                 case -1:
-                                        return parse_options_usage(usagestr, options);
+                                        return parse_options_usage(usagestr, options, arg, 1);
                                 case -2:
                                         /* fake a short option thing to hide the fact that we may have
                                          * started to parse aggregated stuff
@@ -383,12 +384,12 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
                 if (internal_help && !strcmp(arg + 2, "help-all"))
                         return usage_with_options_internal(usagestr, options, 1);
                 if (internal_help && !strcmp(arg + 2, "help"))
-                        return parse_options_usage(usagestr, options);
+                        return usage_with_options_internal(usagestr, options, 0);
                 if (!strcmp(arg + 2, "list-opts"))
                         return PARSE_OPT_LIST;
                 switch (parse_long_opt(ctx, arg + 2, options)) {
                 case -1:
-                        return parse_options_usage(usagestr, options);
+                        return parse_options_usage(usagestr, options, arg + 2, 0);
                 case -2:
                         goto unknown;
                 default:
@@ -445,6 +446,89 @@ int parse_options(int argc, const char **argv, const struct option *options,
 #define USAGE_OPTS_WIDTH 24
 #define USAGE_GAP         2
 
+static void print_option_help(const struct option *opts, int full)
+{
+        size_t pos;
+        int pad;
+
+        if (opts->type == OPTION_GROUP) {
+                fputc('\n', stderr);
+                if (*opts->help)
+                        fprintf(stderr, "%s\n", opts->help);
+                return;
+        }
+        if (!full && (opts->flags & PARSE_OPT_HIDDEN))
+                return;
+
+        pos = fprintf(stderr, "    ");
+        if (opts->short_name)
+                pos += fprintf(stderr, "-%c", opts->short_name);
+        else
+                pos += fprintf(stderr, "    ");
+
+        if (opts->long_name && opts->short_name)
+                pos += fprintf(stderr, ", ");
+        if (opts->long_name)
+                pos += fprintf(stderr, "--%s", opts->long_name);
+
+        switch (opts->type) {
+        case OPTION_ARGUMENT:
+                break;
+        case OPTION_LONG:
+        case OPTION_U64:
+        case OPTION_INTEGER:
+        case OPTION_UINTEGER:
+                if (opts->flags & PARSE_OPT_OPTARG)
+                        if (opts->long_name)
+                                pos += fprintf(stderr, "[=<n>]");
+                        else
+                                pos += fprintf(stderr, "[<n>]");
+                else
+                        pos += fprintf(stderr, " <n>");
+                break;
+        case OPTION_CALLBACK:
+                if (opts->flags & PARSE_OPT_NOARG)
+                        break;
+                /* FALLTHROUGH */
+        case OPTION_STRING:
+                if (opts->argh) {
+                        if (opts->flags & PARSE_OPT_OPTARG)
+                                if (opts->long_name)
+                                        pos += fprintf(stderr, "[=<%s>]", opts->argh);
+                                else
+                                        pos += fprintf(stderr, "[<%s>]", opts->argh);
+                        else
+                                pos += fprintf(stderr, " <%s>", opts->argh);
+                } else {
+                        if (opts->flags & PARSE_OPT_OPTARG)
+                                if (opts->long_name)
+                                        pos += fprintf(stderr, "[=...]");
+                                else
+                                        pos += fprintf(stderr, "[...]");
+                        else
+                                pos += fprintf(stderr, " ...");
+                }
+                break;
+        default: /* OPTION_{BIT,BOOLEAN,SET_UINT,SET_PTR} */
+        case OPTION_END:
+        case OPTION_GROUP:
+        case OPTION_BIT:
+        case OPTION_BOOLEAN:
+        case OPTION_INCR:
+        case OPTION_SET_UINT:
+        case OPTION_SET_PTR:
+                break;
+        }
+
+        if (pos <= USAGE_OPTS_WIDTH)
+                pad = USAGE_OPTS_WIDTH - pos;
+        else {
+                fputc('\n', stderr);
+                pad = USAGE_OPTS_WIDTH;
+        }
+        fprintf(stderr, "%*s%s\n", pad + USAGE_GAP, "", opts->help);
+}
+
 int usage_with_options_internal(const char * const *usagestr,
                                 const struct option *opts, int full)
 {
@@ -464,87 +548,9 @@ int usage_with_options_internal(const char * const *usagestr,
         if (opts->type != OPTION_GROUP)
                 fputc('\n', stderr);
 
-        for (; opts->type != OPTION_END; opts++) {
-                size_t pos;
-                int pad;
-
-                if (opts->type == OPTION_GROUP) {
-                        fputc('\n', stderr);
-                        if (*opts->help)
-                                fprintf(stderr, "%s\n", opts->help);
-                        continue;
-                }
-                if (!full && (opts->flags & PARSE_OPT_HIDDEN))
-                        continue;
-
-                pos = fprintf(stderr, "    ");
-                if (opts->short_name)
-                        pos += fprintf(stderr, "-%c", opts->short_name);
-                else
-                        pos += fprintf(stderr, "    ");
-
-                if (opts->long_name && opts->short_name)
-                        pos += fprintf(stderr, ", ");
-                if (opts->long_name)
-                        pos += fprintf(stderr, "--%s", opts->long_name);
-
-                switch (opts->type) {
-                case OPTION_ARGUMENT:
-                        break;
-                case OPTION_LONG:
-                case OPTION_U64:
-                case OPTION_INTEGER:
-                case OPTION_UINTEGER:
-                        if (opts->flags & PARSE_OPT_OPTARG)
-                                if (opts->long_name)
-                                        pos += fprintf(stderr, "[=<n>]");
-                                else
-                                        pos += fprintf(stderr, "[<n>]");
-                        else
-                                pos += fprintf(stderr, " <n>");
-                        break;
-                case OPTION_CALLBACK:
-                        if (opts->flags & PARSE_OPT_NOARG)
-                                break;
-                        /* FALLTHROUGH */
-                case OPTION_STRING:
-                        if (opts->argh) {
-                                if (opts->flags & PARSE_OPT_OPTARG)
-                                        if (opts->long_name)
-                                                pos += fprintf(stderr, "[=<%s>]", opts->argh);
-                                        else
-                                                pos += fprintf(stderr, "[<%s>]", opts->argh);
-                                else
-                                        pos += fprintf(stderr, " <%s>", opts->argh);
-                        } else {
-                                if (opts->flags & PARSE_OPT_OPTARG)
-                                        if (opts->long_name)
-                                                pos += fprintf(stderr, "[=...]");
-                                        else
-                                                pos += fprintf(stderr, "[...]");
-                                else
-                                        pos += fprintf(stderr, " ...");
-                        }
-                        break;
-                default: /* OPTION_{BIT,BOOLEAN,SET_UINT,SET_PTR} */
-                case OPTION_END:
-                case OPTION_GROUP:
-                case OPTION_BIT:
-                case OPTION_BOOLEAN:
-                case OPTION_INCR:
-                case OPTION_SET_UINT:
-                case OPTION_SET_PTR:
-                        break;
-                }
+        for (  ; opts->type != OPTION_END; opts++)
+                print_option_help(opts, full);
 
-                if (pos <= USAGE_OPTS_WIDTH)
-                        pad = USAGE_OPTS_WIDTH - pos;
-                else {
-                        fputc('\n', stderr);
-                        pad = USAGE_OPTS_WIDTH;
-                }
-                fprintf(stderr, "%*s%s\n", pad + USAGE_GAP, "", opts->help);
-        }
         fputc('\n', stderr);
 
         return PARSE_OPT_HELP;
@@ -559,9 +565,45 @@ void usage_with_options(const char * const *usagestr,
 }
 
 int parse_options_usage(const char * const *usagestr,
-                        const struct option *opts)
+                        const struct option *opts,
+                        const char *optstr, bool short_opt)
 {
-        return usage_with_options_internal(usagestr, opts, 0);
+        if (!usagestr)
+                goto opt;
+
+        fprintf(stderr, "\n usage: %s\n", *usagestr++);
+        while (*usagestr && **usagestr)
+                fprintf(stderr, "    or: %s\n", *usagestr++);
+        while (*usagestr) {
+                fprintf(stderr, "%s%s\n",
+                                **usagestr ? "    " : "",
+                                *usagestr);
+                usagestr++;
+        }
+        fputc('\n', stderr);
+
+opt:
+        for (  ; opts->type != OPTION_END; opts++) {
+                if (short_opt) {
+                        if (opts->short_name == *optstr)
+                                break;
+                        continue;
+                }
+
+                if (opts->long_name == NULL)
+                        continue;
+
+                if (!prefixcmp(optstr, opts->long_name))
+                        break;
+                if (!prefixcmp(optstr, "no-") &&
+                    !prefixcmp(optstr + 3, opts->long_name))
+                        break;
+        }
+
+        if (opts->type != OPTION_END)
+                print_option_help(opts, 0);
+
+        return PARSE_OPT_HELP;
 }