summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2019-03-01 12:35:36 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-23 20:11:38 +0100
commit99e5abb7b8958c4bfaa9a155cfa4e3600d336854 (patch)
tree18b6bfaae5880bff1b09997a55812eac2f00f107 /tools/perf
parent85c9f1fb8a81ddd2bbd1c7259b8454b09d51ee09 (diff)
downloadtalos-obmc-linux-99e5abb7b8958c4bfaa9a155cfa4e3600d336854.tar.gz
talos-obmc-linux-99e5abb7b8958c4bfaa9a155cfa4e3600d336854.zip
perf intel-pt: Fix divide by zero when TSC is not available
commit 076333870c2f5bdd9b6d31e7ca1909cf0c84cbfa upstream. When TSC is not available, "timeless" decoding is used but a divide by zero occurs if perf_time_to_tsc() is called. Ensure the divisor is not zero. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: stable@vger.kernel.org # v4.9+ Link: https://lkml.kernel.org/n/tip-1i4j0wqoc8vlbkcizqqxpsf4@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/intel-pt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 2e72373ec6df..4493fc13a6fa 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -2522,6 +2522,8 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
}
pt->timeless_decoding = intel_pt_timeless_decoding(pt);
+ if (pt->timeless_decoding && !pt->tc.time_mult)
+ pt->tc.time_mult = 1;
pt->have_tsc = intel_pt_have_tsc(pt);
pt->sampling_mode = false;
pt->est_tsc = !pt->timeless_decoding;
OpenPOWER on IntegriCloud