Merge branch 'renesas/soc' into next/soc2

6 files changed, 43 insertions, 19 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 0abfb18b911f..227b6ae99785 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -204,6 +204,9 @@ static void perf_record__open(struct perf_record *rec)
 
                 if (opts->group && pos != first)
                         group_fd = first->fd;
+fallback_missing_features:
+                if (opts->exclude_guest_missing)
+                        attr->exclude_guest = attr->exclude_host = 0;
 retry_sample_id:
                 attr->sample_id_all = opts->sample_id_all_avail ? 1 : 0;
 try_again:
@@ -217,15 +220,23 @@ try_again:
                         } else if (err ==  ENODEV && opts->cpu_list) {
                                 die("No such device - did you specify"
                                         " an out-of-range profile CPU?\n");
-                        } else if (err == EINVAL && opts->sample_id_all_avail) {
-                                /*
-                                 * Old kernel, no attr->sample_id_type_all field
-                                 */
-                                opts->sample_id_all_avail = false;
-                                if (!opts->sample_time && !opts->raw_samples && !time_needed)
-                                        attr->sample_type &= ~PERF_SAMPLE_TIME;
-
-                                goto retry_sample_id;
+                        } else if (err == EINVAL) {
+                                if (!opts->exclude_guest_missing &&
+                                    (attr->exclude_guest || attr->exclude_host)) {
+                                        pr_debug("Old kernel, cannot exclude "
+                                                 "guest or host samples.\n");
+                                        opts->exclude_guest_missing = true;
+                                        goto fallback_missing_features;
+                                } else if (opts->sample_id_all_avail) {
+                                        /*
+                                         * Old kernel, no attr->sample_id_type_all field
+                                         */
+                                        opts->sample_id_all_avail = false;
+                                        if (!opts->sample_time && !opts->raw_samples && !time_needed)
+                                                attr->sample_type &= ~PERF_SAMPLE_TIME;
+
+                                        goto retry_sample_id;
+                                }
                         }
 
                         /*
@@ -503,9 +514,9 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
                         return err;
         }
 
-        if (!!rec->no_buildid
+        if (!rec->no_buildid
             && !perf_header__has_feat(&session->header, HEADER_BUILD_ID)) {
-                pr_err("Couldn't generating buildids. "
+                pr_err("Couldn't generate buildids. "
                        "Use --no-buildid to profile anyway.\n");
                 return -1;
         }
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index dd162aa24baa..ecff31257eb3 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -857,6 +857,9 @@ static void perf_top__start_counters(struct perf_top *top)
                 attr->mmap = 1;
                 attr->comm = 1;
                 attr->inherit = top->inherit;
+fallback_missing_features:
+                if (top->exclude_guest_missing)
+                        attr->exclude_guest = attr->exclude_host = 0;
 retry_sample_id:
                 attr->sample_id_all = top->sample_id_all_avail ? 1 : 0;
 try_again:
@@ -868,12 +871,20 @@ try_again:
                         if (err == EPERM || err == EACCES) {
                                 ui__error_paranoid();
                                 goto out_err;
-                        } else if (err == EINVAL && top->sample_id_all_avail) {
-                                /*
-                                 * Old kernel, no attr->sample_id_type_all field
-                                 */
-                                top->sample_id_all_avail = false;
-                                goto retry_sample_id;
+                        } else if (err == EINVAL) {
+                                if (!top->exclude_guest_missing &&
+                                    (attr->exclude_guest || attr->exclude_host)) {
+                                        pr_debug("Old kernel, cannot exclude "
+                                                 "guest or host samples.\n");
+                                        top->exclude_guest_missing = true;
+                                        goto fallback_missing_features;
+                                } else if (top->sample_id_all_avail) {
+                                        /*
+                                         * Old kernel, no attr->sample_id_type_all field
+                                         */
+                                        top->sample_id_all_avail = false;
+                                        goto retry_sample_id;
+                                }
                         }
                         /*
                          * If it's cycles then fall back to hrtimer
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 64f8bee31ced..16e7d20eee83 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -199,6 +199,7 @@ struct perf_record_opts {
         bool         sample_address;
         bool         sample_time;
         bool         sample_id_all_avail;
+        bool         exclude_guest_missing;
         bool         system_wide;
         bool         period;
         unsigned int freq;
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index b029296d20d9..c7a6f6faf91e 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -165,7 +165,7 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
         struct tracepoint_path *path = NULL;
         DIR *sys_dir, *evt_dir;
         struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;
-        char id_buf[4];
+        char id_buf[24];
         int fd;
         u64 id;
         char evt_path[MAXPATHLEN];
diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h
index a248f3c2c60d..f2eab81435ae 100644
--- a/tools/perf/util/top.h
+++ b/tools/perf/util/top.h
@@ -34,6 +34,7 @@ struct perf_top {
         bool               inherit;
         bool               group;
         bool               sample_id_all_avail;
+        bool               exclude_guest_missing;
         bool               dump_symtab;
         const char         *cpu_list;
         struct hist_entry  *sym_filter_entry;
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 813141047fc2..fb25d1329218 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -6,7 +6,7 @@
  * XXX We need to find a better place for these things...
  */
 bool perf_host  = true;
-bool perf_guest = true;
+bool perf_guest = false;
 
 void event_attr_init(struct perf_event_attr *attr)
 {