1 files changed, 99 insertions, 6 deletions

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 0022e02ed31a..7fa68663ed72 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -17,6 +17,7 @@
 #include "util/build-id.h"
 #include "util/data.h"
 #include "util/auxtrace.h"
+#include "util/jit.h"
 
 #include <subcmd/parse-options.h>
 
@@ -29,6 +30,7 @@ struct perf_inject {
         bool                    sched_stat;
         bool                    have_auxtrace;
         bool                    strip;
+        bool                    jit_mode;
         const char              *input_name;
         struct perf_data_file   output;
         u64                     bytes_written;
@@ -71,6 +73,15 @@ static int perf_event__repipe_oe_synth(struct perf_tool *tool,
         return perf_event__repipe_synth(tool, event);
 }
 
+#ifdef HAVE_JITDUMP
+static int perf_event__drop_oe(struct perf_tool *tool __maybe_unused,
+                               union perf_event *event __maybe_unused,
+                               struct ordered_events *oe __maybe_unused)
+{
+        return 0;
+}
+#endif
+
 static int perf_event__repipe_op2_synth(struct perf_tool *tool,
                                         union perf_event *event,
                                         struct perf_session *session
@@ -234,6 +245,31 @@ static int perf_event__repipe_mmap(struct perf_tool *tool,
         return err;
 }
 
+#ifdef HAVE_JITDUMP
+static int perf_event__jit_repipe_mmap(struct perf_tool *tool,
+                                       union perf_event *event,
+                                       struct perf_sample *sample,
+                                       struct machine *machine)
+{
+        struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
+        u64 n = 0;
+        int ret;
+
+        /*
+         * if jit marker, then inject jit mmaps and generate ELF images
+         */
+        ret = jit_process(inject->session, &inject->output, machine,
+                          event->mmap.filename, sample->pid, &n);
+        if (ret < 0)
+                return ret;
+        if (ret) {
+                inject->bytes_written += n;
+                return 0;
+        }
+        return perf_event__repipe_mmap(tool, event, sample, machine);
+}
+#endif
+
 static int perf_event__repipe_mmap2(struct perf_tool *tool,
                                    union perf_event *event,
                                    struct perf_sample *sample,
@@ -247,6 +283,31 @@ static int perf_event__repipe_mmap2(struct perf_tool *tool,
         return err;
 }
 
+#ifdef HAVE_JITDUMP
+static int perf_event__jit_repipe_mmap2(struct perf_tool *tool,
+                                        union perf_event *event,
+                                        struct perf_sample *sample,
+                                        struct machine *machine)
+{
+        struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
+        u64 n = 0;
+        int ret;
+
+        /*
+         * if jit marker, then inject jit mmaps and generate ELF images
+         */
+        ret = jit_process(inject->session, &inject->output, machine,
+                          event->mmap2.filename, sample->pid, &n);
+        if (ret < 0)
+                return ret;
+        if (ret) {
+                inject->bytes_written += n;
+                return 0;
+        }
+        return perf_event__repipe_mmap2(tool, event, sample, machine);
+}
+#endif
+
 static int perf_event__repipe_fork(struct perf_tool *tool,
                                    union perf_event *event,
                                    struct perf_sample *sample,
@@ -626,12 +687,16 @@ static int __cmd_inject(struct perf_inject *inject)
         ret = perf_session__process_events(session);
 
         if (!file_out->is_pipe) {
-                if (inject->build_ids) {
+                if (inject->build_ids)
                         perf_header__set_feat(&session->header,
                                               HEADER_BUILD_ID);
-                        if (inject->have_auxtrace)
-                                dsos__hit_all(session);
-                }
+                /*
+                 * Keep all buildids when there is unprocessed AUX data because
+                 * it is not known which ones the AUX trace hits.
+                 */
+                if (perf_header__has_feat(&session->header, HEADER_BUILD_ID) &&
+                    inject->have_auxtrace && !inject->itrace_synth_opts.set)
+                        dsos__hit_all(session);
                 /*
                  * The AUX areas have been removed and replaced with
                  * synthesized hardware events, so clear the feature flag and
@@ -703,7 +768,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
         };
         int ret;
 
-        const struct option options[] = {
+        struct option options[] = {
                 OPT_BOOLEAN('b', "build-ids", &inject.build_ids,
                             "Inject build-ids into the output stream"),
                 OPT_STRING('i', "input", &inject.input_name, "file",
@@ -713,6 +778,9 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
                 OPT_BOOLEAN('s', "sched-stat", &inject.sched_stat,
                             "Merge sched-stat and sched-switch for getting events "
                             "where and how long tasks slept"),
+#ifdef HAVE_JITDUMP
+                OPT_BOOLEAN('j', "jit", &inject.jit_mode, "merge jitdump files into perf.data file"),
+#endif
                 OPT_INCR('v', "verbose", &verbose,
                          "be more verbose (show build ids, etc)"),
                 OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, "file",
@@ -729,7 +797,9 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
                 "perf inject [<options>]",
                 NULL
         };
-
+#ifndef HAVE_JITDUMP
+        set_option_nobuild(options, 'j', "jit", "NO_LIBELF=1", true);
+#endif
         argc = parse_options(argc, argv, options, inject_usage, 0);
 
         /*
@@ -755,6 +825,29 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
         if (inject.session == NULL)
                 return -1;
 
+        if (inject.build_ids) {
+                /*
+                 * to make sure the mmap records are ordered correctly
+                 * and so that the correct especially due to jitted code
+                 * mmaps. We cannot generate the buildid hit list and
+                 * inject the jit mmaps at the same time for now.
+                 */
+                inject.tool.ordered_events = true;
+                inject.tool.ordering_requires_timestamps = true;
+        }
+#ifdef HAVE_JITDUMP
+        if (inject.jit_mode) {
+                inject.tool.mmap2          = perf_event__jit_repipe_mmap2;
+                inject.tool.mmap           = perf_event__jit_repipe_mmap;
+                inject.tool.ordered_events = true;
+                inject.tool.ordering_requires_timestamps = true;
+                /*
+                 * JIT MMAP injection injects all MMAP events in one go, so it
+                 * does not obey finished_round semantics.
+                 */
+                inject.tool.finished_round = perf_event__drop_oe;
+        }
+#endif
         ret = symbol__init(&inject.session->header.env);
         if (ret < 0)
                 goto out_delete;