From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756653AbcEEJqI (ORCPT ); Thu, 5 May 2016 05:46:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44502 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756191AbcEEJqF (ORCPT ); Thu, 5 May 2016 05:46:05 -0400 Date: Thu, 5 May 2016 02:44:53 -0700 From: tip-bot for Peter Zijlstra Message-ID: Cc: hpa@zytor.com, bp@suse.de, vincent.weaver@maine.edu, acme@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de, bp@alien8.de, jolsa@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org, eranian@google.com, alexander.shishkin@linux.intel.com Reply-To: jolsa@redhat.com, bp@alien8.de, mingo@kernel.org, eranian@google.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, hpa@zytor.com, bp@suse.de, vincent.weaver@maine.edu, torvalds@linux-foundation.org, tglx@linutronix.de, acme@redhat.com In-Reply-To: <20160423224255.GB3430@twins.programming.kicks-ass.net> References: <20160423224255.GB3430@twins.programming.kicks-ass.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs Git-Commit-ID: 8482716b9d865db34c55d4bf2fed19498e7195b9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8482716b9d865db34c55d4bf2fed19498e7195b9 Gitweb: http://git.kernel.org/tip/8482716b9d865db34c55d4bf2fed19498e7195b9 Author: Peter Zijlstra AuthorDate: Sun, 24 Apr 2016 00:42:55 +0200 Committer: Ingo Molnar 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 Tested-by: Borislav Petkov Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: jroedel@suse.de Cc: suravee.suthikulpanit@amd.com Link: http://lkml.kernel.org/r/20160423224255.GB3430@twins.programming.kicks-ass.net Signed-off-by: Ingo Molnar --- 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,