perf inject: Keep a copy of kcore_dir

If the input perf.data has a kcore_dir, copy it into the output, since
at least the kallsyms in the kcore_dir will be useful to the output.

Example:

 Before:

  $ ls -lR perf.data-from-desktop
  perf.data-from-desktop:
  total 916
  -rw------- 1 user user 931756 May 19 09:55 data
  drwx------ 2 user user   4096 May 19 09:55 kcore_dir

  perf.data-from-desktop/kcore_dir:
  total 42952
  -r-------- 1 user user  7582467 May 19 09:55 kallsyms
  -r-------- 1 user user 36388864 May 19 09:55 kcore
  -r-------- 1 user user     4828 May 19 09:55 modules

  $ perf inject -i perf.data-from-desktop -o injected-perf.data

  $ ls -lR injected-perf.data
  -rw------- 1 user user 931320 May 20 15:08 injected-perf.data

 After:

  $ perf inject -i perf.data-from-desktop -o injected-perf.data

  $ ls -lR injected-perf.data
  injected-perf.data:
  total 916
  -rw------- 1 user user 931320 May 20 15:21 data
  drwx------ 2 user user   4096 May 20 15:21 kcore_dir

  injected-perf.data/kcore_dir:
  total 42952
  -r-------- 1 user user  7582467 May 20 15:21 kallsyms
  -r-------- 1 user user 36388864 May 20 15:21 kcore
  -r-------- 1 user user     4828 May 20 15:21 modules

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20220520132404.25853-6-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 71b6eaf..a75bf11 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -50,6 +50,7 @@ struct perf_inject {
        bool                    in_place_update;
        bool                    in_place_update_dry_run;
        bool                    is_pipe;
+       bool                    copy_kcore_dir;
        const char              *input_name;
        struct perf_data        output;
        u64                     bytes_written;
@@ -880,6 +881,19 @@ static int feat_copy_cb(struct feat_copier *fc, int feat, struct feat_writer *fw
        return 1; /* Feature section copied */
 }
 
+static int copy_kcore_dir(struct perf_inject *inject)
+{
+       char *cmd;
+       int ret;
+
+       ret = asprintf(&cmd, "cp -r -n %s/kcore_dir* %s >/dev/null 2>&1",
+                      inject->input_name, inject->output.path);
+       if (ret < 0)
+               return ret;
+       pr_debug("%s\n", cmd);
+       return system(cmd);
+}
+
 static int output_fd(struct perf_inject *inject)
 {
        return inject->in_place_update ? -1 : perf_data__fd(&inject->output);
@@ -995,6 +1009,12 @@ static int __cmd_inject(struct perf_inject *inject)
                session->header.data_offset = output_data_offset;
                session->header.data_size = inject->bytes_written;
                perf_session__inject_header(session, session->evlist, fd, &inj_fc.fc);
+
+               if (inject->copy_kcore_dir) {
+                       ret = copy_kcore_dir(inject);
+                       if (ret)
+                               return ret;
+               }
        }
 
        return ret;
@@ -1131,9 +1151,16 @@ int cmd_inject(int argc, const char **argv)
                }
                if (!inject.in_place_update_dry_run)
                        data.in_place_update = true;
-       } else if (perf_data__open(&inject.output)) {
-               perror("failed to create output file");
-               return -1;
+       } else {
+               if (strcmp(inject.output.path, "-") && !inject.strip &&
+                   has_kcore_dir(inject.input_name)) {
+                       inject.output.is_dir = true;
+                       inject.copy_kcore_dir = true;
+               }
+               if (perf_data__open(&inject.output)) {
+                       perror("failed to create output file");
+                       return -1;
+               }
        }
 
        data.path = inject.input_name;