openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf/x86: Fix PEBS threshold initialization 

Latest PEBS rework change could skip initialization
of the ds->pebs_interrupt_threshold for single event
PEBS threshold events.

Make sure the PEBS threshold gets always initialized.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 09e61b4f78 ("perf/x86/intel: Rework the large PEBS setup code")
Link: http://lkml.kernel.org/r/1471511392-29875-1-git-send-email-jolsa@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Jiri Olsa 2016-08-18 11:09:52 +02:00 committed by Ingo Molnar
parent e64cd6f73f
commit b6a32f023f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/events/intel/ds.c
View File

@ -834,14 +834,24 @@ static inline void pebs_update_threshold(struct cpu_hw_events *cpuc)
static void static void
pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc, struct pmu *pmu) pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc, struct pmu *pmu)
{ {
/*
* Make sure we get updated with the first PEBS
* event. It will trigger also during removal, but
* that does not hurt:
*/
bool update = cpuc->n_pebs == 1;
if (needed_cb != pebs_needs_sched_cb(cpuc)) { if (needed_cb != pebs_needs_sched_cb(cpuc)) {
if (!needed_cb) if (!needed_cb)
perf_sched_cb_inc(pmu); perf_sched_cb_inc(pmu);
else else
perf_sched_cb_dec(pmu); perf_sched_cb_dec(pmu);
pebs_update_threshold(cpuc); update = true;
} }
if (update)
pebs_update_threshold(cpuc);
} }
void intel_pmu_pebs_add(struct perf_event *event) void intel_pmu_pebs_add(struct perf_event *event)