aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/intel-pt.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-01-03 08:05:16 -0500
committerIngo Molnar <mingo@kernel.org>2019-01-03 08:05:16 -0500
commit2573be22e5b6f24a0cabc97715c808c47e29eaaf (patch)
treed00e6cc4c2718c0122fc1a7bbd804864037deae0 /tools/perf/util/intel-pt.c
parent6d101ba6be2a26a3e1f513b5e293f0fd2b79ec5c (diff)
parentb25756df5b28cd7b6e91200fc5012e7c76e8ec69 (diff)
Merge tag 'perf-core-for-mingo-4.21-20190103' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: perf c2c: Jiri Olsa: - Change the default coalesce setup to from '--coalesce pid,iaddr' to just '--coalesce iaddr'. - Increase the HITM ratio limit for displayed cachelines. perf script: Andi Kleen: - Fix LBR skid dump problems in brstackinsn. perf trace: Arnaldo Carvalho de Melo: - Check if the raw_syscalls:sys_{enter,exit} are setup before setting tp filter. - Do not hardcode the size of the tracepoint common_ fields. - Beautify USBDEFFS_ ioctl commands. Colin Ian King: - Use correct SECCOMP prefix spelling, "SECOMP_*" -> "SECCOMP_*". perf python: Jiri Olsa: - Do not force closing original perf descriptor in evlist.get_pollfd(). tools misc: Jiri Olsa: - Allow overriding CFLAGS and LDFLAGS. perf build: Stanislav Fomichev: - Don't unconditionally link the libbfd feature test to -liberty and -lz thread-stack: Adrian Hunter: - Fix processing for the idle task, having a stack per cpu. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/intel-pt.c')
-rw-r--r--tools/perf/util/intel-pt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 149ff361ca78..2e72373ec6df 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1174,7 +1174,7 @@ static void intel_pt_prep_sample(struct intel_pt *pt,
1174 intel_pt_prep_b_sample(pt, ptq, event, sample); 1174 intel_pt_prep_b_sample(pt, ptq, event, sample);
1175 1175
1176 if (pt->synth_opts.callchain) { 1176 if (pt->synth_opts.callchain) {
1177 thread_stack__sample(ptq->thread, ptq->chain, 1177 thread_stack__sample(ptq->thread, ptq->cpu, ptq->chain,
1178 pt->synth_opts.callchain_sz + 1, 1178 pt->synth_opts.callchain_sz + 1,
1179 sample->ip, pt->kernel_start); 1179 sample->ip, pt->kernel_start);
1180 sample->callchain = ptq->chain; 1180 sample->callchain = ptq->chain;
@@ -1526,11 +1526,11 @@ static int intel_pt_sample(struct intel_pt_queue *ptq)
1526 return 0; 1526 return 0;
1527 1527
1528 if (pt->synth_opts.callchain || pt->synth_opts.thread_stack) 1528 if (pt->synth_opts.callchain || pt->synth_opts.thread_stack)
1529 thread_stack__event(ptq->thread, ptq->flags, state->from_ip, 1529 thread_stack__event(ptq->thread, ptq->cpu, ptq->flags, state->from_ip,
1530 state->to_ip, ptq->insn_len, 1530 state->to_ip, ptq->insn_len,
1531 state->trace_nr); 1531 state->trace_nr);
1532 else 1532 else
1533 thread_stack__set_trace_nr(ptq->thread, state->trace_nr); 1533 thread_stack__set_trace_nr(ptq->thread, ptq->cpu, state->trace_nr);
1534 1534
1535 if (pt->sample_branches) { 1535 if (pt->sample_branches) {
1536 err = intel_pt_synth_branch_sample(ptq); 1536 err = intel_pt_synth_branch_sample(ptq);