Merge 5.1-rc3 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 94 insertions, 35 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 53f78cf3113f..61cfd8f70989 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -29,10 +29,12 @@
 #include "util/time-utils.h"
 #include "util/path.h"
 #include "print_binary.h"
+#include "archinsn.h"
 #include <linux/bitmap.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
 #include <linux/time64.h>
+#include <sys/utsname.h>
 #include "asm/bug.h"
 #include "util/mem-events.h"
 #include "util/dump-insn.h"
@@ -51,6 +53,8 @@
 
 static char const               *script_name;
 static char const               *generate_script_lang;
+static bool                     reltime;
+static u64                      initial_time;
 static bool                     debug_mode;
 static u64                      last_timestamp;
 static u64                      nr_unordered;
@@ -58,11 +62,11 @@ static bool			no_callchain;
 static bool                     latency_format;
 static bool                     system_wide;
 static bool                     print_flags;
-static bool                     nanosecs;
 static const char               *cpu_list;
 static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
 static struct perf_stat_config  stat_config;
 static int                      max_blocks;
+static bool                     native_arch;
 
 unsigned int scripting_max_stack = PERF_MAX_STACK_DEPTH;
 
@@ -684,15 +688,21 @@ static int perf_sample__fprintf_start(struct perf_sample *sample,
         }
 
         if (PRINT_FIELD(TIME)) {
-                nsecs = sample->time;
+                u64 t = sample->time;
+                if (reltime) {
+                        if (!initial_time)
+                                initial_time = sample->time;
+                        t = sample->time - initial_time;
+                }
+                nsecs = t;
                 secs = nsecs / NSEC_PER_SEC;
                 nsecs -= secs * NSEC_PER_SEC;
 
-                if (nanosecs)
+                if (symbol_conf.nanosecs)
                         printed += fprintf(fp, "%5lu.%09llu: ", secs, nsecs);
                 else {
                         char sample_time[32];
-                        timestamp__scnprintf_usec(sample->time, sample_time, sizeof(sample_time));
+                        timestamp__scnprintf_usec(t, sample_time, sizeof(sample_time));
                         printed += fprintf(fp, "%12s: ", sample_time);
                 }
         }
@@ -1227,6 +1237,12 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample,
         return len + dlen;
 }
 
