lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf/x86/intel: Fix intel_get_event_constraints() for dynamic constraints

Browse Source 
With dynamic constraint, we need to restart from the static
constraints each time the intel_get_event_constraints() is called.

Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Maria Dimakopoulou <maria.n.dimakopoulou@gmail.com>
Cc: bp@alien8.de
Cc: jolsa@redhat.com
Cc: kan.liang@intel.com
Link: http://lkml.kernel.org/r/1416251225-17721-10-git-send-email-eranian@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Stephane Eranian
2014-11-17 20:07:01 +01:00
committed by Ingo Molnar
parent b63b4b459a
commit a90738c2cb
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/kernel/cpu/perf_event_intel.c
View File

@@ -2063,20 +2063,25 @@ static struct event_constraint *
intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx, intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
struct perf_event *event) struct perf_event *event)
{ {
struct event_constraint *c = event->hw.constraint; struct event_constraint *c1 = event->hw.constraint;
struct event_constraint *c2;
/* /*
* first time only * first time only
* - static constraint: no change across incremental scheduling calls * - static constraint: no change across incremental scheduling calls
* - dynamic constraint: handled by intel_get_excl_constraints() * - dynamic constraint: handled by intel_get_excl_constraints()
*/ */
if (!c) c2 = __intel_get_event_constraints(cpuc, idx, event);
c = __intel_get_event_constraints(cpuc, idx, event); if (c1 && (c1->flags & PERF_X86_EVENT_DYNAMIC)) {
bitmap_copy(c1->idxmsk, c2->idxmsk, X86_PMC_IDX_MAX);
c1->weight = c2->weight;
c2 = c1;
}
if (cpuc->excl_cntrs) if (cpuc->excl_cntrs)
return intel_get_excl_constraints(cpuc, event, idx, c); return intel_get_excl_constraints(cpuc, event, idx, c2);
return c; return c2;
} }
static void intel_put_excl_constraints(struct cpu_hw_events *cpuc, static void intel_put_excl_constraints(struct cpu_hw_events *cpuc,