releases/4.14.53/perf-intel-pt-fix-decoding-to-accept-cbr-between-fup-and-corresponding-tip.patch

   1 From bd2e49ec48feb1855f7624198849eea4610e2286 Mon Sep 17 00:00:00 2001
   2 From: Adrian Hunter <adrian.hunter@intel.com>
   3 Date: Thu, 31 May 2018 13:23:43 +0300
   4 Subject: perf intel-pt: Fix decoding to accept CBR between FUP and corresponding TIP
   5
   6 From: Adrian Hunter <adrian.hunter@intel.com>
   7
   8 commit bd2e49ec48feb1855f7624198849eea4610e2286 upstream.
   9
  10 It is possible to have a CBR packet between a FUP packet and
  11 corresponding TIP packet. Stop treating it as an error.
  12
  13 Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
  14 Cc: stable@vger.kernel.org
  15 Link: http://lkml.kernel.org/r/1527762225-26024-3-git-send-email-adrian.hunter@intel.com
  16 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  tools/perf/util/intel-pt-decoder/intel-pt-decoder.c |    5 ++++-
  21  1 file changed, 4 insertions(+), 1 deletion(-)
  22
  23 --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
  24 +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
  25 @@ -1604,7 +1604,6 @@ static int intel_pt_walk_fup_tip(struct
  26                 case INTEL_PT_PSB:
  27                 case INTEL_PT_TSC:
  28                 case INTEL_PT_TMA:
  29 -               case INTEL_PT_CBR:
  30                 case INTEL_PT_MODE_TSX:
  31                 case INTEL_PT_BAD:
  32                 case INTEL_PT_PSBEND:
  33 @@ -1620,6 +1619,10 @@ static int intel_pt_walk_fup_tip(struct
  34                         decoder->pkt_step = 0;
  35                         return -ENOENT;
  36
  37 +               case INTEL_PT_CBR:
  38 +                       intel_pt_calc_cbr(decoder);
  39 +                       break;
  40 +
  41                 case INTEL_PT_OVF:
  42                         return intel_pt_overflow(decoder);
  43