10 files changed, 103 insertions, 17 deletions

diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index 31f934af9861..a91cd99f26ea 100644
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -16,6 +16,7 @@
 
 static int build_id__mark_dso_hit(union perf_event *event,
                                   struct perf_sample *sample __used,
+                                  struct perf_evsel *evsel __used,
                                   struct perf_session *session)
 {
         struct addr_location al;
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index e5230c0ef95b..93862a8027ea 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -695,13 +695,50 @@ out:
         return err;
 }
 
+static int perf_header__read_build_ids_abi_quirk(struct perf_header *header,
+                                                 int input, u64 offset, u64 size)
+{
+        struct perf_session *session = container_of(header, struct perf_session, header);
+        struct {
+                struct perf_event_header   header;
+                u8                         build_id[ALIGN(BUILD_ID_SIZE, sizeof(u64))];
+                char                       filename[0];
+        } old_bev;
+        struct build_id_event bev;
+        char filename[PATH_MAX];
+        u64 limit = offset + size;
+
+        while (offset < limit) {
+                ssize_t len;
+
+                if (read(input, &old_bev, sizeof(old_bev)) != sizeof(old_bev))
+                        return -1;
+
+                if (header->needs_swap)
+                        perf_event_header__bswap(&old_bev.header);
+
+                len = old_bev.header.size - sizeof(old_bev);
+                if (read(input, filename, len) != len)
+                        return -1;
+
+                bev.header = old_bev.header;
+                bev.pid    = 0;
+                memcpy(bev.build_id, old_bev.build_id, sizeof(bev.build_id));
+                __event_process_build_id(&bev, filename, session);
+
+                offset += bev.header.size;
+        }
+
+        return 0;
+}
+
 static int perf_header__read_build_ids(struct perf_header *header,
                                        int input, u64 offset, u64 size)
 {
         struct perf_session *session = container_of(header, struct perf_session, header);
         struct build_id_event bev;
         char filename[PATH_MAX];
-        u64 limit = offset + size;
+        u64 limit = offset + size, orig_offset = offset;
         int err = -1;
 
         while (offset < limit) {
@@ -716,6 +753,24 @@ static int perf_header__read_build_ids(struct perf_header *header,
                 len = bev.header.size - sizeof(bev);
                 if (read(input, filename, len) != len)
                         goto out;
+                /*
+                 * The a1645ce1 changeset:
+                 *
+                 * "perf: 'perf kvm' tool for monitoring guest performance from host"
+                 *
+                 * Added a field to struct build_id_event that broke the file
+                 * format.
+                 *
+                 * Since the kernel build-id is the first entry, process the
+                 * table using the old format if the well known
+                 * '[kernel.kallsyms]' string for the kernel build-id has the
+                 * first 4 characters chopped off (where the pid_t sits).
+                 */
+                if (memcmp(filename, "nel.kallsyms]", 13) == 0) {
+                        if (lseek(input, orig_offset, SEEK_SET) == (off_t)-1)
+                                return -1;
+                        return perf_header__read_build_ids_abi_quirk(header, input, offset, size);
+                }
 
                 __event_process_build_id(&bev, filename, session);
 
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index cb6858a2f9a3..3beb97c4d822 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -29,6 +29,7 @@ struct events_stats {
         u32 nr_events[PERF_RECORD_HEADER_MAX];
         u32 nr_unknown_events;
         u32 nr_invalid_chains;
+        u32 nr_unknown_id;
 };
 
 enum hist_column {
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 621427212e86..74350ffb57fe 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -247,6 +247,7 @@ static inline struct event *find_cache_event(int type)
 
 static void perl_process_event(union perf_event *pevent __unused,
                                struct perf_sample *sample,
+                               struct perf_evsel *evsel,
                                struct perf_session *session __unused,
                                struct thread *thread)
 {
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 1b85d6055159..6ccf70e8d8f2 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -206,6 +206,7 @@ static inline struct event *find_cache_event(int type)
 
 static void python_process_event(union perf_event *pevent __unused,
                                  struct perf_sample *sample,
+                                 struct perf_evsel *evsel __unused,
                                  struct perf_session *session __unused,
                                  struct thread *thread)
 {
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index c68cf40764f9..caa224522fea 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -280,6 +280,15 @@ static int process_event_synth_stub(union perf_event *event __used,
         return 0;
 }
 
+static int process_event_sample_stub(union perf_event *event __used,
+                                     struct perf_sample *sample __used,
+                                     struct perf_evsel *evsel __used,
+                                     struct perf_session *session __used)
+{
+        dump_printf(": unhandled!\n");
+        return 0;
+}
+
 static int process_event_stub(union perf_event *event __used,
                               struct perf_sample *sample __used,
                               struct perf_session *session __used)
@@ -303,7 +312,7 @@ static int process_finished_round(union perf_event *event,
 static void perf_event_ops__fill_defaults(struct perf_event_ops *handler)
 {
         if (handler->sample == NULL)
-                handler->sample = process_event_stub;
+                handler->sample = process_event_sample_stub;
         if (handler->mmap == NULL)
                 handler->mmap = process_event_stub;
         if (handler->comm == NULL)
@@ -698,12 +707,19 @@ static int perf_session_deliver_event(struct perf_session *session,
                                       struct perf_event_ops *ops,
                                       u64 file_offset)
 {
+        struct perf_evsel *evsel;
+
         dump_event(session, event, file_offset, sample);
 
         switch (event->header.type) {
         case PERF_RECORD_SAMPLE:
                 dump_sample(session, event, sample);
-                return ops->sample(event, sample, session);
+                evsel = perf_evlist__id2evsel(session->evlist, sample->id);
+                if (evsel == NULL) {
+                        ++session->hists.stats.nr_unknown_id;
+                        return -1;
+                }
+                return ops->sample(event, sample, evsel, session);
         case PERF_RECORD_MMAP:
                 return ops->mmap(event, sample, session);
         case PERF_RECORD_COMM:
@@ -845,6 +861,11 @@ static void perf_session__warn_about_errors(const struct perf_session *session,
                             session->hists.stats.nr_unknown_events);
         }
 
+        if (session->hists.stats.nr_unknown_id != 0) {
+                ui__warning("%u samples with id not present in the header\n",
+                            session->hists.stats.nr_unknown_id);
+        }
+
         if (session->hists.stats.nr_invalid_chains != 0) {
                 ui__warning("Found invalid callchains!\n\n"
                             "%u out of %u events were discarded for this reason.\n\n"
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 0b3c9afecaa9..1ac481fc1100 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -55,8 +55,11 @@ struct perf_session {
         char                    filename[0];
 };
 
+struct perf_evsel;
 struct perf_event_ops;
 
+typedef int (*event_sample)(union perf_event *event, struct perf_sample *sample,
+                            struct perf_evsel *evsel, struct perf_session *session);
 typedef int (*event_op)(union perf_event *self, struct perf_sample *sample,
                         struct perf_session *session);
 typedef int (*event_synth_op)(union perf_event *self,
@@ -65,8 +68,8 @@ typedef int (*event_op2)(union perf_event *self, struct perf_session *session,
                          struct perf_event_ops *ops);
 
 struct perf_event_ops {
-        event_op        sample,
-                        mmap,
+        event_sample    sample;
+        event_op        mmap,
                         comm,
                         fork,
                         exit,
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 651dbfe7f4f3..17df793c8924 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1486,7 +1486,9 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
          * On the first pass, only load images if they have a full symtab.
          * Failing that, do a second pass where we accept .dynsym also
          */
-        for (self->symtab_type = SYMTAB__BUILD_ID_CACHE, want_symtab = 1;
+        want_symtab = 1;
+restart:
+        for (self->symtab_type = SYMTAB__BUILD_ID_CACHE;
              self->symtab_type != SYMTAB__NOT_FOUND;
              self->symtab_type++) {
                 switch (self->symtab_type) {
@@ -1536,17 +1538,7 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
                         snprintf(name, size, "%s%s", symbol_conf.symfs,
                                  self->long_name);
                         break;
-
-                default:
-                        /*
-                         * If we wanted a full symtab but no image had one,
-                         * relax our requirements and repeat the search.
-                         */
-                        if (want_symtab) {
-                                want_symtab = 0;
-                                self->symtab_type = SYMTAB__BUILD_ID_CACHE;
-                        } else
-                                continue;
+                default:;
                 }
 
                 /* Name is now the name of the next image to try */
@@ -1573,6 +1565,15 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
                 }
         }
 
+        /*
+         * If we wanted a full symtab but no image had one,
+         * relax our requirements and repeat the search.
+         */
+        if (ret <= 0 && want_symtab) {
+                want_symtab = 0;
+                goto restart;
+        }
+
         free(name);
         if (ret < 0 && strstr(self->name, " (deleted)") != NULL)
                 return 0;
diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index 66f4b78737ab..c9dcbec7d800 100644
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -38,6 +38,7 @@ static int stop_script_unsupported(void)
 
 static void process_event_unsupported(union perf_event *event __unused,
                                       struct perf_sample *sample __unused,
+                                      struct perf_evsel *evsel __unused,
                                       struct perf_session *session __unused,
                                       struct thread *thread __unused)
 {
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index b04da5722437..f674dda3363b 100644
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -280,6 +280,7 @@ struct scripting_ops {
         int (*stop_script) (void);
         void (*process_event) (union perf_event *event,
                                struct perf_sample *sample,
+                               struct perf_evsel *evsel,
                                struct perf_session *session,
                                struct thread *thread);
         int (*generate_script) (const char *outfile);