Merge commit 'v3.14' into next

1 files changed, 85 insertions, 45 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 8be17fc462ba..f954c26de231 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -11,6 +11,8 @@
 #include "util/intlist.h"
 #include "util/thread_map.h"
 #include "util/stat.h"
+#include "trace-event.h"
+#include "util/parse-events.h"
 
 #include <libaudit.h>
 #include <stdlib.h>
@@ -35,6 +37,10 @@
 # define MADV_UNMERGEABLE       13
 #endif
 
+#ifndef EFD_SEMAPHORE
+# define EFD_SEMAPHORE          1
+#endif
+
 struct tp_field {
         int offset;
         union {
@@ -144,8 +150,7 @@ static int perf_evsel__init_tp_ptr_field(struct perf_evsel *evsel,
 
 static void perf_evsel__delete_priv(struct perf_evsel *evsel)
 {
-        free(evsel->priv);
-        evsel->priv = NULL;
+        zfree(&evsel->priv);
         perf_evsel__delete(evsel);
 }
 
@@ -163,8 +168,7 @@ static int perf_evsel__init_syscall_tp(struct perf_evsel *evsel, void *handler)
         return -ENOMEM;
 
 out_delete:
-        free(evsel->priv);
-        evsel->priv = NULL;
+        zfree(&evsel->priv);
         return -ENOENT;
 }
 
@@ -172,6 +176,10 @@ static struct perf_evsel *perf_evsel__syscall_newtp(const char *direction, void
 {
         struct perf_evsel *evsel = perf_evsel__newtp("raw_syscalls", direction);
 
+        /* older kernel (e.g., RHEL6) use syscalls:{enter,exit} */
+        if (evsel == NULL)
+                evsel = perf_evsel__newtp("syscalls", direction);
+
         if (evsel) {
                 if (perf_evsel__init_syscall_tp(evsel, handler))
                         goto out_delete;
@@ -275,6 +283,11 @@ static size_t syscall_arg__scnprintf_strarray(char *bf, size_t size,
 
 #define SCA_STRARRAY syscall_arg__scnprintf_strarray
 
+#if defined(__i386__) || defined(__x86_64__)
+/*
+ * FIXME: Make this available to all arches as soon as the ioctl beautifier
+ *        gets rewritten to support all arches.
+ */
 static size_t syscall_arg__scnprintf_strhexarray(char *bf, size_t size,
                                                  struct syscall_arg *arg)
 {
@@ -282,6 +295,7 @@ static size_t syscall_arg__scnprintf_strhexarray(char *bf, size_t size,
 }
 
 #define SCA_STRHEXARRAY syscall_arg__scnprintf_strhexarray
+#endif /* defined(__i386__) || defined(__x86_64__) */
 
 static size_t syscall_arg__scnprintf_fd(char *bf, size_t size,
                                         struct syscall_arg *arg);
@@ -811,7 +825,6 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal
         P_SIGNUM(PIPE);
         P_SIGNUM(ALRM);
         P_SIGNUM(TERM);
-        P_SIGNUM(STKFLT);
         P_SIGNUM(CHLD);
         P_SIGNUM(CONT);
         P_SIGNUM(STOP);
@@ -827,6 +840,15 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal
         P_SIGNUM(IO);
         P_SIGNUM(PWR);
         P_SIGNUM(SYS);
+#ifdef SIGEMT
+        P_SIGNUM(EMT);
+#endif
+#ifdef SIGSTKFLT
+        P_SIGNUM(STKFLT);
+#endif
+#ifdef SIGSWI
+        P_SIGNUM(SWI);
+#endif
         default: break;
         }
 
@@ -835,6 +857,10 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal
 
 #define SCA_SIGNUM syscall_arg__scnprintf_signum
 
+#if defined(__i386__) || defined(__x86_64__)
+/*
+ * FIXME: Make this available to all arches.
+ */
 #define TCGETS          0x5401
 
 static const char *tioctls[] = {
@@ -856,6 +882,7 @@ static const char *tioctls[] = {
 };
 
 static DEFINE_STRARRAY_OFFSET(tioctls, 0x5401);
+#endif /* defined(__i386__) || defined(__x86_64__) */
 
 #define STRARRAY(arg, name, array) \
           .arg_scnprintf = { [arg] = SCA_STRARRAY, }, \
@@ -937,9 +964,16 @@ static struct syscall_fmt {
         { .name     = "getrlimit",  .errmsg = true, STRARRAY(0, resource, rlimit_resources), },
         { .name     = "ioctl",      .errmsg = true,
           .arg_scnprintf = { [0] = SCA_FD, /* fd */ 
+#if defined(__i386__) || defined(__x86_64__)
+/*
+ * FIXME: Make this available to all arches.
+ */
                              [1] = SCA_STRHEXARRAY, /* cmd */
                              [2] = SCA_HEX, /* arg */ },
           .arg_parm      = { [1] = &strarray__tioctls, /* cmd */ }, },
+#else
+                             [2] = SCA_HEX, /* arg */ }, },
+#endif
         { .name     = "kill",       .errmsg = true,
           .arg_scnprintf = { [1] = SCA_SIGNUM, /* sig */ }, },
         { .name     = "linkat",     .errmsg = true,
@@ -1153,29 +1187,30 @@ struct trace {
                 int             max;
                 struct syscall  *table;
         } syscalls;
-        struct perf_record_opts opts;
+        struct record_opts      opts;
         struct machine          *host;
         u64                     base_time;
-        bool                    full_time;
         FILE                    *output;
         unsigned long           nr_events;
         struct strlist          *ev_qualifier;
-        bool                    not_ev_qualifier;
-        bool                    live;
         const char              *last_vfs_getname;
         struct intlist          *tid_list;
         struct intlist          *pid_list;
+        double                  duration_filter;
+        double                  runtime_ms;
+        struct {
+                u64             vfs_getname,
+                                proc_getname;
+        } stats;
+        bool                    not_ev_qualifier;
+        bool                    live;
+        bool                    full_time;
         bool                    sched;
         bool                    multiple_threads;
         bool                    summary;
         bool                    summary_only;
         bool                    show_comm;
         bool                    show_tool_stats;
-        double                  duration_filter;
-        double                  runtime_ms;
-        struct {
-                u64             vfs_getname, proc_getname;
-        } stats;
 };
 
 static int trace__set_fd_pathname(struct thread *thread, int fd, const char *pathname)
@@ -1272,10 +1307,8 @@ static size_t syscall_arg__scnprintf_close_fd(char *bf, size_t size,
         size_t printed = syscall_arg__scnprintf_fd(bf, size, arg);
         struct thread_trace *ttrace = arg->thread->priv;
 
-        if (ttrace && fd >= 0 && fd <= ttrace->paths.max) {
-                free(ttrace->paths.table[fd]);
-                ttrace->paths.table[fd] = NULL;
-        }
+        if (ttrace && fd >= 0 && fd <= ttrace->paths.max)
+                zfree(&ttrace->paths.table[fd]);
 
         return printed;
 }
@@ -1430,11 +1463,11 @@ static int trace__read_syscall_info(struct trace *trace, int id)
         sc->fmt  = syscall_fmt__find(sc->name);
 
         snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name);
-        sc->tp_format = event_format__new("syscalls", tp_name);
+        sc->tp_format = trace_event__tp_format("syscalls", tp_name);
 
         if (sc->tp_format == NULL && sc->fmt && sc->fmt->alias) {
                 snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->fmt->alias);
-                sc->tp_format = event_format__new("syscalls", tp_name);
+                sc->tp_format = trace_event__tp_format("syscalls", tp_name);
         }
 
         if (sc->tp_format == NULL)
@@ -1764,8 +1797,10 @@ static int trace__process_sample(struct perf_tool *tool,
         if (!trace->full_time && trace->base_time == 0)
                 trace->base_time = sample->time;
 
-        if (handler)
+        if (handler) {
+                ++trace->nr_events;
                 handler(trace, evsel, sample);
+        }
 
         return err;
 }
@@ -1800,10 +1835,11 @@ static int trace__record(int argc, const char **argv)
                 "-R",
                 "-m", "1024",
                 "-c", "1",
-                "-e", "raw_syscalls:sys_enter,raw_syscalls:sys_exit",
+                "-e",
         };
 
-        rec_argc = ARRAY_SIZE(record_args) + argc;
+        /* +1 is for the event string below */
+        rec_argc = ARRAY_SIZE(record_args) + 1 + argc;
         rec_argv = calloc(rec_argc + 1, sizeof(char *));
 
         if (rec_argv == NULL)
@@ -1812,6 +1848,17 @@ static int trace__record(int argc, const char **argv)
         for (i = 0; i < ARRAY_SIZE(record_args); i++)
                 rec_argv[i] = record_args[i];
 
+        /* event string may be different for older kernels - e.g., RHEL6 */
+        if (is_valid_tracepoint("raw_syscalls:sys_enter"))
+                rec_argv[i] = "raw_syscalls:sys_enter,raw_syscalls:sys_exit";
+        else if (is_valid_tracepoint("syscalls:sys_enter"))
+                rec_argv[i] = "syscalls:sys_enter,syscalls:sys_exit";
+        else {
+                pr_err("Neither raw_syscalls nor syscalls events exist.\n");
+                return -1;
+        }
+        i++;
+
         for (j = 0; j < (unsigned int)argc; j++, i++)
                 rec_argv[i] = argv[j];
 
@@ -1869,7 +1916,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
         err = trace__symbols_init(trace, evlist);
         if (err < 0) {
                 fprintf(trace->output, "Problems initializing symbol libraries!\n");
-                goto out_delete_maps;
+                goto out_delete_evlist;
         }
 
         perf_evlist__config(evlist, &trace->opts);
@@ -1879,10 +1926,10 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
 
         if (forks) {
                 err = perf_evlist__prepare_workload(evlist, &trace->opts.target,
-                                                    argv, false, false);
+                                                    argv, false, NULL);
                 if (err < 0) {
                         fprintf(trace->output, "Couldn't run the workload!\n");
-                        goto out_delete_maps;
+                        goto out_delete_evlist;
                 }
         }
 
@@ -1890,10 +1937,10 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
         if (err < 0)
                 goto out_error_open;
 
-        err = perf_evlist__mmap(evlist, UINT_MAX, false);
+        err = perf_evlist__mmap(evlist, trace->opts.mmap_pages, false);
         if (err < 0) {
                 fprintf(trace->output, "Couldn't mmap the events: %s\n", strerror(errno));
-                goto out_close_evlist;
+                goto out_delete_evlist;
         }
 
         perf_evlist__enable(evlist);
@@ -1977,11 +2024,6 @@ out_disable:
                 }
         }
 