+__weak void arch_fetch_insn(struct perf_sample *sample __maybe_unused,
+                            struct thread *thread __maybe_unused,
+                            struct machine *machine __maybe_unused)
+{
+}
+
 static int perf_sample__fprintf_insn(struct perf_sample *sample,
                                      struct perf_event_attr *attr,
                                      struct thread *thread,
@@ -1234,9 +1250,12 @@ static int perf_sample__fprintf_insn(struct perf_sample *sample,
 {
         int printed = 0;
 
+        if (sample->insn_len == 0 && native_arch)
+                arch_fetch_insn(sample, thread, machine);
+
         if (PRINT_FIELD(INSNLEN))
                 printed += fprintf(fp, " ilen: %d", sample->insn_len);
-        if (PRINT_FIELD(INSN)) {
+        if (PRINT_FIELD(INSN) && sample->insn_len) {
                 int i;
 
                 printed += fprintf(fp, " insn:");
@@ -1922,6 +1941,13 @@ static int cleanup_scripting(void)
         return scripting_ops ? scripting_ops->stop_script() : 0;
 }
 
+static bool filter_cpu(struct perf_sample *sample)
+{
+        if (cpu_list)
+                return !test_bit(sample->cpu, cpu_bitmap);
+        return false;
+}
+
 static int process_sample_event(struct perf_tool *tool,
                                 union perf_event *event,
                                 struct perf_sample *sample,
@@ -1956,7 +1982,7 @@ static int process_sample_event(struct perf_tool *tool,
         if (al.filtered)
                 goto out_put;
 
-        if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))
+        if (filter_cpu(sample))
                 goto out_put;
 
         if (scripting_ops)
@@ -2041,9 +2067,11 @@ static int process_comm_event(struct perf_tool *tool,
                 sample->tid = event->comm.tid;
                 sample->pid = event->comm.pid;
         }
-        perf_sample__fprintf_start(sample, thread, evsel,
+        if (!filter_cpu(sample)) {
+                perf_sample__fprintf_start(sample, thread, evsel,
                                    PERF_RECORD_COMM, stdout);
-        perf_event__fprintf(event, stdout);
+                perf_event__fprintf(event, stdout);
+        }
         ret = 0;
 out:
         thread__put(thread);
@@ -2077,9 +2105,11 @@ static int process_namespaces_event(struct perf_tool *tool,
                 sample->tid = event->namespaces.tid;
                 sample->pid = event->namespaces.pid;
         }
-        perf_sample__fprintf_start(sample, thread, evsel,
-                                   PERF_RECORD_NAMESPACES, stdout);
-        perf_event__fprintf(event, stdout);
+        if (!filter_cpu(sample)) {
+                perf_sample__fprintf_start(sample, thread, evsel,
+                                           PERF_RECORD_NAMESPACES, stdout);
+                perf_event__fprintf(event, stdout);
+        }
         ret = 0;
 out:
         thread__put(thread);
@@ -2111,9 +2141,11 @@ static int process_fork_event(struct perf_tool *tool,
                 sample->tid = event->fork.tid;
                 sample->pid = event->fork.pid;
         }
-        perf_sample__fprintf_start(sample, thread, evsel,
-                                   PERF_RECORD_FORK, stdout);
-        perf_event__fprintf(event, stdout);
+        if (!filter_cpu(sample)) {
+                perf_sample__fprintf_start(sample, thread, evsel,
+                                           PERF_RECORD_FORK, stdout);
+                perf_event__fprintf(event, stdout);
+        }
         thread__put(thread);
 
         return 0;
@@ -2141,9 +2173,11 @@ static int process_exit_event(struct perf_tool *tool,
                 sample->tid = event->fork.tid;
                 sample->pid = event->fork.pid;
         }
-        perf_sample__fprintf_start(sample, thread, evsel,
-                                   PERF_RECORD_EXIT, stdout);
-        perf_event__fprintf(event, stdout);
+        if (!filter_cpu(sample)) {
+                perf_sample__fprintf_start(sample, thread, evsel,
+                                           PERF_RECORD_EXIT, stdout);
+                perf_event__fprintf(event, stdout);
+        }
 
         if (perf_event__process_exit(tool, event, sample, machine) < 0)
                 err = -1;
@@ -2177,9 +2211,11 @@ static int process_mmap_event(struct perf_tool *tool,
                 sample->tid = event->mmap.tid;
                 sample->pid = event->mmap.pid;
         }
-        perf_sample__fprintf_start(sample, thread, evsel,
-                                   PERF_RECORD_MMAP, stdout);
-        perf_event__fprintf(event, stdout);
+        if (!filter_cpu(sample)) {
+                perf_sample__fprintf_start(sample, thread, evsel,
+                                           PERF_RECORD_MMAP, stdout);
+                perf_event__fprintf(event, stdout);
+        }
         thread__put(thread);
         return 0;
 }
@@ -2209,9 +2245,11 @@ static int process_mmap2_event(struct perf_tool *tool,
                 sample->tid = event->mmap2.tid;
                 sample->pid = event->mmap2.pid;
         }
-        perf_sample__fprintf_start(sample, thread, evsel,
-                                   PERF_RECORD_MMAP2, stdout);
-        perf_event__fprintf(event, stdout);
+        if (!filter_cpu(sample)) {
+                perf_sample__fprintf_start(sample, thread, evsel,
+                                           PERF_RECORD_MMAP2, stdout);
+                perf_event__fprintf(event, stdout);
+        }
         thread__put(thread);
         return 0;
 }
@@ -2236,9 +2274,11 @@ static int process_switch_event(struct perf_tool *tool,
                 return -1;
         }
 
-        perf_sample__fprintf_start(sample, thread, evsel,
-                                   PERF_RECORD_SWITCH, stdout);
-        perf_event__fprintf(event, stdout);
+        if (!filter_cpu(sample)) {
+                perf_sample__fprintf_start(sample, thread, evsel,
+                                           PERF_RECORD_SWITCH, stdout);
+                perf_event__fprintf(event, stdout);
+        }
         thread__put(thread);
         return 0;
 }
@@ -2259,9 +2299,11 @@ process_lost_event(struct perf_tool *tool,
         if (thread == NULL)
                 return -1;
 
-        perf_sample__fprintf_start(sample, thread, evsel,
-                                   PERF_RECORD_LOST, stdout);
-        perf_event__fprintf(event, stdout);
+        if (!filter_cpu(sample)) {
+                perf_sample__fprintf_start(sample, thread, evsel,
+                                           PERF_RECORD_LOST, stdout);
+                perf_event__fprintf(event, stdout);
+        }
         thread__put(thread);
         return 0;
 }
@@ -2948,7 +2990,8 @@ static int check_ev_match(char *dir_name, char *scriptname,
  * will list all statically runnable scripts, select one, execute it and
  * show the output in a perf browser.
  */
-int find_scripts(char **scripts_array, char **scripts_path_array)
+int find_scripts(char **scripts_array, char **scripts_path_array, int num,
+                 int pathlen)
 {
         struct dirent *script_dirent, *lang_dirent;
         char scripts_path[MAXPATHLEN], lang_path[MAXPATHLEN];
@@ -2993,7 +3036,10 @@ int find_scripts(char **scripts_array, char **scripts_path_array)
                         /* Skip those real time scripts: xxxtop.p[yl] */
                         if (strstr(script_dirent->d_name, "top."))
                                 continue;
-                        sprintf(scripts_path_array[i], "%s/%s", lang_path,
+                        if (i >= num)
+                                break;
+                        snprintf(scripts_path_array[i], pathlen, "%s/%s",
+                                lang_path,
                                 script_dirent->d_name);
                         temp = strchr(script_dirent->d_name, '.');
                         snprintf(scripts_array[i],
@@ -3232,7 +3278,7 @@ static int parse_insn_trace(const struct option *opt __maybe_unused,
 {
         parse_output_fields(NULL, "+insn,-event,-period", 0);
         itrace_parse_synth_opts(opt, "i0ns", 0);
-        nanosecs = true;
+        symbol_conf.nanosecs = true;
         return 0;
 }
 
@@ -3250,7 +3296,7 @@ static int parse_call_trace(const struct option *opt __maybe_unused,
 {
         parse_output_fields(NULL, "-ip,-addr,-event,-period,+callindent", 0);
         itrace_parse_synth_opts(opt, "cewp", 0);
-        nanosecs = true;
+        symbol_conf.nanosecs = true;
         return 0;
 }
 
@@ -3260,7 +3306,7 @@ static int parse_callret_trace(const struct option *opt __maybe_unused,
 {
         parse_output_fields(NULL, "-ip,-addr,-event,-period,+callindent,+flags", 0);
         itrace_parse_synth_opts(opt, "crewp", 0);
-        nanosecs = true;
+        symbol_conf.nanosecs = true;
         return 0;
 }
 
@@ -3277,6 +3323,7 @@ int cmd_script(int argc, const char **argv)
                 .set = false,
                 .default_no_sample = true,
         };
+        struct utsname uts;
         char *script_path = NULL;
         const char **__argv;
         int i, j, err = 0;
@@ -3374,6 +3421,7 @@ int cmd_script(int argc, const char **argv)
                      "Set the maximum stack depth when parsing the callchain, "
                      "anything beyond the specified depth will be ignored. "
                      "Default: kernel.perf_event_max_stack or " __stringify(PERF_MAX_STACK_DEPTH)),
+        OPT_BOOLEAN(0, "reltime", &reltime, "Show time stamps relative to start"),
         OPT_BOOLEAN('I', "show-info", &show_full_info,
                     "display extended information from perf.data file"),
         OPT_BOOLEAN('\0', "show-kernel-path", &symbol_conf.show_kernel_path,
@@ -3395,7 +3443,7 @@ int cmd_script(int argc, const char **argv)
         OPT_BOOLEAN('f', "force", &symbol_conf.force, "don't complain, do it"),
         OPT_INTEGER(0, "max-blocks", &max_blocks,
                     "Maximum number of code blocks to dump with brstackinsn"),
-        OPT_BOOLEAN(0, "ns", &nanosecs,
+        OPT_BOOLEAN(0, "ns", &symbol_conf.nanosecs,
                     "Use 9 decimal places when displaying time"),
         OPT_CALLBACK_OPTARG(0, "itrace", &itrace_synth_opts, NULL, "opts",
                             "Instruction Tracing options\n" ITRACE_HELP,
@@ -3448,6 +3496,11 @@ int cmd_script(int argc, const char **argv)
                 }
         }
 
+        if (script.time_str && reltime) {
+                fprintf(stderr, "Don't combine --reltime with --time\n");
+                return -1;
+        }
+
         if (itrace_synth_opts.callchain &&
             itrace_synth_opts.callchain_sz > scripting_max_stack)
                 scripting_max_stack = itrace_synth_opts.callchain_sz;
@@ -3615,6 +3668,12 @@ int cmd_script(int argc, const char **argv)
         if (symbol__init(&session->header.env) < 0)
                 goto out_delete;
 
+        uname(&uts);
+        if (!strcmp(uts.machine, session->header.env.arch) ||
+            (!strcmp(uts.machine, "x86_64") &&
+             !strcmp(session->header.env.arch, "i386")))
+                native_arch = true;
+
         script.session = session;
         script__setup_sample_type(&script);