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

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Fix TUI progress bar when delta from new total from that of the
  previous update is greater than the progress "step" (screen width
  progress bar block))  (Jiri Olsa)

- Make tools/lib/api make DEBUG=1 build use -D_FORTIFY_SOURCE=2 not
  to cripple debuginfo, just like tools/perf/ does (Jiri Olsa)

- Avoid leaking the 'perf.data' file to workloads started from the
  'perf record' command line by using the O_CLOEXEC open flag (Jiri Olsa)

- Fix building when libunwind's 'unwind.h' file is present in the
  include path, clashing with tools/perf/util/unwind.h (Milian Wolff)

- Check per .perfconfig section entry flag, not just per section (Taeung Song)

- Support running perf binaries with a dash in their name, needed to
  run perf as an AppImage (Milian Wolff)

- Wait for the right child by using waitpid() when running workloads
  from 'perf stat', also to fix using perf as an AppImage (Milian Wolff)

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

6 files changed, 32 insertions, 10 deletions

diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 3ddcc6e2abeb..a1d82e33282c 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -59,7 +59,7 @@ static int set_config(struct perf_config_set *set, const char *file_name,
                 fprintf(fp, "[%s]\n", section->name);
 
                 perf_config_items__for_each_entry(&section->items, item) {
-                        if (!use_system_config && section->from_system_config)
+                        if (!use_system_config && item->from_system_config)
                                 continue;
                         if (item->value)
                                 fprintf(fp, "\t%s = %s\n",
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 85e992d9215b..69523ed55894 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -707,7 +707,7 @@ try_again:
                                 process_interval();
                         }
                 }
-                wait(&status);
+                waitpid(child_pid, &status, 0);
 
                 if (workload_exec_errno) {
                         const char *emsg = str_error_r(workload_exec_errno, msg, sizeof(msg));
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index e0279babe0c0..2f19e03c5c40 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -467,15 +467,21 @@ int main(int argc, const char **argv)
          *  - cannot execute it externally (since it would just do
          *    the same thing over again)
          *
-         * So we just directly call the internal command handler, and
-         * die if that one cannot handle it.
+         * So we just directly call the internal command handler. If that one
+         * fails to handle this, then maybe we just run a renamed perf binary
+         * that contains a dash in its name. To handle this scenario, we just
+         * fall through and ignore the "xxxx" part of the command string.
          */
         if (strstarts(cmd, "perf-")) {
                 cmd += 5;
                 argv[0] = cmd;
                 handle_internal_command(argc, argv);
-                fprintf(stderr, "cannot handle %s internally", cmd);
-                goto out;
+                /*
+                 * If the command is handled, the above function does not
+                 * return undo changes and fall through in such a case.
+                 */
+                cmd -= 5;
+                argv[0] = cmd;
         }
         if (strstarts(cmd, "trace")) {
 #ifdef HAVE_LIBAUDIT_SUPPORT
diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c
index 2a7b9b47bbcb..9ba1d216a89f 100644
--- a/tools/perf/tests/dwarf-unwind.c
+++ b/tools/perf/tests/dwarf-unwind.c
@@ -6,7 +6,7 @@
 #include "debug.h"
 #include "machine.h"
 #include "event.h"
-#include "unwind.h"
+#include "../util/unwind.h"
 #include "perf_regs.h"
 #include "map.h"
 #include "thread.h"
diff --git a/tools/perf/ui/progress.c b/tools/perf/ui/progress.c
index a0f24c7115c5..ae91c8148edf 100644
--- a/tools/perf/ui/progress.c
+++ b/tools/perf/ui/progress.c
@@ -1,3 +1,4 @@
+#include <linux/kernel.h>
 #include "../cache.h"
 #include "progress.h"
 
@@ -14,10 +15,14 @@ struct ui_progress_ops *ui_progress__ops = &null_progress__ops;
 
 void ui_progress__update(struct ui_progress *p, u64 adv)
 {
+        u64 last = p->curr;
+
         p->curr += adv;
 
         if (p->curr >= p->next) {
-                p->next += p->step;
+                u64 nr = DIV_ROUND_UP(p->curr - last, p->step);
+
+                p->next += nr * p->step;
                 ui_progress__ops->update(p);
         }
 }
@@ -25,7 +30,7 @@ void ui_progress__update(struct ui_progress *p, u64 adv)
 void ui_progress__init(struct ui_progress *p, u64 total, const char *title)
 {
         p->curr = 0;
-        p->next = p->step = total / 16;
+        p->next = p->step = total / 16 ?: 1;
         p->total = total;
         p->title = title;
 
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index e84bbc8ec058..263f5a906ba5 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -10,6 +10,16 @@
 #include "util.h"
 #include "debug.h"
 
+#ifndef O_CLOEXEC
+#ifdef __sparc__
+#define O_CLOEXEC       0x400000
+#elif defined(__alpha__) || defined(__hppa__)
+#define O_CLOEXEC       010000000
+#else
+#define O_CLOEXEC       02000000
+#endif
+#endif
+
 static bool check_pipe(struct perf_data_file *file)
 {
         struct stat st;
@@ -96,7 +106,8 @@ static int open_file_write(struct perf_data_file *file)
         if (check_backup(file))
                 return -1;
 
-        fd = open(file->path, O_CREAT|O_RDWR|O_TRUNC, S_IRUSR|S_IWUSR);
+        fd = open(file->path, O_CREAT|O_RDWR|O_TRUNC|O_CLOEXEC,
+                  S_IRUSR|S_IWUSR);
 
         if (fd < 0)
                 pr_err("failed to open %s : %s\n", file->path,