-        perf_evlist__munmap(evlist);
-out_close_evlist:
-        perf_evlist__close(evlist);
-out_delete_maps:
-        perf_evlist__delete_maps(evlist);
 out_delete_evlist:
         perf_evlist__delete(evlist);
 out:
@@ -2047,6 +2089,10 @@ static int trace__replay(struct trace *trace)
 
         evsel = perf_evlist__find_tracepoint_by_name(session->evlist,
                                                      "raw_syscalls:sys_enter");
+        /* older kernels have syscalls tp versus raw_syscalls */
+        if (evsel == NULL)
+                evsel = perf_evlist__find_tracepoint_by_name(session->evlist,
+                                                             "syscalls:sys_enter");
         if (evsel == NULL) {
                 pr_err("Data file does not have raw_syscalls:sys_enter event\n");
                 goto out;
@@ -2060,6 +2106,9 @@ static int trace__replay(struct trace *trace)
 
         evsel = perf_evlist__find_tracepoint_by_name(session->evlist,
                                                      "raw_syscalls:sys_exit");
+        if (evsel == NULL)
+                evsel = perf_evlist__find_tracepoint_by_name(session->evlist,
+                                                             "syscalls:sys_exit");
         if (evsel == NULL) {
                 pr_err("Data file does not have raw_syscalls:sys_exit event\n");
                 goto out;
@@ -2158,7 +2207,6 @@ static int trace__fprintf_one_thread(struct thread *thread, void *priv)
         size_t printed = data->printed;
         struct trace *trace = data->trace;
         struct thread_trace *ttrace = thread->priv;
-        const char *color;
         double ratio;
 
         if (ttrace == NULL)
@@ -2166,17 +2214,9 @@ static int trace__fprintf_one_thread(struct thread *thread, void *priv)
 
         ratio = (double)ttrace->nr_events / trace->nr_events * 100.0;
 
-        color = PERF_COLOR_NORMAL;
-        if (ratio > 50.0)
-                color = PERF_COLOR_RED;
-        else if (ratio > 25.0)
-                color = PERF_COLOR_GREEN;
-        else if (ratio > 5.0)
-                color = PERF_COLOR_YELLOW;
-
-        printed += color_fprintf(fp, color, " %s (%d), ", thread__comm_str(thread), thread->tid);
+        printed += fprintf(fp, " %s (%d), ", thread__comm_str(thread), thread->tid);
         printed += fprintf(fp, "%lu events, ", ttrace->nr_events);
-        printed += color_fprintf(fp, color, "%.1f%%", ratio);
+        printed += fprintf(fp, "%.1f%%", ratio);
         printed += fprintf(fp, ", %.3f msec\n", ttrace->runtime_ms);
         printed += thread__dump_stats(ttrace, trace, fp);
 
@@ -2248,7 +2288,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
                         },
                         .user_freq     = UINT_MAX,
                         .user_interval = ULLONG_MAX,
-                        .no_delay      = true,
+                        .no_buffering  = true,
                         .mmap_pages    = 1024,
                 },
                 .output = stdout,