From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946334AbcHRK4H (ORCPT ); Thu, 18 Aug 2016 06:56:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58062 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752648AbcHRK4A (ORCPT ); Thu, 18 Aug 2016 06:56:00 -0400 Date: Thu, 18 Aug 2016 03:54:49 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: torvalds@linux-foundation.org, vegard.nossum@gmail.com, linux-kernel@vger.kernel.org, eranian@google.com, kan.liang@intel.com, alexander.shishkin@linux.intel.com, davidcc@google.com, pjt@google.com, acme@redhat.com, hpa@zytor.com, jolsa@redhat.com, vincent.weaver@maine.edu, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org Reply-To: vincent.weaver@maine.edu, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, jolsa@redhat.com, hpa@zytor.com, pjt@google.com, davidcc@google.com, acme@redhat.com, eranian@google.com, kan.liang@intel.com, alexander.shishkin@linux.intel.com, vegard.nossum@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <1471467307-61171-5-git-send-email-davidcc@google.com> References: <1471467307-61171-5-git-send-email-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Use PMUEF_READ_CPU_PKG in uncore events Git-Commit-ID: e64cd6f73ff5a7eb4f8f759049ee24a3fe55e731 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: e64cd6f73ff5a7eb4f8f759049ee24a3fe55e731 Gitweb: http://git.kernel.org/tip/e64cd6f73ff5a7eb4f8f759049ee24a3fe55e731 Author: David Carrillo-Cisneros AuthorDate: Wed, 17 Aug 2016 13:55:07 -0700 Committer: Ingo Molnar CommitDate: Thu, 18 Aug 2016 10:54:34 +0200 perf/x86: Use PMUEF_READ_CPU_PKG in uncore events Add flag to Intel's uncore and RAPL. Signed-off-by: David Carrillo-Cisneros Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Stephane Eranian Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Paul Turner Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Vegard Nossum Cc: Vince Weaver Link: http://lkml.kernel.org/r/1471467307-61171-5-git-send-email-davidcc@google.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/rapl.c | 2 ++ arch/x86/events/intel/uncore.c | 2 ++ arch/x86/events/intel/uncore_snb.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 2886593..62bebcc 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -357,6 +357,8 @@ static int rapl_pmu_event_init(struct perf_event *event) if (event->cpu < 0) return -EINVAL; + event->event_caps |= PERF_EV_CAP_READ_ACTIVE_PKG; + /* * check event is known (determines counter) */ diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 463dc7a..7b3cc8b 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -664,6 +664,8 @@ static int uncore_pmu_event_init(struct perf_event *event) event->cpu = box->cpu; event->pmu_private = box; + event->event_caps |= PERF_EV_CAP_READ_ACTIVE_PKG; + event->hw.idx = -1; event->hw.last_tag = ~0ULL; event->hw.extra_reg.idx = EXTRA_REG_NONE; diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c index 9d35ec0..5f845ee 100644 --- a/arch/x86/events/intel/uncore_snb.c +++ b/arch/x86/events/intel/uncore_snb.c @@ -388,6 +388,8 @@ static int snb_uncore_imc_event_init(struct perf_event *event) event->cpu = box->cpu; event->pmu_private = box; + event->event_caps |= PERF_EV_CAP_READ_ACTIVE_PKG; + event->hw.idx = -1; event->hw.last_tag = ~0ULL; event->hw.extra_reg.idx = EXTRA_REG_NONE;