queue-5.0/perf-data-don-t-store-auxtrace-index-for-directory-d.patch

   1 From 87892f50188c79b2118388e3dbf7255f09046548 Mon Sep 17 00:00:00 2001
   2 From: Jiri Olsa <jolsa@kernel.org>
   3 Date: Fri, 8 Mar 2019 14:47:36 +0100
   4 Subject: perf data: Don't store auxtrace index for directory data file
   5
   6 [ Upstream commit cd3dd8dd8ff62374d90cb3f2e54b8c94106c7810 ]
   7
   8 We can't store the auxtrace index when we store into multiple files,
   9 because we keep only offset for it, not the file.
  10
  11 The auxtrace data will be processed correctly in the 'pipe' mode.
  12
  13 Signed-off-by: Jiri Olsa <jolsa@kernel.org>
  14 Cc: Adrian Hunter <adrian.hunter@intel.com>
  15 Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
  16 Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
  17 Cc: Andi Kleen <ak@linux.intel.com>
  18 Cc: Namhyung Kim <namhyung@kernel.org>
  19 Cc: Peter Zijlstra <peterz@infradead.org>
  20 Cc: Stephane Eranian <eranian@google.com>
  21 Link: http://lkml.kernel.org/r/20190308134745.5057-3-jolsa@kernel.org
  22 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  23 Signed-off-by: Sasha Levin <sashal@kernel.org>
  24 ---
  25  tools/perf/builtin-record.c | 2 +-
  26  1 file changed, 1 insertion(+), 1 deletion(-)
  27
  28 diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
  29 index 882285fb9f64..3fd154f1701b 100644
  30 --- a/tools/perf/builtin-record.c
  31 +++ b/tools/perf/builtin-record.c
  32 @@ -386,7 +386,7 @@ static int record__process_auxtrace(struct perf_tool *tool,
  33         size_t padding;
  34         u8 pad[8] = {0};
  35
  36 -       if (!perf_data__is_pipe(data)) {
  37 +       if (!perf_data__is_pipe(data) && !perf_data__is_dir(data)) {
  38                 off_t file_offset;
  39                 int fd = perf_data__fd(data);
  40                 int err;
  41 --
  42 2.19.1
  43