iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf/x86/amd/uncore: Do not register a task ctx for uncore PMUs

Browse Source 
The new sanity check introduced by:

  2665784850 ("perf/core: Verify we have a single perf_hw_context PMU")

... triggered on the AMD uncore driver.

Uncore PMUs are per node, they cannot have per-task counters. Fix it.

Reported-by: Borislav Petkov <bp@suse.de>
Reported-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: acme@redhat.com
Cc: alexander.shishkin@linux.intel.com
Cc: eranian@google.com
Cc: jolsa@redhat.com
Cc: linux-tip-commits@vger.kernel.org
Cc: vincent.weaver@maine.edu
Link: http://lkml.kernel.org/r/20160404140208.GA3448@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2016-04-04 16:02:08 +02:00 committed by Ingo Molnar
parent e465de1cd5
commit 31d50c551e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/events/amd/uncore.c
View File

@ -263,6 +263,7 @@ static const struct attribute_group *amd_uncore_attr_groups[] = {
}; };
static struct pmu amd_nb_pmu = { static struct pmu amd_nb_pmu = {
.task_ctx_nr = perf_invalid_context,
.attr_groups = amd_uncore_attr_groups, .attr_groups = amd_uncore_attr_groups,
.name = "amd_nb", .name = "amd_nb",
.event_init = amd_uncore_event_init, .event_init = amd_uncore_event_init,
@ -274,6 +275,7 @@ static struct pmu amd_nb_pmu = {
}; };
static struct pmu amd_l2_pmu = { static struct pmu amd_l2_pmu = {
.task_ctx_nr = perf_invalid_context,
.attr_groups = amd_uncore_attr_groups, .attr_groups = amd_uncore_attr_groups,
.name = "amd_l2", .name = "amd_l2",
.event_init = amd_uncore_event_init, .event_init = amd_uncore_event_init,