lkml.org 
[lkml]   [2019]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 116/134] perf intel-pt: Fix TSC slip
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Adrian Hunter <adrian.hunter@intel.com>

    commit f3b4e06b3bda759afd042d3d5fa86bea8f1fe278 upstream.

    A TSC packet can slip past MTC packets so that the timestamp appears to
    go backwards. One estimate is that can be up to about 40 CPU cycles,
    which is certainly less than 0x1000 TSC ticks, but accept slippage an
    order of magnitude more to be on the safe side.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: stable@vger.kernel.org
    Fixes: 79b58424b821c ("perf tools: Add Intel PT support for decoding MTC packets")
    Link: http://lkml.kernel.org/r/20190325135135.18348-1-adrian.hunter@intel.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 20 ++++++++------------
    1 file changed, 8 insertions(+), 12 deletions(-)

    --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
    +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
    @@ -251,19 +251,15 @@ struct intel_pt_decoder *intel_pt_decode
    if (!(decoder->tsc_ctc_ratio_n % decoder->tsc_ctc_ratio_d))
    decoder->tsc_ctc_mult = decoder->tsc_ctc_ratio_n /
    decoder->tsc_ctc_ratio_d;
    -
    - /*
    - * Allow for timestamps appearing to backwards because a TSC
    - * packet has slipped past a MTC packet, so allow 2 MTC ticks
    - * or ...
    - */
    - decoder->tsc_slip = multdiv(2 << decoder->mtc_shift,
    - decoder->tsc_ctc_ratio_n,
    - decoder->tsc_ctc_ratio_d);
    }
    - /* ... or 0x100 paranoia */
    - if (decoder->tsc_slip < 0x100)
    - decoder->tsc_slip = 0x100;
    +
    + /*
    + * A TSC packet can slip past MTC packets so that the timestamp appears
    + * to go backwards. One estimate is that can be up to about 40 CPU
    + * cycles, which is certainly less than 0x1000 TSC ticks, but accept
    + * slippage an order of magnitude more to be on the safe side.
    + */
    + decoder->tsc_slip = 0x10000;

    intel_pt_log("timestamp: mtc_shift %u\n", decoder->mtc_shift);
    intel_pt_log("timestamp: tsc_ctc_ratio_n %u\n", decoder->tsc_ctc_ratio_n);

    \
     
     \ /
      Last update: 2019-04-01 19:58    [W:3.666 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site