From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757090AbcIVODM (ORCPT ); Thu, 22 Sep 2016 10:03:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56884 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934169AbcIVODJ (ORCPT ); Thu, 22 Sep 2016 10:03:09 -0400 Date: Thu, 22 Sep 2016 07:00:47 -0700 From: tip-bot for Alexander Shishkin Message-ID: Cc: torvalds@linux-foundation.org, eranian@google.com, jolsa@redhat.com, alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, acme@infradead.org, a.p.zijlstra@chello.nl, hpa@zytor.com, tglx@linutronix.de Reply-To: eranian@google.com, torvalds@linux-foundation.org, jolsa@redhat.com, peterz@infradead.org, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, a.p.zijlstra@chello.nl, acme@infradead.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <20160920154811.3255-2-alexander.shishkin@linux.intel.com> References: <20160920154811.3255-2-alexander.shishkin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86/intel/bts: Make it an exclusive PMU Git-Commit-ID: 08b90f0655258411a1b41d856331e20e7ec8d55c 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: 08b90f0655258411a1b41d856331e20e7ec8d55c Gitweb: http://git.kernel.org/tip/08b90f0655258411a1b41d856331e20e7ec8d55c Author: Alexander Shishkin AuthorDate: Tue, 20 Sep 2016 18:48:10 +0300 Committer: Ingo Molnar CommitDate: Thu, 22 Sep 2016 14:56:08 +0200 perf/x86/intel/bts: Make it an exclusive PMU Just like intel_pt, intel_bts can only handle one event at a time, which is the reason we introduced PERF_PMU_CAP_EXCLUSIVE in the first place. However, at the moment one can have as many intel_bts events within the same context at the same time as one pleases. Only one of them, however, will get scheduled and receive the actual trace data. Fix this by making intel_bts an "exclusive" PMU. Signed-off-by: Alexander Shishkin Acked-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: vince@deater.net Link: http://lkml.kernel.org/r/20160920154811.3255-2-alexander.shishkin@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/bts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/intel/bts.c b/arch/x86/events/intel/bts.c index 6ff66ef..982c9e3 100644 --- a/arch/x86/events/intel/bts.c +++ b/arch/x86/events/intel/bts.c @@ -584,7 +584,8 @@ static __init int bts_init(void) if (!boot_cpu_has(X86_FEATURE_DTES64) || !x86_pmu.bts) return -ENODEV; - bts_pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG | PERF_PMU_CAP_ITRACE; + bts_pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG | PERF_PMU_CAP_ITRACE | + PERF_PMU_CAP_EXCLUSIVE; bts_pmu.task_ctx_nr = perf_sw_context; bts_pmu.event_init = bts_event_init; bts_pmu.add = bts_event_add;