[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Thu, 5 May 2016 02:44:53 -0700
From: tip-bot for Peter Zijlstra <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, bp@...e.de, vincent.weaver@...ne.edu,
acme@...hat.com, torvalds@...ux-foundation.org, tglx@...utronix.de,
bp@...en8.de, jolsa@...hat.com, peterz@...radead.org,
linux-kernel@...r.kernel.org, mingo@...nel.org, eranian@...gle.com,
alexander.shishkin@...ux.intel.com
Subject: [tip:perf/core] perf/x86/amd/iommu: Do not register a task ctx for
uncore like PMUs
Commit-ID: 8482716b9d865db34c55d4bf2fed19498e7195b9
Gitweb: http://git.kernel.org/tip/8482716b9d865db34c55d4bf2fed19498e7195b9
Author: Peter Zijlstra <peterz@...radead.org>
AuthorDate: Sun, 24 Apr 2016 00:42:55 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 5 May 2016 10:11:28 +0200
perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs
The new sanity check introduced by:
26657848502b ("perf/core: Verify we have a single perf_hw_context PMU")
... triggered on the AMD IOMMU driver.
IOMMUs are not per logical CPU, they cannot have per-task counters. Fix it.
Reported-by: Borislav Petkov <bp@...en8.de>
Tested-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vince Weaver <vincent.weaver@...ne.edu>
Cc: jroedel@...e.de
Cc: suravee.suthikulpanit@....com
Link: http://lkml.kernel.org/r/20160423224255.GB3430@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/events/amd/iommu.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index 40625ca..6011a57 100644
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -474,6 +474,7 @@ static __init int _init_perf_amd_iommu(
static struct perf_amd_iommu __perf_iommu = {
.pmu = {
+ .task_ctx_nr = perf_invalid_context,
.event_init = perf_iommu_event_init,
.add = perf_iommu_add,
.del = perf_iommu_del,
Powered by blists - more mailing lists