releases/4.19.31/perf-auxtrace-define-auxtrace-record-alignment.patch

   1 From c3fcadf0bb765faf45d6d562246e1d08885466df Mon Sep 17 00:00:00 2001
   2 From: Adrian Hunter <adrian.hunter@intel.com>
   3 Date: Wed, 6 Feb 2019 12:39:43 +0200
   4 Subject: perf auxtrace: Define auxtrace record alignment
   5
   6 From: Adrian Hunter <adrian.hunter@intel.com>
   7
   8 commit c3fcadf0bb765faf45d6d562246e1d08885466df upstream.
   9
  10 Define auxtrace record alignment so that it can be referenced elsewhere.
  11
  12 Note this is preparation for patch "perf intel-pt: Fix overlap calculation
  13 for padding"
  14
  15 Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
  16 Cc: Jiri Olsa <jolsa@redhat.com>
  17 Cc: stable@vger.kernel.org
  18 Link: http://lkml.kernel.org/r/20190206103947.15750-2-adrian.hunter@intel.com
  19 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  tools/perf/util/auxtrace.c |    4 ++--
  24  tools/perf/util/auxtrace.h |    3 +++
  25  2 files changed, 5 insertions(+), 2 deletions(-)
  26
  27 --- a/tools/perf/util/auxtrace.c
  28 +++ b/tools/perf/util/auxtrace.c
  29 @@ -1273,9 +1273,9 @@ static int __auxtrace_mmap__read(struct
  30         }
  31
  32         /* padding must be written by fn() e.g. record__process_auxtrace() */
  33 -       padding = size & 7;
  34 +       padding = size & (PERF_AUXTRACE_RECORD_ALIGNMENT - 1);
  35         if (padding)
  36 -               padding = 8 - padding;
  37 +               padding = PERF_AUXTRACE_RECORD_ALIGNMENT - padding;
  38
  39         memset(&ev, 0, sizeof(ev));
  40         ev.auxtrace.header.type = PERF_RECORD_AUXTRACE;
  41 --- a/tools/perf/util/auxtrace.h
  42 +++ b/tools/perf/util/auxtrace.h
  43 @@ -38,6 +38,9 @@ struct record_opts;
  44  struct auxtrace_info_event;
  45  struct events_stats;
  46
  47 +/* Auxtrace records must have the same alignment as perf event records */
  48 +#define PERF_AUXTRACE_RECORD_ALIGNMENT 8
  49 +
  50  enum auxtrace_type {
  51         PERF_AUXTRACE_UNKNOWN,
  52         PERF_AUXTRACE_INTEL_PT,